add turtlenecks for senior officers (#2692)

* add turtlenecks for senior officers

* fix indents

* move delta v loadout items to _DV namespace

* Update security_officer.yml

Signed-off-by: Tad "Taddy" Johnson <120885811+TadJohnson00@users.noreply.github.com>

---------

Signed-off-by: Tad "Taddy" Johnson <120885811+TadJohnson00@users.noreply.github.com>

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

@@ -60,16 +60,6 @@
   equipment:
     jumpsuit: ClothingUniformJumpskirtSecGrey
 
-- type: loadout # DeltaV
-  id: SecurityJumpsuitBlue
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitSecBlue
-
-- type: loadout # DeltaV
-  id: SecurityJumpskirtBlue
-  equipment:
-    jumpsuit: ClothingUniformJumpskirtSecBlue
-
 - type: loadout
   id: SeniorOfficerJumpsuit
   effects:
@@ -86,22 +76,6 @@
   equipment:
     jumpsuit: ClothingUniformJumpskirtSeniorOfficer
 
-- type: loadout # DeltaV
-  id: SeniorSecOfficerJumpsuit
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: SeniorOfficer
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitSecSenior
-
-- type: loadout # DeltaV
-  id: SeniorSecOfficerJumpskirt
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: SeniorOfficer
-  equipment:
-    jumpsuit: ClothingUniformJumpskirtSecSenior
-
 # Back
 - type: loadout
   id: SecurityBackpack
@@ -135,16 +109,6 @@
   equipment:
     outerClothing: ClothingOuterArmorBasic
 
-- type: loadout # DeltaV
-  id: PlateCarrier
-  equipment:
-    outerClothing: ClothingOuterArmorPlateCarrier
-
-- type: loadout # DeltaV
-  id: DuraVest
-  equipment:
-    outerClothing: ClothingOuterArmorDuraVest
-
 - type: loadout
   id: ArmorVestSlim
   equipment:
@@ -155,16 +119,6 @@
   equipment:
     outerClothing: ClothingOuterWinterSec
 
-- type: loadout
-  id: StasecSweater
-  equipment:
-    outerClothing: ClothingOuterStasecSweater
-
-- type: loadout # DeltaV - security winter coat
-  id: StasecWinterCoat
-  equipment:
-    outerClothing: ClothingOuterCoatStasec
-
 # Shoes
 - type: loadout
   id: CombatBoots

Resources/Prototypes/Loadouts/loadout_groups.yml

@@ -1216,6 +1216,8 @@
   - SecurityJumpskirtBlue # DeltaV
 #  - SeniorOfficerJumpsuit # DeltaV - removed for incongruence
 #  - SeniorOfficerJumpskirt # DeltaV - removed for incongruence
+  - SeniorSecOfficerTurtlesuit # DeltaV
+  - SeniorSecOfficerTurtleskirt # DeltaV
   - SeniorSecOfficerJumpsuit # DeltaV
   - SeniorSecOfficerJumpskirt # DeltaV
 

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

@@ -111,13 +111,24 @@
   parent: ClothingUniformFoldableBase
   id: ClothingUniformJumpskirtSecSenior
   name: senior officer's jumpskirt
-  description: A tight-fitting tactical jumpsuit, made of light and breathable yet durable material. This one seems to have a skirt stitched to the waist. Curious.
+  description: A tight-fitting tactical jumpsuit, made of light and breathable yet durable material. Can be worn all year round.
   components:
   - type: Sprite
     sprite: _DV/Clothing/Uniforms/Jumpskirt/seniorofficer.rsi
   - type: Clothing
     sprite: _DV/Clothing/Uniforms/Jumpskirt/seniorofficer.rsi
 
+- type: entity
+  parent: ClothingUniformFoldableBase
+  id: ClothingUniformJumpskirtSecTurtle
+  name: senior officer's turtleneck
+  description: A comfortable and tight-fitting turtleneck for those with the resolve to reach the position of Senior Officer.
+  components:
+  - type: Sprite
+    sprite: _DV/Clothing/Uniforms/Jumpskirt/security_alt.rsi
+  - type: Clothing
+    sprite: _DV/Clothing/Uniforms/Jumpskirt/security_alt.rsi
+
 # Warden alt uniforms
 
 - type: entity

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

@@ -259,6 +259,17 @@
   - type: Clothing
     sprite: _DV/Clothing/Uniforms/Jumpsuit/seniorofficer.rsi
 
+- type: entity
+  parent: ClothingUniformFoldableBase
+  id: ClothingUniformJumpsuitSecTurtle
+  name: senior officer's turtleneck
+  description: A comfortable and tight-fitting turtleneck for those with the resolve to reach the position of Senior Officer.
+  components:
+  - type: Sprite
+    sprite: _DV/Clothing/Uniforms/Jumpsuit/security_alt.rsi
+  - type: Clothing
+    sprite: _DV/Clothing/Uniforms/Jumpsuit/security_alt.rsi
+
 # Warden alt uniforms
 
 - type: entity

Resources/Prototypes/_DV/Loadouts/Jobs/Security/security_officer.yml

@@ -1,4 +1,6 @@
-- type: loadout
+# Sidearm
+
+- type: loadout
   id: SecurityFirearmWeaponPistolPollock
   equipment:
     pocket1: WeaponPistolPollock
@@ -18,6 +20,8 @@
   equipment:
     pocket1: WeaponDisabler
 
+# Ammo
+
 - type: loadout
   id: SecurityFirearmMagazinePistolRubber
   storage:
@@ -29,3 +33,69 @@
   storage:
     back:
     - MagazinePistol
+
+# Jumpsuit
+
+- type: loadout
+  id: SecurityJumpsuitBlue
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitSecBlue
+
+- type: loadout
+  id: SecurityJumpskirtBlue
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtSecBlue
+
+- type: loadout
+  id: SeniorSecOfficerJumpsuit
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: SeniorOfficer
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitSecSenior
+
+- type: loadout
+  id: SeniorSecOfficerJumpskirt
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: SeniorOfficer
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtSecSenior
+
+- type: loadout
+  id: SeniorSecOfficerTurtlesuit
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: SeniorOfficer
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitSecTurtle
+
+- type: loadout
+  id: SeniorSecOfficerTurtleskirt
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: SeniorOfficer
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtSecTurtle
+
+# OuterClothing
+
+- type: loadout
+  id: PlateCarrier
+  equipment:
+    outerClothing: ClothingOuterArmorPlateCarrier
+
+- type: loadout
+  id: DuraVest
+  equipment:
+    outerClothing: ClothingOuterArmorDuraVest
+
+- type: loadout
+  id: StasecSweater
+  equipment:
+    outerClothing: ClothingOuterStasecSweater
+
+- type: loadout
+  id: StasecWinterCoat
+  equipment:
+    outerClothing: ClothingOuterCoatStasec

Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/security_alt.rsi/meta.json

@@ -0,0 +1,30 @@
+{
+    "version": 1,
+    "license": "CC0-1.0",
+    "copyright": "Original work by TJohnson.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-INNERCLOTHING",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "rolled-equipped-INNERCLOTHING",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/security_alt.rsi/meta.json

@@ -0,0 +1,30 @@
+{
+    "version": 1,
+    "license": "CC0-1.0",
+    "copyright": "Original work by TJohnson.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-INNERCLOTHING",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "rolled-equipped-INNERCLOTHING",
+            "directions": 4
+        }
+    ]
+}