Fix senior ID cards and other loadout shit (#27017)

* remove senior backpacks

* fix ID cards

* Update atmospheric_technician.yml

diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
index 63ecb547850a257f7b25ddb6b024cb599f5fe878..b44b71930f76a5bcffeef76df20deb4c0b3c73ac 100644 (file)
--- 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 16a2ef858014074bc9dea5a6075a4794eeb7780a..6e6b90af40afc8cddc1504baa23f40df9445a15a 100644 (file)
--- 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 619a0435d8804d8795772d8e7325c3bf9f11fdb2..743f04dd9232843b5354902da5ecbc5f40e60891 100644 (file)
--- 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 2e1d29b29eee7b941784a0d80e2ef9a4c042e949..9629296d5c2202a9f8e798d815412079679ec097 100644 (file)
--- 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 e447742402c09df62c97b868ab00902f2cc14195..74a371c0a893f8b4ec6a5ceade09f1745407f008 100644 (file)
--- 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 30f4e9937b29ea330609473b72b18bb8e6b1d246..91d96aa797a391f5b48aef703a89149e9f552552 100644 (file)
--- 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 5541d0ee02348d36da1043500cc5ef8ee859f646..ced02f41ea05ac9172b79114be0cb84176e3dc42 100644 (file)
--- 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