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

More loadout mastery items, starting glasses #35096

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
+345 −38
Open

More loadout mastery items, starting glasses #35096

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
baa4b0b
Laceup shoes for all heads, normal and alt headset options, cut down …
K-Dynamic Feb 11, 2025
ea7756f
over-head headsets for masters only
K-Dynamic Feb 12, 2025
479af0e
fix CMO headset time
K-Dynamic Feb 12, 2025
4ab3708
move up headsets in loadouts, add headset captions
K-Dynamic Feb 12, 2025
12a784d
hud for doctor, paramed and CMO
K-Dynamic Feb 12, 2025
86288ce
salvage mastery
K-Dynamic Feb 12, 2025
38255fc
revert hop locker fill; only gloves transfered to locker
K-Dynamic Feb 12, 2025
f04c156
hop admin hud instead of glasses
K-Dynamic Feb 12, 2025
4265559
add back medal
K-Dynamic Feb 12, 2025
b13ffeb
clean up duplicate IDs, clear HoS headset ID typo
K-Dynamic Feb 13, 2025
3cc6832
Revert "clean up duplicate IDs, clear HoS headset ID typo"
K-Dynamic Feb 14, 2025
e5395b7
change duplicate loadout to startinggear, fix typo in hos headset loa…
K-Dynamic Feb 14, 2025
30b8c93
startingGear for HoP too
K-Dynamic Feb 14, 2025
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
12 changes: 12 additions & 0 deletions Resources/Locale/en-US/preferences/loadout-groups.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,16 @@ loadout-group-captain-jumpsuit = Captain jumpsuit
loadout-group-captain-neck = Captain neck
loadout-group-captain-backpack = Captain backpack
loadout-group-captain-outerclothing = Captain outer clothing
loadout-group-captain-ears = Captain headset
loadout-group-captain-shoes = Captain shoes

loadout-group-hop-head = Head of Personnel head
loadout-group-hop-jumpsuit = Head of Personnel jumpsuit
loadout-group-hop-neck = Head of Personnel neck
loadout-group-hop-backpack = Head of Personnel backpack
loadout-group-hop-outerclothing = Head of Personnel outer clothing
loadout-group-hop-ears = Head of Personnel headset
loadout-group-hop-shoes = Head of Personnel shoes

# Civilian
loadout-group-passenger-jumpsuit = Passenger jumpsuit
Expand Down Expand Up @@ -92,6 +96,7 @@ loadout-group-quartermaster-jumpsuit = Quartermaster jumpsuit
loadout-group-quartermaster-neck = Quartermaster neck
loadout-group-quartermaster-outerclothing = Quartermaster outer clothing
loadout-group-quartermaster-shoes = Quartermaster shoes
loadout-group-quartermaster-ears = Quartermaster headset

loadout-group-cargo-technician-head = Cargo Technician head
loadout-group-cargo-technician-jumpsuit = Cargo Technician jumpsuit
Expand All @@ -102,13 +107,16 @@ loadout-group-cargo-technician-shoes = Cargo Technician shoes
loadout-group-salvage-specialist-backpack = Salvage Specialist backpack
loadout-group-salvage-specialist-outerclothing = Salvage Specialist outer clothing
loadout-group-salvage-specialist-shoes = Salvage Specialist shoes
loadout-group-salvage-specialist-ears = Salvage Specialist headset
loadout-group-salvage-specialist-neck = Salvage Specialist neck

# Engineering
loadout-group-chief-engineer-head = Chief Engineer head
loadout-group-chief-engineer-jumpsuit = Chief Engineer jumpsuit
loadout-group-chief-engineer-outerclothing = Chief Engineer outer clothing
loadout-group-chief-engineer-neck = Chief Engineer neck
loadout-group-chief-engineer-shoes = Chief Engineer shoes
loadout-group-chief-engineer-ears = Chief Engineer headset

loadout-group-technical-assistant-jumpsuit = Technical Assistant jumpsuit

Expand All @@ -130,6 +138,7 @@ loadout-group-research-director-neck = Research Director neck
loadout-group-research-director-jumpsuit = Research Director jumpsuit
loadout-group-research-director-outerclothing = Research Director outer clothing
loadout-group-research-director-shoes = Research Director shoes
loadout-group-research-director-ears = Research Director headset

loadout-group-scientist-head = Scientist head
loadout-group-scientist-neck = Scientist neck
Expand All @@ -147,6 +156,7 @@ loadout-group-head-of-security-head = Head of Security head
loadout-group-head-of-security-jumpsuit = Head of Security jumpsuit
loadout-group-head-of-security-neck = Head of Security neck
loadout-group-head-of-security-outerclothing = Head of Security outer clothing
loadout-group-head-of-security-ears = Head of Security headset

