Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

loadout-prototypes-cleaner-revive #1646

Merged
merged 3 commits into from
Aug 23, 2024
+258 −218
Merged

loadout-prototypes-cleaner-revive #1646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d19916f
loadout-prototypes-cleaner-revive
EstKemran Aug 22, 2024
e4abce3
fix
EstKemran Aug 22, 2024
9359ee1
fix
EstKemran Aug 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Resources/Prototypes/SS220/Loadouts/Jobs/Cargo/cargo_technician.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Turtleneck Time
# Job Time
- type: loadoutEffectGroup
id: CargoTechnicianTurtleneck
effects:
Expand Down Expand Up @@ -39,4 +39,4 @@
- !type:GroupLoadoutEffect
proto: CargoTechnicianTurtleneck
equipment:
jumpsuit: ClothingUniformJumpskirtTurtleAltColorLightBrown
jumpsuit: ClothingUniformJumpskirtTurtleAltColorLightBrown
5 changes: 2 additions & 3 deletions Resources/Prototypes/SS220/Loadouts/Jobs/Cargo/salvage_specialist.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Turtleneck Time
# Job Time
- type: loadoutEffectGroup
id: SalvageSpecialistTurtleneck
effects:
Expand All @@ -8,7 +8,6 @@
role: JobSalvageSpecialist
time: 108000 # 30 hrs

# Flannel Salvage Time
- type: loadoutEffectGroup
id: UniformJumpsuitFlannelSalvage
effects:
Expand Down Expand Up @@ -54,4 +53,4 @@
- type: loadout
id: ClothingHeadHatHardhatViolet
equipment:
head: ClothingHeadHatHardhatViolet
head: ClothingHeadHatHardhatViolet
2 changes: 0 additions & 2 deletions Resources/Prototypes/SS220/Loadouts/Jobs/Civilian/chef.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@
jumpsuit: ClothingUniformJumpskirtChefNanotrasen

# Outer clothing

- type: loadout
id: ChefJacketWhite
equipment:
Expand All @@ -106,7 +105,6 @@
outerClothing: ClothingOuterJacketChefNanotrasen

# Belt

- type: loadout
id: ChefBeltApronWhite
equipment:
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/SS220/Loadouts/Jobs/Civilian/passenger.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Turtleneck Time
# Job Time
- type: loadoutEffectGroup
id: PassengerTurtleneck
effects:
Expand Down Expand Up @@ -39,4 +39,4 @@
- !type:GroupLoadoutEffect
proto: PassengerTurtleneck
equipment:
jumpsuit: ClothingUniformJumpskirtTurtleAltColorGrey
jumpsuit: ClothingUniformJumpskirtTurtleAltColorGrey
5 changes: 2 additions & 3 deletions Resources/Prototypes/SS220/Loadouts/Jobs/Civilian/senior_service.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,13 @@
id: HatSeniorService
equipment:
head: ClothingHeadHatSeniorService

# Jumpsuit
- type: loadout
id: SeniorServiceJumpsuit
equipment:
jumpsuit: ClothingUniformJumpsuitSeniorService

# Jumpskirt

- type: loadout
id: SeniorJumpskirtService
equipment:
Expand Down
4 changes: 0 additions & 4 deletions Resources/Prototypes/SS220/Loadouts/Jobs/Command/iaa.yml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion Resources/Prototypes/SS220/Loadouts/Jobs/Engineering/atmospheric_technician.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Turtleneck Time
# Job Time
- type: loadoutEffectGroup
id: AtmosphericTechnicianTurtleneck
effects:
Expand Down
1 change: 0 additions & 1 deletion Resources/Prototypes/SS220/Loadouts/Jobs/Engineering/senior_engineer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
equipment:
jumpsuit: ClothingUniformJumpsuitSeniorEngineer

