From e2be85bc52b51b7c736b2f0c7bfb4a2a0fc39e71 Mon Sep 17 00:00:00 2001 From: "Mr. 27" <45323883+Dutch-VanDerLinde@users.noreply.github.com> Date: Tue, 16 Apr 2024 16:17:06 -0400 Subject: [PATCH] Fix senior ID cards and other loadout shit (#27017) * remove senior backpacks * fix ID cards * Update atmospheric_technician.yml --- .../Objects/Misc/identification_cards.yml | 8 ++--- .../Engineering/atmospheric_technician.yml | 2 +- .../Jobs/Engineering/station_engineer.yml | 36 ------------------- .../Loadouts/Jobs/Medical/medical_doctor.yml | 36 ------------------- .../Loadouts/Jobs/Science/scientist.yml | 36 ------------------- .../Jobs/Security/security_officer.yml | 36 ------------------- .../Prototypes/Loadouts/loadout_groups.yml | 12 ------- 7 files changed, 5 insertions(+), 161 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index 63ecb54785..b44b71930f 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -802,7 +802,7 @@ - type: Unremoveable - type: entity - parent: IDCardStandard + parent: EngineeringIDCard id: SeniorEngineerIDCard name: senior engineer ID card components: @@ -812,7 +812,7 @@ - state: idseniorengineer - type: entity - parent: IDCardStandard + parent: ResearchIDCard id: SeniorResearcherIDCard name: senior researcher ID card components: @@ -822,7 +822,7 @@ - state: idseniorresearcher - type: entity - parent: IDCardStandard + parent: MedicalIDCard id: SeniorPhysicianIDCard name: senior physician ID card components: @@ -832,7 +832,7 @@ - state: idseniorphysician - type: entity - parent: IDCardStandard + parent: SecurityIDCard id: SeniorOfficerIDCard name: senior officer ID card components: diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/atmospheric_technician.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/atmospheric_technician.yml index 16a2ef8580..6e6b90af40 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Engineering/atmospheric_technician.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/atmospheric_technician.yml @@ -43,7 +43,7 @@ - type: startingGear id: AtmosphericTechnicianSatchel equipment: - back: ClothingBackpackSatchelEngineeringFilled + back: ClothingBackpackSatchelAtmosphericsFilled - type: loadout id: AtmosphericTechnicianDuffel diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml index 619a0435d8..743f04dd92 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml @@ -120,42 +120,6 @@ equipment: back: ClothingBackpackDuffelEngineeringFilled -- type: loadout - id: SeniorEngineerBackpack - equipment: SeniorEngineerBackpack - effects: - - !type:GroupLoadoutEffect - proto: SeniorEngineering - -- type: startingGear - id: SeniorEngineerBackpack - equipment: - back: ClothingBackpackEngineeringFilled - -- type: loadout - id: SeniorEngineerSatchel - equipment: SeniorEngineerSatchel - effects: - - !type:GroupLoadoutEffect - proto: SeniorEngineering - -- type: startingGear - id: SeniorEngineerSatchel - equipment: - back: ClothingBackpackSatchelEngineeringFilled - -- type: loadout - id: SeniorEngineerDuffel - equipment: SeniorEngineerDuffel - effects: - - !type:GroupLoadoutEffect - proto: SeniorEngineering - -- type: startingGear - id: SeniorEngineerDuffel - equipment: - back: ClothingBackpackDuffelEngineeringFilled - # OuterClothing - type: loadout id: StationEngineerOuterVest diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml index 2e1d29b29e..9629296d5c 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml @@ -166,42 +166,6 @@ equipment: back: ClothingBackpackDuffelMedicalFilled -- type: loadout - id: SeniorPhysicianBackpack - equipment: SeniorPhysicianBackpack - effects: - - !type:GroupLoadoutEffect - proto: SeniorPhysician - -- type: startingGear - id: SeniorPhysicianBackpack - equipment: - back: ClothingBackpackDuffelMedicalFilled - -- type: loadout - id: SeniorPhysicianSatchel - equipment: SeniorPhysicianSatchel - effects: - - !type:GroupLoadoutEffect - proto: SeniorPhysician - -- type: startingGear - id: SeniorPhysicianSatchel - equipment: - back: ClothingBackpackSatchelMedicalFilled - -- type: loadout - id: SeniorPhysicianDuffel - equipment: SeniorPhysicianDuffel - effects: - - !type:GroupLoadoutEffect - proto: SeniorPhysician - -- type: startingGear - id: SeniorPhysicianDuffel - equipment: - back: ClothingBackpackDuffelMedicalFilled - # OuterClothing - type: loadout diff --git a/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml b/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml index e447742402..74a371c0a8 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml @@ -104,42 +104,6 @@ equipment: back: ClothingBackpackDuffelScienceFilled -- type: loadout - id: SeniorResearcherBackpack - equipment: SeniorResearcherBackpack - effects: - - !type:GroupLoadoutEffect - proto: SeniorResearcher - -- type: startingGear - id: SeniorResearcherBackpack - equipment: - back: ClothingBackpackScienceFilled - -- type: loadout - id: SeniorResearcherSatchel - equipment: SeniorResearcherSatchel - effects: - - !type:GroupLoadoutEffect - proto: SeniorResearcher - -- type: startingGear - id: SeniorResearcherSatchel - equipment: - back: ClothingBackpackSatchelScienceFilled - -- type: loadout - id: SeniorResearcherDuffel - equipment: SeniorResearcherDuffel - effects: - - !type:GroupLoadoutEffect - proto: SeniorResearcher - -- type: startingGear - id: SeniorResearcherDuffel - equipment: - back: ClothingBackpackDuffelScienceFilled - # OuterClothing - type: loadout id: RegularLabCoat diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml index 30f4e9937b..91d96aa797 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml @@ -112,42 +112,6 @@ equipment: back: ClothingBackpackDuffelSecurityFilled -- type: loadout - id: SeniorOfficerBackpack - equipment: SeniorOfficerBackpack - effects: - - !type:GroupLoadoutEffect - proto: SeniorOfficer - -- type: startingGear - id: SeniorOfficerBackpack - equipment: - back: ClothingBackpackSecurityFilled - -- type: loadout - id: SeniorOfficerSatchel - equipment: SeniorOfficerSatchel - effects: - - !type:GroupLoadoutEffect - proto: SeniorOfficer - -- type: startingGear - id: SeniorOfficerSatchel - equipment: - back: ClothingBackpackSatchelSecurityFilled - -- type: loadout - id: SeniorOfficerDuffel - equipment: SeniorOfficerDuffel - effects: - - !type:GroupLoadoutEffect - proto: SeniorOfficer - -- type: startingGear - id: SeniorOfficerDuffel - equipment: - back: ClothingBackpackDuffelSecurityFilled - # PDA - type: loadout id: SecurityPDA diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 5541d0ee02..ced02f41ea 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -492,9 +492,6 @@ - StationEngineerBackpack - StationEngineerSatchel - StationEngineerDuffel - - SeniorEngineerBackpack - - SeniorEngineerSatchel - - SeniorEngineerDuffel - type: loadoutGroup id: StationEngineerOuterClothing @@ -594,9 +591,6 @@ - ScientistBackpack - ScientistSatchel - ScientistDuffel - - SeniorResearcherBackpack - - SeniorResearcherSatchel - - SeniorResearcherDuffel - type: loadoutGroup id: ScientistOuterClothing @@ -705,9 +699,6 @@ - SecurityBackpack - SecuritySatchel - SecurityDuffel - - SeniorOfficerBackpack - - SeniorOfficerSatchel - - SeniorOfficerDuffel - type: loadoutGroup id: SecurityPDA @@ -839,9 +830,6 @@ - MedicalDoctorBackpack - MedicalDoctorSatchel - MedicalDoctorDuffel - - SeniorPhysicianBackpack - - SeniorPhysicianSatchel - - SeniorPhysicianDuffel - type: loadoutGroup id: MedicalDoctorPDA