loadout-group-warden-head = Warden head
loadout-group-warden-jumpsuit = Warden jumpsuit
Expand Down Expand Up @@ -177,8 +187,10 @@ loadout-group-chief-medical-officer-jumpsuit = Chief Medical Officer jumpsuit
loadout-group-chief-medical-officer-outerclothing = Chief Medical Officer outer clothing
loadout-group-chief-medical-officer-shoes = Chief Medical Officer shoes
loadout-group-chief-medical-officer-neck = Chief Medical Officer neck
loadout-group-chief-medical-officer-ears = Chief Medical Officer headset

loadout-group-medical-doctor-head = Medical Doctor head
loadout-group-medical-doctor-eyes = Medical Doctor HUD
loadout-group-medical-doctor-jumpsuit = Medical Doctor jumpsuit
loadout-group-medical-doctor-outerclothing = Medical Doctor outer clothing
loadout-group-medical-doctor-backpack = Medical Doctor backpack
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@
prob: 0.5
- id: ClothingHeadsetCommand
- id: ClothingNeckGoldmedal
- id: ClothingHandsGlovesHop
- id: DoorRemoteService
- id: HoPIDCard
- id: IDComputerCircuitboard
Expand Down
23 changes: 21 additions & 2 deletions Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# For mantles
# For Master Quartermasters; over-ear headset, mantle
- type: loadoutEffectGroup
id: MasterQM
effects:
Expand Down Expand Up @@ -53,7 +53,7 @@

- type: loadout
id: QuartermasterMantle
equipment:
equipment:
neck: ClothingNeckMantleQM
effects:
- !type:GroupLoadoutEffect
Expand All @@ -69,3 +69,22 @@
id: QuartermasterWintercoat
equipment:
outerClothing: ClothingOuterWinterQM

# Ears
- type: loadout
id: QuartermasterHeadset
equipment:
ears: ClothingHeadsetQM

- type: loadout
id: QuartermasterAltHeadset
equipment:
ears: ClothingHeadsetAltCargo
effects:
- !type:GroupLoadoutEffect
proto: MasterQM

- type: loadout
id: QuartermasterAltHeadset
equipment:
ears: ClothingHeadsetAltCargo
43 changes: 43 additions & 0 deletions Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,27 @@
# For Master Salvage Specialists; mining headset, cloak
- type: loadoutEffectGroup
id: MasterSalvageSpecialist
effects:
- !type:JobRequirementLoadoutEffect
requirement:
!type:RoleTimeRequirement
role: JobSalvageSpecialist
time: 180000 # 50 hrs

# Neck
- type: loadout
id: MiningCloak
equipment:
neck: ClothingNeckCloakMiner
effects:
- !type:GroupLoadoutEffect
proto: MasterSalvageSpecialist

- type: startingGear
id: MiningCloak
equipment:
neck: ClothingNeckCloakMiner

# Back
- type: loadout
id: SalvageSpecialistBackpack
Expand Down Expand Up @@ -25,3 +49,22 @@
id: SalvageBoots
equipment:
shoes: ClothingShoesBootsSalvage

# Ears
- type: loadout
id: CargoHeadset
equipment:
ears: ClothingHeadsetCargo

- type: loadout
id: SalvageMiningHeadset
equipment:
neck: ClothingHeadsetMining
effects:
- !type:GroupLoadoutEffect
proto: MasterSalvageSpecialist

- type: loadout
id: SalvageMiningHeadset
equipment:
ears: ClothingHeadsetMining
34 changes: 32 additions & 2 deletions Resources/Prototypes/Loadouts/Jobs/Command/captain.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# For mantles
# For Master Captains; over-ear headset, mantle
- type: loadoutEffectGroup
id: MasterCap
effects:
Expand Down Expand Up @@ -80,7 +80,7 @@
equipment:
back: ClothingBackpackDuffelCaptain

# Outer clothing
# OuterClothing
- type: loadout
id: CaptainOuterClothing
equipment:
Expand All @@ -90,3 +90,33 @@
id: CaptainWintercoat
equipment:
outerClothing: ClothingOuterWinterCap

# Ears
- type: loadout
id: CommandHeadset
equipment:
ears: ClothingHeadsetCommand

- type: loadout
id: CommandAltHeadset
equipment:
ears: ClothingHeadsetAltCommand
effects:
- !type:GroupLoadoutEffect
proto: MasterCap