# Jumpskirt
- type: loadout
id: SeniorsEngineerJumpskirt
equipment:
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/SS220/Loadouts/Jobs/Engineering/station_engineer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Turtleneck Time
# Job Time
- type: loadoutEffectGroup
id: StationEngineerTurtleneck
effects:
Expand Down Expand Up @@ -39,4 +39,4 @@
- !type:GroupLoadoutEffect
proto: StationEngineerTurtleneck
equipment:
jumpsuit: ClothingUniformJumpskirtTurtleAltColorOrange
jumpsuit: ClothingUniformJumpskirtTurtleAltColorOrange
4 changes: 2 additions & 2 deletions Resources/Prototypes/SS220/Loadouts/Jobs/Engineering/technical_assistant.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Turtleneck Time
# Job Time
- type: loadoutEffectGroup
id: TechnicalAssistantTurtleneck
effects:
Expand Down Expand Up @@ -39,4 +39,4 @@
- !type:GroupLoadoutEffect
proto: TechnicalAssistantTurtleneck
equipment:
jumpsuit: ClothingUniformJumpskirtTurtleAltColorYellow
jumpsuit: ClothingUniformJumpskirtTurtleAltColorYellow
2 changes: 1 addition & 1 deletion Resources/Prototypes/SS220/Loadouts/Jobs/InternalAffairs/blueshield.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Turtleneck Time
# Job Time
- type: loadoutEffectGroup
id: BlueShieldTurtleneck
effects:
Expand Down
6 changes: 6 additions & 0 deletions Resources/Prototypes/SS220/Loadouts/Jobs/InternalAffairs/iaa.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,9 @@
proto: TrustedLawyerTime
equipment:
jumpsuit: ClothingUniformJumpsuitTrustedLawyer

# Back
- type: loadout
id: IAABackpackLeather
equipment:
back: ClothingBackpackSatchelLeather
2 changes: 1 addition & 1 deletion Resources/Prototypes/SS220/Loadouts/Jobs/Medical/chemist.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Turtleneck Time
# Job Time
- type: loadoutEffectGroup
id: ChemistTurtleneck
effects:
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/SS220/Loadouts/Jobs/Medical/medical_doctor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Turtleneck Time
# Job Time
- type: loadoutEffectGroup
id: MedicalDoctorTurtleneck
effects:
Expand Down Expand Up @@ -39,4 +39,4 @@
- !type:GroupLoadoutEffect
proto: MedicalDoctorTurtleneck
equipment:
jumpsuit: ClothingUniformJumpskirtTurtleAltColorBlue
jumpsuit: ClothingUniformJumpskirtTurtleAltColorBlue
4 changes: 2 additions & 2 deletions Resources/Prototypes/SS220/Loadouts/Jobs/Medical/medical_intern.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Turtleneck Time
# Job Time
- type: loadoutEffectGroup
id: MedicalInternTurtleneck
effects:
Expand Down Expand Up @@ -39,4 +39,4 @@
- !type:GroupLoadoutEffect
proto: MedicalInternTurtleneck
equipment:
jumpsuit: ClothingUniformJumpskirtTurtleAltColorWhite
jumpsuit: ClothingUniformJumpskirtTurtleAltColorWhite
2 changes: 1 addition & 1 deletion Resources/Prototypes/SS220/Loadouts/Jobs/Medical/paramedic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Turtleneck Time
# Job Time
- type: loadoutEffectGroup
id: ParamedicTurtleneck
effects:
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/SS220/Loadouts/Jobs/Medical/psychologist.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Turtleneck Time
# Job Time
- type: loadoutEffectGroup
id: PsychologistTurtleneck
effects:
Expand Down
10 changes: 4 additions & 6 deletions Resources/Prototypes/SS220/Loadouts/Jobs/Medical/senior_medical.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,20 @@
id: HatSeniorMedical
equipment:
head: ClothingHeadHatBeretSeniorPhysician

