From b9f129d3a8f02b5044de9a238911ba2202269c98 Mon Sep 17 00:00:00 2001 From: Whatstone Date: Sun, 19 Jan 2025 13:16:54 -0500 Subject: [PATCH] "DirectorOfCare" caps, a million loadout changes --- Resources/Maps/_NF/POI/medical.yml | 2 +- Resources/Prototypes/Guidebook/medical.yml | 2 +- .../_NF/Entities/Markers/Spawners/jobs.yml | 10 +++-- .../Devices/Misc/identification_cards.yml | 2 +- .../Prototypes/_NF/Guidebook/medical.yml | 2 +- .../_NF/Loadouts/Jobs/Contractor/bags.yml | 11 +++++ .../Jobs/Contractor/encryption_keys.yml | 3 ++ .../_NF/Loadouts/Jobs/Contractor/shoes.yml | 4 +- .../Prototypes/_NF/Loadouts/Jobs/Doc/bags.yml | 19 ++++++++ .../Prototypes/_NF/Loadouts/Jobs/Doc/ears.yml | 3 +- .../Prototypes/_NF/Loadouts/Jobs/Doc/neck.yml | 9 ++++ .../Prototypes/_NF/Loadouts/Jobs/Doc/pda.yml | 2 +- .../_NF/Loadouts/Jobs/Doc/shoes.yml | 7 +++ .../_NF/Loadouts/doc_loadout_groups.yml | 43 +++++++++++++------ .../_NF/Loadouts/loadout_effects.yml | 16 +++++-- .../Prototypes/_NF/Loadouts/role_loadouts.yml | 12 +++--- .../_NF/Loadouts/stc_loadout_groups.yml | 4 +- .../_NF/PointsOfInterest/medical.yml | 2 +- .../Prototypes/_NF/Roles/Jobs/Medical/doc.yml | 6 +-- .../Prototypes/_NF/Roles/Jobs/departments.yml | 2 +- .../_NF/Roles/play_time_trackers.yml | 2 +- 21 files changed, 123 insertions(+), 40 deletions(-) create mode 100644 Resources/Prototypes/_NF/Loadouts/Jobs/Doc/bags.yml create mode 100644 Resources/Prototypes/_NF/Loadouts/Jobs/Doc/neck.yml create mode 100644 Resources/Prototypes/_NF/Loadouts/Jobs/Doc/shoes.yml diff --git a/Resources/Maps/_NF/POI/medical.yml b/Resources/Maps/_NF/POI/medical.yml index d568ac09627..b0fd2fb559e 100644 --- a/Resources/Maps/_NF/POI/medical.yml +++ b/Resources/Maps/_NF/POI/medical.yml @@ -11584,7 +11584,7 @@ entities: rot: -1.5707963267948966 rad pos: -1.5,-7.5 parent: 1 -- proto: SpawnPointDirectorofCare +- proto: SpawnPointDirectorOfCare entities: - uid: 857 components: diff --git a/Resources/Prototypes/Guidebook/medical.yml b/Resources/Prototypes/Guidebook/medical.yml index c181fedd0d3..2de55878fe7 100644 --- a/Resources/Prototypes/Guidebook/medical.yml +++ b/Resources/Prototypes/Guidebook/medical.yml @@ -3,7 +3,7 @@ name: guide-entry-medical text: "/ServerInfo/Guidebook/Medical/Medical.xml" children: - - DirectorofCare # Frontier + - DirectorOfCare # Frontier - Medical Doctor - Chemist - Cloning diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/jobs.yml index f3affcf83b1..4ce80106b89 100644 --- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/jobs.yml @@ -94,7 +94,7 @@ - type: entity id: SpawnPointERTMailCarrier parent: SpawnPointJobBase - name: ERTmailcarrier + name: ERT mail carrier components: - type: SpawnPoint job_id: ERTMailCarrier @@ -105,12 +105,12 @@ - state: ertmailcarrier - type: entity - id: SpawnPointDirectorofCare + id: SpawnPointDirectorOfCare parent: SpawnPointJobBase - name: directorofcare + name: director of care components: - type: SpawnPoint - job_id: DirectorofCare + job_id: DirectorOfCare - type: Sprite sprite: _NF/Markers/jobs.rsi layers: @@ -169,6 +169,7 @@ id: NFSpawnPointDetective parent: SpawnPointDetective name: detective + suffix: Frontier components: - type: SpawnPoint job_id: NFDetective @@ -184,6 +185,7 @@ - type: entity id: NFSpawnPointJanitor parent: SpawnPointJanitor + suffix: Frontier components: - type: SpawnPoint job_id: NFJanitor diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/identification_cards.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/identification_cards.yml index 4aeb59b9fc5..d5e3a37e318 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/identification_cards.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/identification_cards.yml @@ -274,7 +274,7 @@ name: director of care ID card components: - type: PresetIdCard - job: DirectorofCare + job: DirectorOfCare - type: Sprite sprite: _NF/Objects/Misc/id_cards.rsi layers: diff --git a/Resources/Prototypes/_NF/Guidebook/medical.yml b/Resources/Prototypes/_NF/Guidebook/medical.yml index 1716839e47d..09a298d66a0 100644 --- a/Resources/Prototypes/_NF/Guidebook/medical.yml +++ b/Resources/Prototypes/_NF/Guidebook/medical.yml @@ -4,6 +4,6 @@ text: "/ServerInfo/_NF/Guidebook/Medical/MedicalBounties.xml" - type: guideEntry - id: DirectorofCare + id: DirectorOfCare name: guide-entry-medical-doc text: "/ServerInfo/_NF/Guidebook/Medical/Doc.xml" diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/bags.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/bags.yml index fe46a166629..63977b32a85 100644 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/bags.yml +++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/bags.yml @@ -214,6 +214,8 @@ effects: - !type:GroupLoadoutEffect proto: ContractorT1 + - !type:GroupLoadoutEffect + proto: NFNotDoc price: 500 equipment: back: ClothingBackpackMedical @@ -223,6 +225,9 @@ effects: - !type:GroupLoadoutEffect proto: ContractorT1 + hideEffects: + - !type:GroupLoadoutEffect + proto: NFNotDoc price: 750 equipment: back: ClothingBackpackDuffelMedical @@ -232,6 +237,9 @@ effects: - !type:GroupLoadoutEffect proto: ContractorT1 + hideEffects: + - !type:GroupLoadoutEffect + proto: NFNotDoc price: 500 equipment: back: ClothingBackpackSatchelMedical @@ -241,6 +249,9 @@ effects: - !type:GroupLoadoutEffect proto: ContractorT1 + hideEffects: + - !type:GroupLoadoutEffect + proto: NFNotDoc price: 500 equipment: back: ClothingBackpackMessengerMedical diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/encryption_keys.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/encryption_keys.yml index 0408bc36365..5ec56cca38b 100644 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/encryption_keys.yml +++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/encryption_keys.yml @@ -7,6 +7,9 @@ - type: loadout id: ContractorEncryptionKeyMedical + effects: + - !type:GroupLoadoutEffect + proto: NFNotDoc storage: back: - EncryptionKeyMedical diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/shoes.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/shoes.yml index 52ef3f603ff..bedb6b29b4e 100644 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/shoes.yml +++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/shoes.yml @@ -114,6 +114,8 @@ hideEffects: - !type:GroupLoadoutEffect proto: ShoesCapableNF + - !type:GroupLoadoutEffect + proto: NFNotDoc price: 600 equipment: shoes: ClothingShoesColorWhite @@ -329,7 +331,7 @@ proto: ContractorT1 hideEffects: - !type:GroupLoadoutEffect - proto: NotStcNF + proto: NFNotDocOrStc - !type:GroupLoadoutEffect proto: ShoesCapableNF price: 600 diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Doc/bags.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Doc/bags.yml new file mode 100644 index 00000000000..e9c2a3d5816 --- /dev/null +++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Doc/bags.yml @@ -0,0 +1,19 @@ +- type: loadout + id: DocClothingBackpackMedical + equipment: + back: ClothingBackpackMedical + +- type: loadout + id: DocClothingBackpackDuffelMedical + equipment: + back: ClothingBackpackDuffelMedical + +- type: loadout + id: DocClothingBackpackSatchelMedical + equipment: + back: ClothingBackpackSatchelMedical + +- type: loadout + id: DocClothingBackpackMessengerMedical + equipment: + back: ClothingBackpackMessengerMedical diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Doc/ears.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Doc/ears.yml index d3a67b13e96..1dab7fa6bcb 100644 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Doc/ears.yml +++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Doc/ears.yml @@ -1,5 +1,4 @@ - type: loadout - id: DocClothingHeadsetCommand - price: 0 + id: DocClothingHeadsetDoc equipment: ears: ClothingHeadsetDoc diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Doc/neck.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Doc/neck.yml new file mode 100644 index 00000000000..6655cb9d086 --- /dev/null +++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Doc/neck.yml @@ -0,0 +1,9 @@ +- type: loadout + id: DocClothingCloakCmo + equipment: + neck: ClothingCloakCmo + +- type: loadout + id: DocClothingNeckMantleCMO + equipment: + neck: ClothingNeckMantleCMO diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Doc/pda.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Doc/pda.yml index b33a3287d24..a81aa610697 100644 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Doc/pda.yml +++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Doc/pda.yml @@ -1,4 +1,4 @@ - type: loadout - id: MedicDocPDA + id: DocDocPDA equipment: id: DocPDA diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Doc/shoes.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Doc/shoes.yml new file mode 100644 index 00000000000..ec24b16cc0c --- /dev/null +++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Doc/shoes.yml @@ -0,0 +1,7 @@ +- type: loadout + id: DocClothingShoesColorWhite + hideEffects: + - !type:GroupLoadoutEffect + proto: ShoesCapableNF + equipment: + shoes: ClothingShoesColorWhite diff --git a/Resources/Prototypes/_NF/Loadouts/doc_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/doc_loadout_groups.yml index b197fc078fc..1ead6f679a5 100644 --- a/Resources/Prototypes/_NF/Loadouts/doc_loadout_groups.yml +++ b/Resources/Prototypes/_NF/Loadouts/doc_loadout_groups.yml @@ -10,6 +10,27 @@ - ChiefMedicalOfficerJumpsuit - ChiefMedicalOfficerJumpskirt +- type: loadoutGroup + id: DocGloves + name: loadout-group-contractor-gloves + minLimit: 0 + loadouts: + - NitrileGloves + - LatexGloves + +- type: loadoutGroup + id: DocBackpack + name: loadout-group-contractor-backpack + loadouts: + - DocClothingBackpackMedical + - DocClothingBackpackDuffelMedical + - DocClothingBackpackSatchelMedical + - DocClothingBackpackMessengerMedical + subgroups: + - ContractorBackpack + fallback: + - DocClothingBackpackMedical + - type: loadoutGroup id: DocHead name: loadout-group-contractor-head @@ -24,37 +45,35 @@ id: DocEars name: loadout-group-contractor-ears hidden: true # No point in showing this, it gets auto-selected. - minLimit: 1 - maxLimit: 1 loadouts: - - DocClothingHeadsetCommand + - DocClothingHeadsetDoc fallbacks: - - DocClothingHeadsetCommand + - DocClothingHeadsetDoc - type: loadoutGroup id: DocNeck name: loadout-group-contractor-neck minLimit: 0 loadouts: - - ChiefMedicalOfficerCloak + - DocClothingCloakCmo + - DocClothingNeckMantleCMO - type: loadoutGroup id: DocPDA name: loadout-group-contractor-id hidden: true # No point in showing this, it gets auto-selected. loadouts: - - MedicDocPDA + - DocDocPDA fallbacks: - - MedicDocPDA + - DocDocPDA - type: loadoutGroup id: DocShoes name: loadout-group-contractor-shoes loadouts: - - MercenaryClothingShoesBootsMercenary - - MercenaryClothingShoesBootsJack - - MercenaryClothingShoesBootsCombat + - DocClothingShoesColorWhite + - StcClothingShoesBootsLaceup # reused purposefully subgroups: - - PilotShoes + - ContractorShoes fallbacks: - - MercenaryClothingShoesBootsMercenary + - DocClothingShoesColorWhite \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Loadouts/loadout_effects.yml b/Resources/Prototypes/_NF/Loadouts/loadout_effects.yml index b1c83790608..b37eb7792c2 100644 --- a/Resources/Prototypes/_NF/Loadouts/loadout_effects.yml +++ b/Resources/Prototypes/_NF/Loadouts/loadout_effects.yml @@ -64,16 +64,24 @@ - Rodentia - type: loadoutEffectGroup - id: NotStcNF + id: NFNotDocOrStc effects: - !type:RoleBlacklistLoadoutEffect blacklist: - - JobStationTrafficController + - JobStationTrafficController + - JobDirectorOfCare + +- type: loadoutEffectGroup + id: NFNotDoc + effects: + - !type:RoleBlacklistLoadoutEffect + blacklist: + - JobDirectorOfCare - type: loadoutEffectGroup id: NotFemaleNF effects: - !type:SexLoadoutEffect sex: - - Male - - Unsexed + - Male + - Unsexed diff --git a/Resources/Prototypes/_NF/Loadouts/role_loadouts.yml b/Resources/Prototypes/_NF/Loadouts/role_loadouts.yml index 9324b701674..e3d6c71e4a4 100644 --- a/Resources/Prototypes/_NF/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/_NF/Loadouts/role_loadouts.yml @@ -205,22 +205,24 @@ - NFSpeciesSpecific - type: roleLoadout - id: JobDirectorofCare + id: JobDirectorOfCare groups: - DocHead - DocNeck - DocJumpsuit - - MercenaryGloves - - MercenaryBackpack - - ContractorShoes + - DocGloves + - DocBackpack + - ContractorOuterClothing + - DocShoes - ContractorFace - ContractorGlasses - - DocPDA - ContractorBelt - DocEars - ContractorBoxSurvival + - DocPDA - ContractorCartridge - ContractorImplanter + - ContractorEncryptionKey - ContractorFun - ContractorTrinkets - ContractorBureaucracy diff --git a/Resources/Prototypes/_NF/Loadouts/stc_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/stc_loadout_groups.yml index 8e836ff4aa8..db0b5109010 100644 --- a/Resources/Prototypes/_NF/Loadouts/stc_loadout_groups.yml +++ b/Resources/Prototypes/_NF/Loadouts/stc_loadout_groups.yml @@ -39,4 +39,6 @@ loadouts: - StcClothingShoesBootsLaceup subgroups: - - ContractorShoes + - ContractorShoes + fallbacks: + - StcClothingShoesBootsLaceup diff --git a/Resources/Prototypes/_NF/PointsOfInterest/medical.yml b/Resources/Prototypes/_NF/PointsOfInterest/medical.yml index fc3b8e6d658..1d9a585e4fe 100644 --- a/Resources/Prototypes/_NF/PointsOfInterest/medical.yml +++ b/Resources/Prototypes/_NF/PointsOfInterest/medical.yml @@ -39,7 +39,7 @@ lobbySortOrder: 4 - type: StationJobs availableJobs: - DirectorofCare: [ 1, 1 ] + DirectorOfCare: [ 1, 1 ] Pilot: [ -1, -1 ] Mercenary: [ -1, -1 ] - type: StationDeadDrop diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Medical/doc.yml b/Resources/Prototypes/_NF/Roles/Jobs/Medical/doc.yml index f2d092fe3bb..8ffac414b8d 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Medical/doc.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Medical/doc.yml @@ -1,8 +1,8 @@ - type: job - id: DirectorofCare + id: DirectorOfCare name: job-name-doc description: job-description-doc - playTimeTracker: JobDirectorofCare + playTimeTracker: JobDirectorOfCare requirements: - !type:OverallPlaytimeRequirement time: 72000 # 20 hrs @@ -13,7 +13,7 @@ requireAdminNotify: true supervisors: job-supervisors-centcom weight: 170 - displayWeight: 60 # Top + displayWeight: 55 # Second from the top canBeAntag: false accessGroups: - AllAccess diff --git a/Resources/Prototypes/_NF/Roles/Jobs/departments.yml b/Resources/Prototypes/_NF/Roles/Jobs/departments.yml index 48a3eab5c44..b22dfeb379e 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/departments.yml @@ -6,7 +6,7 @@ weight: 50 # accounted for in jobs roles: - StationRepresentative - - DirectorofCare + - DirectorOfCare - StationTrafficController - Valet # nyano - NFJanitor diff --git a/Resources/Prototypes/_NF/Roles/play_time_trackers.yml b/Resources/Prototypes/_NF/Roles/play_time_trackers.yml index 295e7997c10..b93bdc3f891 100644 --- a/Resources/Prototypes/_NF/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/_NF/Roles/play_time_trackers.yml @@ -29,4 +29,4 @@ id: JobPirate - type: playTimeTracker - id: JobDirectorofCare + id: JobDirectorOfCare