Cosmetic Drip 3.2 ~ Jumpsuits

Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml

@@ -36,6 +36,7 @@
       - id: ClothingOuterCoatLabCmo
       - id: ClothingUniformJumpsuitCMOTurtle
       - id: ClothingUniformJumpskirtCMOTurtle
+      - id: ClothingUniformCMOFormal # CD
       - id: ClothingHeadHatBeretCmo
       - id: ClothingHeadMirror
       - id: ClothingEyesGlasses

Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml

@@ -3,8 +3,9 @@
   startingInventory:
     ClothingUniformJumpsuitChemistry: 2
     ClothingUniformJumpskirtChemistry: 2
+    ClothingUniformChemistCasual: 2 # CD
     ClothingOuterCoatLabChem: 2
-    ClothingOuterCoatStylishLabChem: 2
+    ClothingOuterCoatStylishLabChem: 2 # CD
     ClothingShoesColorWhite: 2
     ClothingBackpackChemistry: 2
     ClothingBackpackSatchelChemistry: 2

Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml

@@ -7,6 +7,7 @@
     ClothingUniformJumpsuitMedicalDoctor: 4
     ClothingUniformJumpskirtMedicalDoctor: 4
     ClothingUniformDoctorCasual: 4 # CD
+    ClothingUniformMedicalTechnician: 4 # CD
     ClothingBeltMedical: 4
     ClothingHeadHatBeretMedic: 4
     ClothingHeadNurseHat: 4
@@ -27,3 +28,4 @@
     ClothingShoesBootsWinterMed: 2
   contrabandInventory:
     ClothingUniformJumpskirtOfLife: 1
+    ClothingUniformJumpsuitMaintSurgeon: 1 # CD

Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml

@@ -126,9 +126,9 @@
   description: It's a turtleneck worn by those with the experience to be Chief Medical Officer. It provides minor biological protection.
   components:
   - type: Sprite
-    sprite: Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi
+    sprite: _CD/Clothing/Uniforms/Jumpskirt/cmoturtleskirt.rsi # CD
   - type: Clothing
-    sprite: Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi
+    sprite: _CD/Clothing/Uniforms/Jumpskirt/cmoturtleskirt.rsi # CD
 
 - type: entity
   parent: ClothingUniformSkirtBase

Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml

@@ -270,9 +270,9 @@
   description: It's a turtleneck worn by those with the experience to be Chief Medical Officer. It provides minor biological protection.
   components:
   - type: Sprite
-    sprite: Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi
+    sprite: _CD/Clothing/Uniforms/Jumpsuit/cmoturtle.rsi # CD
   - type: Clothing
-    sprite: Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi
+    sprite: _CD/Clothing/Uniforms/Jumpsuit/cmoturtle.rsi # CD
 
 - type: entity
   parent: ClothingUniformBase

Resources/Prototypes/Loadouts/loadout_groups.yml

@@ -1155,7 +1155,8 @@
   - ChiefMedicalOfficerJumpskirt
   - ChiefMedicalOfficerTurtleneckJumpsuit
   - ChiefMedicalOfficerTurtleneckJumpskirt
-
+  - ChiefMedicalOfficerFormalsuit # CD
+
 - type: loadoutGroup
   id: ChiefMedicalOfficerOuterClothing
   name: loadout-group-chief-medical-officer-outerclothing
@@ -1266,6 +1267,7 @@
   loadouts:
   - ChemistJumpsuit
   - ChemistJumpskirt
+  - ChemistCasualsuit # CD
 
 - type: loadoutGroup
   id: ChemistOuterClothing
@@ -1350,6 +1352,7 @@
   loadouts:
   - PsychologistJumpsuit
   - PsychologistJumpskirt
+  - PsychologistCasualJumpsuit # CD
 
 - type: loadoutGroup
   id: BoxerJumpsuit

Resources/Prototypes/_CD/Entities/Clothing/Uniforms/jumpsuits.yml

@@ -175,7 +175,66 @@
     sprite: _CD/Clothing/Uniforms/Jumpsuit/Casual/doctor_casual.rsi
 
 
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformChemistCasual
+  name: casual chemist outfit
+  description: A blue-white shirt with comfortable black slacks. There is an orange armband on the left sleeve with a matching collar.
+  components:
+  - type: Sprite
+    sprite: _CD/Clothing/Uniforms/Jumpsuit/Casual/chemist_casual.rsi
+  - type: Clothing
+    sprite: _CD/Clothing/Uniforms/Jumpsuit/Casual/chemist_casual.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformPsychologistCasual
+  name: psychology professor outfit
+  description: A black turtleneck with comfortable brown pants akin to an early-modern professor, or a psychologist.
+  components:
+  - type: Sprite
+    sprite: _CD/Clothing/Uniforms/Jumpsuit/Casual/psychologist_casual.rsi
+  - type: Clothing
+    sprite: _CD/Clothing/Uniforms/Jumpsuit/Casual/psychologist_casual.rsi
+
 # Non-casual drip below
