Cosmatic Drip 1 (cosmatic-drift-14#218)

KittenColony · Jul 27, 2024 · a01d60f · a01d60f
1 parent 16df721
commit a01d60f
Show file tree

Hide file tree

Showing 180 changed files with 1,231 additions and 5 deletions.
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml
@@ -6,12 +6,14 @@
     ClothingBackpackDuffelCargo: 3
     ClothingUniformJumpsuitCargo: 3
     ClothingUniformJumpskirtCargo: 3
+    ClothingUniformJumpsuitCargoPants: 3 # CD
     ClothingShoesColorBlack: 3
     ClothingHandsGlovesFingerless: 3
     ClothingHeadHatCargosoft: 3
     ClothingHeadBandBrown: 3
     ClothingHeadsetCargo: 3
     ClothingOuterWinterCargo: 2
     ClothingOuterWinterMiner: 2
+    ClothingOuterCoatCargoBomber: 2 # CD
     ClothingNeckScarfStripedBrown: 3
     ClothingShoesBootsWinterCargo: 2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/centdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/centdrobe.yml
@@ -16,5 +16,6 @@
     ClothingHeadsetCentCom: 3
     ClothingOuterWinterCentcom: 3
     ClothingOuterCoatExpensive: 1
+    ClothingOuterCoatCentcomOfficer: 1 # CD
     ClothingNeckScarfStripedCentcom: 3
     ClothingNeckCloakCentcom: 3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml
@@ -7,12 +7,15 @@
     ClothingUniformJumpsuitEngineering: 3
     ClothingUniformJumpskirtEngineering: 3
     ClothingUniformJumpsuitEngineeringHazard: 3
+    ClothingUniformJumpsuitEngineeringCasual: 3 # CD
     ClothingShoesColorBlack: 3
     ClothingOuterVestHazard: 3
     ClothingShoesBootsWork: 3
     ClothingHeadHatHardhatYellow: 3
     ClothingHeadHatHardhatOrange: 3
     ClothingHeadsetEngineering: 3
     ClothingOuterWinterEngi: 2
+    ClothingOuterCoatYellowHiVis: 3 # CD
+    ClothingOuterCoatOrangeHiVis: 3 # CD
     ClothingNeckScarfStripedOrange: 3
     ClothingShoesBootsWinterEngi: 2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml
@@ -6,6 +6,7 @@
     ClothingBackpackSatchelMedical: 4
     ClothingUniformJumpsuitMedicalDoctor: 4
     ClothingUniformJumpskirtMedicalDoctor: 4
+    ClothingUniformDoctorCasual: 4 # CD
     ClothingHeadHatBeretMedic: 4
     ClothingHeadNurseHat: 4
     ClothingOuterCoatLab: 4

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
@@ -15,6 +15,8 @@
     ClothingUniformJumpsuitSecGrey: 3
     ClothingUniformJumpskirtSecGrey: 3
     ClothingUniformJumpsuitSecBlue: 3
+    ClothingUniformSecurtyCasual: 3 # CD
+    ClothingUniformJumpskirtSecurtyCasual: 3 # CD
     ClothingHeadsetSecurity: 3
     ClothingOuterWinterSec: 2
     ClothingOuterArmorBasic: 2

diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml
@@ -86,6 +86,7 @@
   equipment:
     jumpsuit: ClothingUniformJumpsuitEngineeringHazard
 
+
 # - type: loadout (CD removed senior clothing in favor of senior roles)
 #   id: SeniorEngineerJumpsuit
 #   equipment: SeniorEngineerJumpsuit

diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -546,6 +546,7 @@
   minLimit: 0
   loadouts:
   - QuartermasterWintercoat
+  - CargoBomber # CD
 
 - type: loadoutGroup
   id: QuartermasterShoes
@@ -567,6 +568,7 @@
   loadouts:
   - CargoTechnicianJumpsuit
   - CargoTechnicianJumpskirt
+  - CargoTechnicianPants # CD
 
 - type: loadoutGroup
   id: CargoTechnicianBackpack
@@ -582,7 +584,8 @@
   minLimit: 0
   loadouts:
   - CargoTechnicianWintercoat
-
+  - CargoBomber # CD  
+
 - type: loadoutGroup
   id: CargoTechnicianShoes
   name: loadout-group-cargo-technician-shoes
@@ -675,6 +678,7 @@
   - StationEngineerJumpsuit
   - StationEngineerJumpskirt
   - StationEngineerHazardsuit
+  - StationEngineerCasualsuit # CD
   # - SeniorEngineerJumpsuit
   # - SeniorEngineerJumpskirt
 
@@ -879,6 +883,8 @@
   loadouts:
   - HeadofSecurityJumpsuit
   - HeadofSecurityJumpskirt
+  - SeniorOfficerCasualsuit # CD
+  - SeniorOfficerCasualskirt # CD
   - HeadofSecurityTurtleneck
   - HeadofSecurityTurtleneckSkirt
   - HeadofSecurityFormalSuit
@@ -913,6 +919,8 @@
   loadouts:
   - WardenJumpsuit
   - WardenJumpskirt
+  - WardenCasualsuit # CD
+  - WardenCasualskirt # CD
 
 - type: loadoutGroup
   id: WardenOuterClothing
@@ -936,6 +944,8 @@
   loadouts:
   - SecurityJumpsuit
   - SecurityJumpskirt
+  - SecurityCasualsuit # CD
+  - SecurityCasualskirt # CD
   # - SeniorOfficerJumpsuit
   # - SeniorOfficerJumpskirt
   - SecurityJumpsuitGrey
@@ -1088,6 +1098,7 @@
   loadouts:
   - MedicalDoctorJumpsuit
   - MedicalDoctorJumpskirt
+  - MedicalCasualsuit # CD
   # - SeniorPhysicianJumpsuit
   # - SeniorPhysicianJumpskirt
   - MedicalBlueScrubs
@@ -1186,6 +1197,8 @@
   loadouts:
   - ParamedicJumpsuit
   - ParamedicJumpskirt
+  - ParamedicCasualsuit # CD
+  - ParamedicCasualskirt # CD
   # CD: ETU Loadout
   - JumpsuitETUFlightsuit
 
@@ -1196,6 +1209,7 @@
   loadouts:
   - ParamedicWindbreaker
   - ParamedicWintercoat
+  - BlueHighvisBomber # CD
   # CD: ETU Loadout
   # - BeltHarnessETU
 

diff --git a/Resources/Prototypes/_CD/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/_CD/Catalog/Cargo/cargo_vending.yml
@@ -12,6 +12,6 @@
     sprite: _CD/Objects/Specific/Service/vending_machine_restock.rsi
     state: base
   product: CrateVendingMachineRestockQuickThreadsFilled
-  cost: 3500
+  cost: 4500
   category: cargoproduct-category-name-service
   group: market
diff --git a/Resources/Prototypes/_CD/Catalog/Fills/Lockers/cargo.yml b/Resources/Prototypes/_CD/Catalog/Fills/Lockers/cargo.yml
@@ -10,6 +10,8 @@
         prob: 0.25
       - id: ClothingOuterWinterMiner
         prob: 0.25
+      - id: ClothingOuterCoatCargoBomber
+        prob: 0.25
       - id: HandheldGPSBasic
       - id: RadioHandheld
       - id: OreBag

diff --git a/Resources/Prototypes/_CD/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/_CD/Catalog/Fills/Lockers/heads.yml
@@ -18,6 +18,7 @@
       - id: ClothingUniformJumpskirtQMTurtleneck
       - id: ClothingUniformJumpsuitQM
       - id: ClothingUniformJumpsuitQMTurtleneck
+      - id: ClothingOuterCoatCargoBomber
 
 - type: entity
   id: LockerCaptainFilledCosmetic

diff --git a/Resources/Prototypes/_CD/Catalog/Fills/Lockers/medical.yml b/Resources/Prototypes/_CD/Catalog/Fills/Lockers/medical.yml
@@ -7,6 +7,7 @@
     contents:
       - id: ClothingOuterCoatParamedicWB
       - id: ClothingHeadHatParamedicsoft
+      - id: ClothingOuterCoatBlueHiVis
       - id: ClothingOuterWinterPara
       - id: ClothingUniformJumpsuitParamedic
       - id: ClothingUniformJumpskirtParamedic

diff --git a/Resources/Prototypes/_CD/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/_CD/Catalog/Fills/Lockers/security.yml
@@ -15,6 +15,8 @@
       - id: ClothingOuterCoatWarden
       - id: ClothingOuterWinterWarden
       - id: ClothingEyesHudSecurity
+      - id: ClothingUniformWardenCasual
+      - id: ClothingUniformJumpskirtWardenCasual
 
 - type: entity
   id: LockerDetectiveFilledCosmetic

diff --git a/Resources/Prototypes/_CD/Catalog/VendingMachines/Inventories/quickthreads.yml b/Resources/Prototypes/_CD/Catalog/VendingMachines/Inventories/quickthreads.yml
@@ -42,6 +42,12 @@
     ClothingOuterCoatCowboyDuster: 2
     ClothingOuterCoatMilitaryCoat: 2
     ClothingOuterCoatHarmony: 2
+    ClothingOuterCoatEuropanVet: 2
+    ClothingOuterCoatEuropanCoalition: 2
+    ClothingOuterCoatEuropanSeparatist: 2
+    ClothingOuterCoatYellowHiVis: 3
+    ClothingOuterCoatOrangeHiVis: 3
+    ClothingOuterCoatBlueHiVis: 3
     ClothingBeltHalfApron: 2
     ClothingOuterVest: 2
     ClothingShoesChef: 2
@@ -69,6 +75,8 @@
     ClothingHandsGlovesColorWhite: 2
     ClothingNeckTieDet: 2
     ClothingNeckTieRed: 2
+    ClothingNeckCloakWinterOrange: 2
+    ClothingNeckCloakIlluminated: 2
     ClothingEyesGlassesSunglasses: 2
     ClothingEyesGlassesAviator: 4
     BoxPridePins: 2
diff --git a/Resources/Prototypes/_CD/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/_CD/Entities/Clothing/Head/hats.yml
@@ -41,4 +41,19 @@
     sprite: _CD/Clothing/Head/Hats/Animals/headslimepurple.rsi
   - type: Clothing
     sprite: _CD/Clothing/Head/Hats/Animals/headslimepurple.rsi
-
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatBeretSecurityVet
+  name: senior officer's beret
+  description: A black beret with a silver rank emblem. For officers that are more inclined towards style than safety.
+  components:
+  - type: Sprite
+    sprite: _CD/Clothing/Head/Hats/beret_secvet.rsi
+  - type: Clothing
+    sprite: _CD/Clothing/Head/Hats/beret_secvet.rsi
+  - type: Tag
+    tags:
+    - ClothMade
+    - HamsterWearable
+    - WhitelistChameleon
diff --git a/Resources/Prototypes/_CD/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/_CD/Entities/Clothing/Neck/cloaks.yml
@@ -0,0 +1,22 @@
+# CD cloaks
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckCloakIlluminated
+  name: illuminated cloak
+  description: A white cloak with orange trim with an emblem emblazed on the back.
+  components:
+  - type: Sprite
+    sprite: _CD/Clothing/Neck/Cloaks/illuminated_cloak.rsi
+  - type: Clothing
+    sprite: _CD/Clothing/Neck/Cloaks/illuminated_cloak.rsi
+
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckCloakWinterOrange
+  name: heavy winter cloak
+  description: A heavy orange cloak with winter padding inside it. It feels extremely warm.
+  components:
+  - type: Sprite
+    sprite: _CD/Clothing/Neck/Cloaks/orange_winter.rsi
+  - type: Clothing
+    sprite: _CD/Clothing/Neck/Cloaks/orange_winter.rsi
diff --git a/Resources/Prototypes/_CD/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/_CD/Entities/Clothing/OuterClothing/coats.yml
@@ -33,3 +33,122 @@
     sprite: _CD/Clothing/OuterClothing/Coats/harmonyjacket.rsi
   - type: Clothing
     sprite: _CD/Clothing/OuterClothing/Coats/harmonyjacket.rsi
+
+# Europan Coats
+- type: entity
+  parent: ClothingOuterWinterCoat
+  id: ClothingOuterCoatEuropanVet
+  name: europan jacket
+  description: A heavy leather jacket, winterized and waterproofed for harsh underwater environments.
+  components:
+  - type: Sprite
+    sprite: _CD/Clothing/OuterClothing/Coats/Europa/veterancoat.rsi
+  - type: Clothing
+    sprite: _CD/Clothing/OuterClothing/Coats/Europa/veterancoat.rsi
+  - type: TemperatureProtection
+    coefficient: 0.1
+  - type: Armor
+    modifiers:
+      coefficients:
+        Slash: 0.95
+        Heat: 0.90
+
+- type: entity
+  parent: ClothingOuterCoatEuropanVet
+  id: ClothingOuterCoatEuropanCoalition
+  name: coalition jacket
+  description: A heavy leather jacket, winterized and waterproofed for harsh underwater environments. Emblazoned with a Coalition patch on the shoulders.
+  components:
+  - type: Sprite
+    sprite: _CD/Clothing/OuterClothing/Coats/Europa/coalitioncoat.rsi
+  - type: Clothing
+    sprite: _CD/Clothing/OuterClothing/Coats/Europa/coalitioncoat.rsi
+
+- type: entity
+  parent: ClothingOuterCoatEuropanVet
+  id: ClothingOuterCoatEuropanSeparatist
+  name: separatist jacket
+  description: A heavy leather jacket, winterized and waterproofed for harsh underwater environments. Emblazoned with a Separatist patch on the shoulders.
+  components:
+  - type: Sprite
+    sprite: _CD/Clothing/OuterClothing/Coats/Europa/separatistcoat.rsi
+  - type: Clothing
+    sprite: _CD/Clothing/OuterClothing/Coats/Europa/separatistcoat.rsi
+
+# Cargo Gorka
+- type: entity
+  parent: [ClothingOuterStorageFoldableBase, ClothingOuterWinterCoat]
+  id: ClothingOuterCoatCargoBomber
+  name: cargo gorka
+  description: A heavy canvas gorka for cold shifts in Cargo.
+  components:
+  - type: Sprite
+    sprite: _CD/Clothing/OuterClothing/Coats/cargo_bomber.rsi
+  - type: Clothing
+    sprite: _CD/Clothing/OuterClothing/Coats/cargo_bomber.rsi
+
+- type: entity
+  parent: [ClothingOuterStorageFoldableBaseOpened, ClothingOuterCoatCargoBomber]
+  id: ClothingOuterCoatCargoBomberOpened
+  name: cargo gorka
+
+# CentCom Coat
+- type: entity
+  parent: ClothingOuterStorageBase
+  id: ClothingOuterCoatCentcomOfficer
+  name: CentCom officer's coat
+  description: A comfortable green coat worn by CentCom officers. The armour has been removed in favour of more pocket space.
+  components:
+  - type: Sprite
+    sprite: _CD/Clothing/OuterClothing/Coats/central_officer.rsi
+  - type: Clothing
+    sprite: _CD/Clothing/OuterClothing/Coats/central_officer.rsi
+
+# High-Vis jackets
+- type: entity
+  parent: [ClothingOuterStorageFoldableBase, ClothingOuterWinterCoat]
+  id: ClothingOuterCoatYellowHiVis
+  name: emergency jacket
+  description: A somewhat heavy jacket made of fluorescent fabric. This one is neon yellow.
+  components:
+  - type: Sprite
+    sprite: _CD/Clothing/OuterClothing/Coats/Highvis/yellow_bomber.rsi
+  - type: Clothing
+    sprite: _CD/Clothing/OuterClothing/Coats/Highvis/yellow_bomber.rsi
+
+- type: entity
+  parent: [ClothingOuterStorageFoldableBaseOpened, ClothingOuterCoatYellowHiVis]
+  id: ClothingOuterCoatYellowHiVisOpened
+  name: emergency jacket
+
+- type: entity
+  parent: ClothingOuterCoatYellowHiVis
+  id: ClothingOuterCoatOrangeHiVis
+  name: hazard jacket
+  description: A somewhat heavy jacket made of fluorescent fabric. This one is neon orange.
+  components:
+  - type: Sprite
+    sprite: _CD/Clothing/OuterClothing/Coats/Highvis/orange_bomber.rsi
+  - type: Clothing
+    sprite: _CD/Clothing/OuterClothing/Coats/Highvis/orange_bomber.rsi
+
+- type: entity
+  parent: [ClothingOuterStorageFoldableBaseOpened, ClothingOuterCoatOrangeHiVis]
+  id: ClothingOuterCoatOrangeHiVisOpened
+  name: hazard jacket
+
+- type: entity
+  parent: ClothingOuterCoatYellowHiVis
+  id: ClothingOuterCoatBlueHiVis
+  name: EMT jacket
+  description: A somewhat heavy jacket made of fluorescent fabric. This one is neon blue.
+  components:
+  - type: Sprite
+    sprite: _CD/Clothing/OuterClothing/Coats/Highvis/blue_bomber.rsi
+  - type: Clothing
+    sprite: _CD/Clothing/OuterClothing/Coats/Highvis/blue_bomber.rsi
+
+- type: entity
+  parent: [ClothingOuterStorageFoldableBaseOpened, ClothingOuterCoatBlueHiVis]
+  id: ClothingOuterCoatBlueHiVisOpened
+  name: EMT jacket