# Jumpsuit
- type: loadout
id: SeniorMedicalJumpsuit
equipment:
jumpsuit: ClothingUniformJumpsuitSeniorPhysician

# Jumpskirt

- type: loadout
id: SeniorMedicalJumpskirt
equipment:
jumpsuit: ClothingUniformJumpskirtSeniorPhysician

# Lab

# Outer
- type: loadout
id: SeniorMedicalLabCoat
equipment:
outerClothing: ClothingOuterCoatLabSeniorPhysician
outerClothing: ClothingOuterCoatLabSeniorPhysician
2 changes: 1 addition & 1 deletion Resources/Prototypes/SS220/Loadouts/Jobs/Science/research_assistant.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Turtleneck Time
# Job Time
- type: loadoutEffectGroup
id: ResearchAssistantTurtleneck
effects:
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/SS220/Loadouts/Jobs/Science/scientist.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Turtleneck Time
# Job Time
- type: loadoutEffectGroup
id: ScientistTurtleneck
effects:
Expand Down Expand Up @@ -39,4 +39,4 @@
- !type:GroupLoadoutEffect
proto: ScientistTurtleneck
equipment:
jumpsuit: ClothingUniformJumpskirtTurtleAltColorPurple
jumpsuit: ClothingUniformJumpskirtTurtleAltColorPurple
9 changes: 4 additions & 5 deletions Resources/Prototypes/SS220/Loadouts/Jobs/Science/senior_researcher.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,19 @@
id: HatSeniorSciensist
equipment:
head: ClothingHeadHatBeretRND

# Jumpsuit
- type: loadout
id: SeniorSciensistJumpsuit
equipment:
jumpsuit: ClothingUniformJumpsuitSeniorResearcher

# Jumpskirt

- type: loadout
id: SeniorSciensistJumpskirt
equipment:
jumpsuit: ClothingUniformJumpskirtSeniorResearcher
# Lab

# Outer
- type: loadout
id: SeniorSciensistLabCoat
equipment:
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/SS220/Loadouts/Jobs/Security/detective.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# Outer
- type: loadout
id: DetectiveCoatDark
equipment:
Expand Down
1 change: 0 additions & 1 deletion Resources/Prototypes/SS220/Loadouts/Jobs/Security/security-pilot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# Head

- type: loadout
id: PilotCapCap
equipment:
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/SS220/Loadouts/Jobs/Security/security_cadet.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Turtleneck Time
# Job Time
- type: loadoutEffectGroup
id: SecurityCadetTurtleneck
effects:
Expand Down
6 changes: 3 additions & 3 deletions Resources/Prototypes/SS220/Loadouts/Jobs/Security/security_officer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Turtleneck Time
# Job Time
- type: loadoutEffectGroup
id: SecurityTurtleneck
effects:
Expand All @@ -7,7 +7,7 @@
!type:RoleTimeRequirement
role: JobSecurityOfficer
time: 108000 # 30 hrs
# TacSec Time

- type: loadoutEffectGroup
id: TacSec
effects:
Expand Down Expand Up @@ -72,7 +72,7 @@
equipment:
neck: ClothingNeckProtectBundle

#Outer
# Outer
- type: loadout
id: VestArmorSec
equipment:
Expand Down
6 changes: 2 additions & 4 deletions Resources/Prototypes/SS220/Loadouts/Jobs/Security/senior_officer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,11 @@
id: SeniorSecJumpsuit
equipment:
jumpsuit: ClothingUniformJumpsuitSeniorOfficer

# Jumpskirt

- type: loadout
id: SeniorSecJumpskirt
equipment:
jumpsuit: ClothingUniformJumpskirtSeniorOfficer




2 changes: 1 addition & 1 deletion Resources/Prototypes/SS220/Loadouts/Jobs/Security/warden.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Turtleneck Time
# Job Time
- type: loadoutEffectGroup
id: WardenTurtleneck
effects:
Expand Down
Loading
Loading