+
+# medical garments
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformCMOFormal
+  name: medical director suit
+  description: A blue shirt with black slacks. Worn by someone with clinical expectations.
+  components:
+  - type: Sprite
+    sprite: _CD/Clothing/Uniforms/Jumpsuit/cmo_formal.rsi
+  - type: Clothing
+    sprite: _CD/Clothing/Uniforms/Jumpsuit/cmo_formal.rsi
+
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformMedicalTechnician
+  name: medical technician jumpsuit
+  description: A sturdy feeling suit made for utility minded doctors.
+  components:
+  - type: Sprite
+    sprite: _CD/Clothing/Uniforms/Jumpsuit/medical_technician.rsi
+  - type: Clothing
+    sprite: _CD/Clothing/Uniforms/Jumpsuit/medical_technician.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitMaintSurgeon
+  name: rip-surgeon outfit
+  description: A messy blue shirt with rolled sleeves and black jeans, there is a padded pocket to hold surgical tools.
+  components:
+  - type: Sprite
+    sprite: _CD/Clothing/Uniforms/Jumpsuit/maintsurgeon.rsi
+  - type: Clothing
+    sprite: _CD/Clothing/Uniforms/Jumpsuit/maintsurgeon.rsi
+
 # cargo variants
 
 - type: entity

Resources/Prototypes/_CD/Loadouts/Jobs/Medical/chemist.yml

@@ -3,3 +3,9 @@
   id: ChemistModernLabCoat
   equipment: 
     outerClothing: ClothingOuterCoatStylishLabChem
+
+# Uniform
+- type: loadout
+  id: ChemistCasualsuit
+  equipment: 
+    jumpsuit: ClothingUniformChemistCasual

Resources/Prototypes/_CD/Loadouts/Jobs/Medical/chief_medical_officer.yml

@@ -3,3 +3,9 @@
   id: ChiefMedicalOfficerModernLabCoat
   equipment: 
     outerClothing: ClothingOuterCoatStylishLabCMO
+
+# Uniform
+- type: loadout
+  id: ChiefMedicalOfficerFormalsuit
+  equipment: 
+    jumpsuit: ClothingUniformCMOFormal

Resources/Prototypes/_CD/Loadouts/Jobs/Medical/medical_doctor.yml

@@ -3,6 +3,11 @@
   equipment: 
     jumpsuit: ClothingUniformDoctorCasual
 
+- type: loadout
+  id: MedicalTechnician
+  equipment: 
+    jumpsuit: ClothingUniformMedicalTechnician
+
 
 # OuterClothing
 - type: loadout 

Resources/Prototypes/_CD/Loadouts/Jobs/Wildcards/psychologist.yml

@@ -0,0 +1,5 @@
+# Jumpsuit
+- type: loadout
+  id: PsychologistCasualJumpsuit
+  equipment:
+    jumpsuit: ClothingUniformPsychologistCasual

Resources/Textures/_CD/Clothing/Uniforms/Jumpskirt/cmoturtleskirt.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprites by Github KittenColony / Discord kittencolony (297865728374210561)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/_CD/Clothing/Uniforms/Jumpsuit/Casual/chemist_casual.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprites by Github KittenColony / Discord kittencolony (297865728374210561)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/_CD/Clothing/Uniforms/Jumpsuit/Casual/psychologist_casual.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprites by Github KittenColony / Discord kittencolony (297865728374210561)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/_CD/Clothing/Uniforms/Jumpsuit/cmo_formal.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprites by Github KittenColony / Discord kittencolony (297865728374210561)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/_CD/Clothing/Uniforms/Jumpsuit/cmoturtle.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprites by Github KittenColony / Discord kittencolony (297865728374210561)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/_CD/Clothing/Uniforms/Jumpsuit/maintsurgeon.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprites by Github KittenColony / Discord kittencolony (297865728374210561)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/_CD/Clothing/Uniforms/Jumpsuit/medical_technician.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-4.0",
+  "copyright":"Sprites by Github KittenColony / Discord kittencolony (297865728374210561)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}