- type: loadout
id: CommandAltHeadset
equipment:
ears: ClothingHeadsetAltCommand

# Shoes
- type: loadout
id: LaceupShoes
equipment:
shoes: ClothingShoesBootsLaceup

- type: loadout
id: CommandWinterBoots
equipment:
shoes: ClothingShoesBootsWinter
26 changes: 23 additions & 3 deletions Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# For mantles
# For Master HoPs; over-ear headset, mantle
- type: loadoutEffectGroup
id: MasterHoP
effects:
Expand All @@ -8,7 +8,7 @@
role: JobHeadOfPersonnel
time: 72000 #20 hrs

# Professional HoP Time
# For Professional HoPs; backpack
- type: loadoutEffectGroup
id: ProfessionalHoP
effects:
Expand Down Expand Up @@ -63,8 +63,28 @@
equipment:
back: ClothingBackpackIan

# Outerclothing
# OuterClothing
- type: loadout
id: HoPWintercoat
equipment:
outerClothing: ClothingOuterWinterHoP

# Ears
- type: loadout
id: HoPAltHeadset
equipment:
ears: ClothingHeadsetAltCommand
effects:
- !type:GroupLoadoutEffect
proto: MasterHoP

- type: loadout
id: HoPAltHeadset
equipment:
ears: ClothingHeadsetAltCommand

# Shoes
- type: loadout
id: BrownShoes
equipment:
shoes: ClothingShoesColorBrown
21 changes: 17 additions & 4 deletions Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# For mantles
# For Master CEs; over-ear headset, mantle
- type: loadoutEffectGroup
id: MasterCE
effects:
Expand Down Expand Up @@ -64,8 +64,21 @@
equipment:
outerClothing: ClothingOuterWinterCE

# Shoes
# Ears
- type: loadout
id: BrownShoes
id: ChiefEngineerHeadset
equipment:
shoes: ClothingShoesColorBrown
ears: ClothingHeadsetCE

- type: loadout
id: ChiefEngineerAltHeadset
equipment:
ears: ClothingHeadsetAltEngineering
effects:
- !type:GroupLoadoutEffect
proto: MasterCE

- type: loadout
id: ChiefEngineerAltHeadset
equipment:
ears: ClothingHeadsetAltEngineering
22 changes: 20 additions & 2 deletions Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# For mantles
# For Master CMOs; over-ear headset, mantle
- type: loadoutEffectGroup
id: MasterCMO
effects:
Expand Down Expand Up @@ -59,7 +59,7 @@
equipment:
neck: ClothingNeckMantleCMO

# Outer clothing
# OuterClothing
- type: loadout
id: ChiefMedicalOfficerLabCoat
equipment:
Expand All @@ -70,3 +70,21 @@
equipment:
outerClothing: ClothingOuterWinterCMO

# Ears
- type: loadout
id: ChiefMedicalOfficerHeadset
equipment:
ears: ClothingHeadsetCMO

- type: loadout
id: ChiefMedicalOfficerAltHeadset
equipment:
ears: ClothingHeadsetAltMedical
effects:
- !type:GroupLoadoutEffect
proto: MasterCMO

- type: loadout
id: ChiefMedicalOfficerAltHeadset
equipment:
ears: ClothingHeadsetAltMedical
11 changes: 11 additions & 0 deletions Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,3 +175,14 @@
id: SterileMask
equipment:
mask: ClothingMaskSterile

# Eyes
- type: loadout
id: MedHud
equipment:
eyes: ClothingEyesHudMedical

- type: loadout
id: MedHudEyepatch
equipment:
eyes: ClothingEyesEyepatchHudMedical
21 changes: 20 additions & 1 deletion Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# For mantles
# For Master RDs; over-ear headset, mantle
- type: loadoutEffectGroup
id: MasterRD
effects:
Expand Down Expand Up @@ -53,3 +53,22 @@
id: ResearchDirectorWintercoat
equipment:
outerClothing: ClothingOuterWinterRD

# Ears
- type: loadout
id: ResearchDirectorHeadset
equipment:
ears: ClothingHeadsetRD

- type: loadout
id: ResearchDirectorAltHeadset
equipment:
ears: ClothingHeadsetAltScience
effects:
- !type:GroupLoadoutEffect
proto: MasterRD

- type: loadout
id: ResearchDirectorAltHeadset
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You got a duplicate here and in 63 line. As Roomba said, it will be cool if you will add unique headsets for mastery instead of cloning existing.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See reply to other review #35096 (comment)

equipment:
ears: ClothingHeadsetAltScience
Loading
Loading