Ok everything works even if the Labcoat is scuffed on its armor trait…

… for god knows why. If anyone can fix that feel free to I commented it out just so that I could finally be fucking done
impstation · Dec 14, 2024 · 244f18d · 244f18d
1 parent 70211b4
commit 244f18d
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 48 deletions.
diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml
@@ -8,16 +8,6 @@
       role: JobChiefMedicalOfficer
       time: 72000 #20 hrs
 
-# For IMP Prestige
-- type: loadoutEffectGroup
-  id: PrestigeCMO
-  effects:
-  - !type:JobRequirementLoadoutEffect
-    requirement:
-      !type:RoleTimeRequirement
-      role: JobChiefMedicalOfficer
-      time: 180000 #50 hrs
-
 # Jumpsuit
 - type: loadout
   id: ChiefMedicalOfficerJumpsuit
@@ -69,19 +59,6 @@
   equipment:
     neck: ClothingNeckMantleCMO
 
-- type: loadout
-  id: CMOGreatCloak
-  equipment:
-    neck: ClothingNeckCloakCmosgreatcloak
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: PrestigeCMO
-
-- type: startingGear
-  id: CMOGreatCloak
-  equipment:
-    neck: ClothingNeckCloakCmosgreatcloak
-
 # Outer clothing
 - type: loadout
   id: ChiefMedicalOfficerLabCoat
@@ -93,19 +70,6 @@
   equipment:
     outerClothing: ClothingOuterWinterCMO
 
-- type: loadout
-  id: CMOPrestigeLabcoat
-  equipment:
-    outerClothing: ClothingOuterCoatCMO
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: PrestigeCMO
-
-- type: startingGear
-  id: CMOPrestigeLabcoat
-  equipment:
-    outerClothing: ClothingOuterCoatCMO
-
 # Headset
 - type: loadout
   id: ChiefMedicalOfficerHeadsetBasic

diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -1616,7 +1616,7 @@
   loadouts:
   - ChiefMedicalOfficerLabCoat
   - ChiefMedicalOfficerWintercoat
-  - ClothingOuterCoatCMO #IMP
+  - CMOPrestigeLabcoat #IMP
 
 - type: loadoutGroup
   id: ChiefMedicalOfficerNeck
@@ -1625,8 +1625,8 @@
   loadouts:
   - ChiefMedicalOfficerCloak
   - ChiefMedicalOfficerMantle
+  - CMOGreatCloak #IMP
   - ScarfLightBlue
-  - ClothingNeckCloakCmosgreatcloak #IMP
 
 - type: loadoutGroup
   id: ChiefMedicalOfficerShoes

diff --git a/Resources/Prototypes/_Impstation/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/_Impstation/Entities/Clothing/Neck/cloaks.yml
@@ -82,12 +82,10 @@
     stealGroup: HeadCloak
 
 - type: entity
-  parent: [ClothingNeckBase, BaseCommandContraband]
+  parent: ClothingCloakCmo
   id: ClothingNeckCloakCmosgreatcloak
-  name: chief medical officer's great cloak
+  name: chief medical officer's greatcloak
   description: "An ornate high collared great cloak. Good luck keeping it clean."
   components:
   - type: Sprite
     sprite: _Impstation/Clothing/Neck/Cloaks/cmogreatcloak.rsi
-  - type: StealTarget
-    stealGroup: HeadCloak
diff --git a/Resources/Prototypes/_Impstation/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/_Impstation/Entities/Clothing/OuterClothing/coats.yml
@@ -1,14 +1,14 @@
 - type: entity
   parent: [ClothingOuterStorageBase, AllowSuitStorageClothing, BaseCommandContraband]
   id: ClothingOuterCoatCMO
-  name: Chief Medical Officer's Labcoat
-  description: A Medical Labcoat for the Chief Medical officer. The high collar acts as a splash guard for when a patient's veins are particularly leaky. 
+  name: chief medical officer's prestige labcoat
+  description: A Medical Labcoat for the Chief Medical Officer. The high collar acts as a splash guard for when a patient's veins are particularly leaky. 
   components:
   - type: Sprite
     sprite: _Impstation/Clothing/OuterClothing/Coats/cmoprestigecoat.rsi
   - type: Clothing
     sprite: _Impstation/Clothing/OuterClothing/Coats/cmoprestigecoat.rsi
-  - type: Armor
-    modifiers:
-      coefficients:
-        Caustic: 0.75
+ # - type: Armor
+ #   ush modifiers:
+ #     coefficients:
+ #       Caustic: 0.75
diff --git a/Resources/Prototypes/_Impstation/Loadouts/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/_Impstation/Loadouts/Jobs/Medical/chief_medical_officer.yml
@@ -13,5 +13,21 @@
   equipment:
     ears: ClothingHeadsetCMOveteran
   effects:
+  - !type:GroupLoadoutEffect
+    proto: VeteranCMO
+
+- type: loadout
+  id: CMOGreatCloak
+  equipment:
+    neck: ClothingNeckCloakCmosgreatcloak
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: VeteranCMO
+
+- type: loadout
+  id: CMOPrestigeLabcoat
+  equipment:
+    outerClothing: ClothingOuterCoatCMO
+  effects:
   - !type:GroupLoadoutEffect
     proto: VeteranCMO
diff --git a/...Clothing/OuterClothing/Coats/CMOPrestigeCoat.rsi/equipped-OUTERCLOTHING-vox.png b/...Clothing/OuterClothing/Coats/CMOPrestigeCoat.rsi/equipped-OUTERCLOTHING-vox.png
diff --git a/Resources/Textures/_Impstation/Clothing/OuterClothing/Coats/CMOPrestigeCoat.rsi/meta.json b/Resources/Textures/_Impstation/Clothing/OuterClothing/Coats/CMOPrestigeCoat.rsi/meta.json
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4