Further Sec Sprite Tweaks (#1901)

* Further Sec Sprite Tweaks

* Update secdrobe.yml

* extra 1984 greatcoats

Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl

@@ -85,10 +85,11 @@ loadout-group-head-of-security-shoes = Head of Security shoes
 loadout-group-security-cadet-head = Security Cadet head
 loadout-group-security-neck = Security neck
 
-loadout-group-brig-medic-head = Brigmedic head
-loadout-group-brig-medic-jumpsuit = Brigmedic jumpsuit
-loadout-group-brig-medic-back = Brigmedic backpack
+loadout-group-brig-medic-head = Corpsman head
+loadout-group-brig-medic-jumpsuit = Corpsman jumpsuit
+loadout-group-brig-medic-back = Corpsman backpack
 loadout-group-brig-medic-neck = Corpsman neck
+loadout-group-brig-medic-outerclothing = Corpsman outer clothing
 
 loadout-group-prison-guard-head = Prison Guard head
 loadout-group-prison-guard-jumpsuit = Prison Guard jumpsuit

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

@@ -76,7 +76,6 @@
       - id: ClothingUniformJumpsuitHosFormal
 #      - id: ClothingOuterWinterHoS # DeltaV - removed for incongruence
       - id: ClothingOuterCoatStasecHoS # DeltaV - add winter coat
-      - id: ClothingOuterGreatcoatStasecHoS # DeltaV - add greatcoat
       - id: ClothingShoesBootsWinterHeadOfSecurity # DeltaV - add HoS winter boots
 
 - type: entity
@@ -120,5 +119,4 @@
       - id: ClothingHeadHatWarden
       - id: ClothingHeadHatBeretWarden
       - id: ClothingOuterCoatStasecWarden # DeltaV - add winter coat
-      - id: ClothingOuterGreatcoatStasecWarden # DeltaV - add greatcoat
       - id: ClothingShoesBootsWinterWarden # DeltaV - add winter boots

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

@@ -26,7 +26,6 @@
     ClothingHeadsetPrison: 3 # DeltaV - prison headsets in secdrobe
     ClothingOuterStasecSweater: 2 # DeltaV - add sweaters to secdrobe
     ClothingOuterCoatStasec: 2 # DeltaV - replace ClothingOuterWinterSec
-    ClothingOuterGreatcoatStasec: 2 # DeltaV - added greatcoats to SecDrobe. Surplus, reminds the officers of the good times.
 ##    ClothingOuterArmorBasic: 2 # DeltaV - moved body armour from SecDrobe to SecTech
 ##    ClothingOuterArmorBasicSlim: 2
     ClothingNeckScarfStripedRed: 3

Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml

@@ -193,6 +193,17 @@
   - type: Clothing
     sprite: DeltaV/Clothing/Head/Hats/beret_corpsman.rsi
 
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatBeretDet
+  name: detective's beret
+  description: For forensic specialists and dogged investigators.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Head/Hats/beret_det.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Head/Hats/beret_det.rsi
+
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatCJToque

Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/wintercoats.yml

@@ -73,7 +73,7 @@
   parent: ClothingOuterStasecSweater
   id: ClothingOuterCoatStasecHoS
   name: head of security's coat
-  description: A warm and comfortable winter coat, reinforced with durathread and compliant with Station Security uniform standards. Bears HoS arm flashes.
+  description: A warm and comfortable winter coat, reinforced with durathread and compliant with Station Security uniform standards. This version is adorned with gold trim.
   components:
   - type: Sprite
     sprite: DeltaV/Clothing/OuterClothing/WinterCoats/hoscoat.rsi
@@ -84,52 +84,31 @@
   parent: ClothingOuterStasecSweater
   id: ClothingOuterCoatStasecWarden
   name: warden's coat
-  description: A warm and comfortable winter coat, reinforced with durathread and compliant with Station Security uniform standards. Sports warden arm flashes.
+  description: A warm and comfortable winter coat, reinforced with durathread and compliant with Station Security uniform standards. This version features ice-white trim.
   components:
   - type: Sprite
     sprite: DeltaV/Clothing/OuterClothing/WinterCoats/armourercoat.rsi
   - type: Clothing
     sprite: DeltaV/Clothing/OuterClothing/WinterCoats/armourercoat.rsi
 
 - type: entity
-  parent: ClothingOuterStorageFoldableBase
-  id: ClothingOuterGreatcoatStasec
-  name: station security greatcoat
-  description: A long and heavy greatcoat, yet to be phased out of use for Station Security. It's hard to tell what's so great about it, but it sure is warm and sturdy.
-  components:
-  - type: Sprite
-    sprite: DeltaV/Clothing/OuterClothing/WinterCoats/stasecgreatcoat.rsi
-  - type: Clothing
-    sprite: DeltaV/Clothing/OuterClothing/WinterCoats/stasecgreatcoat.rsi
-  - type: TemperatureProtection
-    coolingCoefficient: 0.1
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.75
-        Slash: 0.75
-        Piercing: 0.75
-        Heat: 0.75
-  - type: AllowSuitStorage
-
-- type: entity
-  parent: ClothingOuterGreatcoatStasec
-  id: ClothingOuterGreatcoatStasecHoS
-  name: head of security's greatcoat
-  description: A long and heavy greatcoat, yet to be phased out of use for Station Security. Bears HoS arm flashes.
+  parent: ClothingOuterStasecSweater
+  id: ClothingOuterCoatStasecDet
+  name: detective's coat
+  description: A warm and comfortable winter coat, reinforced with durathread and compliant with Station Security uniform standards. This version is detective plum.
   components:
   - type: Sprite
-    sprite: DeltaV/Clothing/OuterClothing/WinterCoats/hosgreatcoat.rsi
+    sprite: DeltaV/Clothing/OuterClothing/WinterCoats/detcoat.rsi
   - type: Clothing
-    sprite: DeltaV/Clothing/OuterClothing/WinterCoats/hosgreatcoat.rsi
+    sprite: DeltaV/Clothing/OuterClothing/WinterCoats/detcoat.rsi
 
 - type: entity
-  parent: ClothingOuterGreatcoatStasec
-  id: ClothingOuterGreatcoatStasecWarden
-  name: warden's greatcoat
-  description: A long and heavy greatcoat, yet to be phased out of use for Station Security. Sports warden arm flashes.
+  parent: ClothingOuterStasecSweater
+  id: ClothingOuterCoatStasecCorpsman
+  name: corpsman's coat
+  description: A warm and comfortable winter coat, reinforced with durathread and compliant with Station Security uniform standards. This version is corpsman blue.
   components:
   - type: Sprite
-    sprite: DeltaV/Clothing/OuterClothing/WinterCoats/armourergreatcoat.rsi
+    sprite: DeltaV/Clothing/OuterClothing/WinterCoats/corpsmancoat.rsi
   - type: Clothing
-    sprite: DeltaV/Clothing/OuterClothing/WinterCoats/armourergreatcoat.rsi
+    sprite: DeltaV/Clothing/OuterClothing/WinterCoats/corpsmancoat.rsi

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

@@ -46,6 +46,19 @@
   - type: Clothing
     sprite: DeltaV/Clothing/Uniforms/Jumpskirt/security_blue.rsi
 
+# Corpsman alt uniforms
+
+- type: entity
+  parent: ClothingUniformFoldableBase
+  id: ClothingUniformJumpskirtBrigmedicTurtle
+  name: corpsman's turtleneck
+  description: A comfortable and tight-fitting turtleneck for those with the dedication to reach the position of Corpsman.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic_alt.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic_alt.rsi
+
 # Detective uniform
 
 - type: entity
@@ -59,6 +72,17 @@
   - type: Clothing
     sprite: DeltaV/Clothing/Uniforms/Jumpskirt/detective.rsi
 
+- type: entity
+  parent: ClothingUniformFoldableBase
+  id: ClothingUniformJumpskirtDetTurtle
+  name: detective's turtleneck
+  description: A comfortable and tight-fitting turtleneck for those with the resolve to reach the position of Detective.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Uniforms/Jumpskirt/detective_alt.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Uniforms/Jumpskirt/detective_alt.rsi
+
 # Senior Officer uniform
 
 - type: entity
@@ -96,6 +120,17 @@
   - type: Clothing
     sprite: DeltaV/Clothing/Uniforms/Jumpskirt/armourer_grey.rsi
 
+- type: entity
+  parent: ClothingUniformFoldableBase
+  id: ClothingUniformJumpskirtWardenTurtle
+  name: warden's turtleneck
+  description: A comfortable and tight-fitting turtleneck for those with the patience to reach the position of Warden.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Uniforms/Jumpskirt/armourer_alt.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Uniforms/Jumpskirt/armourer_alt.rsi
+
 # HoS alt uniforms
 
 - type: entity
@@ -120,6 +155,17 @@
   - type: Clothing
     sprite: DeltaV/Clothing/Uniforms/Jumpskirt/hos_grey.rsi
 
+- type: entity
+  parent: ClothingUniformFoldableBase
+  id: ClothingUniformJumpskirtHoSTurtle
+  name: head of security's turtleneck
+  description: A comfortable and tight-fitting turtleneck for those with the tenacity to reach the position of Head of Security.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Uniforms/Jumpskirt/hos_alt.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Uniforms/Jumpskirt/hos_alt.rsi
+
 # Central Command Uniform - ported from Velta
 
 - type: entity

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

@@ -209,6 +209,19 @@
   - type: Clothing
     sprite: DeltaV/Clothing/Uniforms/Jumpsuit/secformalsuit.rsi
 
+# Corpsman alt uniforms
+
+- type: entity
+  parent: ClothingUniformFoldableBase
+  id: ClothingUniformJumpsuitBrigmedicTurtle
+  name: corpsman's turtleneck
+  description: A comfortable and tight-fitting turtleneck for those with the dedication to reach the position of Corpsman.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic_alt.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic_alt.rsi
+
 # Detective uniform
 
 - type: entity
@@ -222,6 +235,17 @@
   - type: Clothing
     sprite: DeltaV/Clothing/Uniforms/Jumpsuit/detective.rsi
 
+- type: entity
+  parent: ClothingUniformFoldableBase
+  id: ClothingUniformJumpsuitDetTurtle
+  name: detective's turtleneck
+  description: A comfortable and tight-fitting turtleneck for those with the resolve to reach the position of Detective.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Uniforms/Jumpsuit/detective_alt.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Uniforms/Jumpsuit/detective_alt.rsi
+
 # Senior Officer uniform
 
 - type: entity
@@ -259,6 +283,30 @@
   - type: Clothing
     sprite: DeltaV/Clothing/Uniforms/Jumpsuit/armourer_grey.rsi
 
+- type: entity
+  parent: ClothingUniformFoldableBase
+  id: ClothingUniformJumpsuitWardenTurtle
+  name: warden's turtleneck
+  description: A comfortable and tight-fitting turtleneck for those with the patience to reach the position of Warden.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Uniforms/Jumpsuit/armourer_alt.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Uniforms/Jumpsuit/armourer_alt.rsi
+
+# HoS alt uniforms
+
+- type: entity
+  parent: ClothingUniformFoldableBase
+  id: ClothingUniformJumpsuitHoSTurtle
+  name: head of security's turtleneck
+  description: A comfortable and tight-fitting turtleneck for those with the tenacity to reach the position of Head of Security.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Uniforms/Jumpsuit/hos_alt.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Uniforms/Jumpsuit/hos_alt.rsi
+
 # Central Command Uniform - ported from Velta
 
 - type: entity

Resources/Prototypes/DeltaV/Loadouts/Jobs/Security/brigmedic.yml

@@ -15,6 +15,16 @@
   equipment:
       jumpsuit: ClothingUniformJumpskirtBrigmedic
 
+- type: loadout
+  id: BrigMedicTurtlesuit
+  equipment:
+      jumpsuit: ClothingUniformJumpsuitBrigmedicTurtle
+
+- type: loadout
+  id: BrigMedicTurtleskirt
+  equipment:
+      jumpsuit: ClothingUniformJumpskirtBrigmedicTurtle
+
 # Back
 - type: loadout
   id: BrigMedicBackpack
@@ -30,3 +40,10 @@
   id: BrigMedicDuffel
   equipment:
       back: ClothingBackpackDuffelBrigmedic
+
+# OuterClothing
+
+- type: loadout
+  id: StasecWinterCoatCorpsman
+  equipment:
+    outerClothing: ClothingOuterCoatStasecCorpsman

Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml

@@ -94,6 +94,16 @@
   loadouts:
   - BrigMedicJumpsuit
   - BrigMedicJumpskirt
+  - BrigMedicTurtlesuit
+  - BrigMedicTurtleskirt
+
+- type: loadoutGroup
+  id: BrigMedicOuterClothing
+  name: loadout-group-brig-medic-outerclothing
+  loadouts:
+  - StasecWinterCoatCorpsman
+  - PlateCarrier
+  - DuraVest
 
 - type: loadoutGroup
   id: BrigMedicBack

Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml

@@ -23,9 +23,9 @@
   - BrigMedicJumpsuit
   - BrigMedicBack
   - SecurityShoes
-  - SecurityOuterClothing
+  - BrigMedicOuterClothing
   - MedicalGloves
-  - SurvivalSecurity # DeltaV - replace SurvivalCorpsman for incongruence
+  - SurvivalSecurity
   - Trinkets
   - GroupSpeciesBreathToolCorpsman
 

Resources/Prototypes/Loadouts/Jobs/Security/detective.yml

@@ -9,6 +9,11 @@
   equipment:
     head: ClothingHeadHatFedoraGrey
 
+- type: loadout # DeltaV
+  id: DetBeret
+  equipment:
+    head: ClothingHeadHatBeretDet
+
 # Neck
 - type: loadout
   id: DetectiveTie
@@ -46,6 +51,16 @@
   equipment:
     jumpsuit: ClothingUniformJumpskirtForensicSpec
 
+- type: loadout # DeltaV
+  id: ForensicSpecTurtlesuit
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitDetTurtle
+
+- type: loadout # DeltaV
+  id: ForensicSpecTurtleskirt
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtDetTurtle
+
 # OuterClothing
 - type: loadout
   id: DetectiveArmorVest
@@ -56,3 +71,8 @@
   id: DetectiveCoat
   equipment:
     outerClothing: ClothingOuterCoatDetectiveLoadout
+
+- type: loadout # DeltaV
+  id: StasecWinterCoatDet
+  equipment:
+    outerClothing: ClothingOuterCoatStasecDet

Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml

@@ -32,12 +32,12 @@
 - type: loadout
   id: HeadofSecurityTurtleneck
   equipment:
-    jumpsuit: ClothingUniformJumpsuitHoSAlt
+    jumpsuit: ClothingUniformJumpsuitHoSTurtle # DeltaV - replace ClothingUniformJumpsuitHoSAlt
 
 - type: loadout
   id: HeadofSecurityTurtleneckSkirt
   equipment:
-    jumpsuit: ClothingUniformJumpskirtHoSAlt
+    jumpsuit: ClothingUniformJumpskirtHoSTurtle # DeltaV - replace ClothingUniformJumpsuitHoSAlt
 
 - type: loadout
   id: HeadofSecurityFormalSuit
@@ -97,11 +97,6 @@
   equipment:
     outerClothing: ClothingOuterCoatStasecHoS
 
-- type: loadout # DeltaV - security greatcoat
-  id: StasecGreatcoatHoS
-  equipment:
-    outerClothing: ClothingOuterGreatcoatStasecHoS
-
 # Shoes - DeltaV
 - type: loadout # DeltaV
   id: HeadOfSecurityWinterBoots