Adds swat suit, re-prices Gorlex suits, updates security supplies

Resources/Prototypes/Catalog/Cargo/cargo_hardsuits.yml

@@ -41,27 +41,26 @@
   group: market
 
 # Security
-#NOTE: Commented out temporarily until a proper way to get them through science reverse engineering is devised.
-#Additional Note: Abused by cargo personnel and powergamers, be wary of it
-# - type: cargoProduct
-#   id: SecurityShanlinTacsuit
-#   icon:
-#     sprite: Nyanotrasen/Clothing/OuterClothing/ReverseEngineering/syndicate.rsi
-#     state: icon
-#   product: CrateSecurityShanlinTacsuit
-#   cost: 17500
-#   category: cargoproduct-category-name-hardsuits
-#   group: market
+# Can't abuse em if you only got 1, good luck spamming frezon
+- type: cargoProduct
+  id: SecurityShanlinTacsuit
+  icon:
+    sprite: Nyanotrasen/Clothing/OuterClothing/ReverseEngineering/syndicate.rsi
+    state: icon
+  product: CrateSecurityShanlinTacsuit
+  cost: 75000
+  category: cargoproduct-category-name-hardsuits
+  group: market
 
-# - type: cargoProduct
-#   id: SecurityGuanYuTacsuit
-#   icon:
-#     sprite: Nyanotrasen/Clothing/OuterClothing/ReverseEngineering/juggernaut.rsi
-#     state: icon
-#   product: CrateSecurityGuanYuTacsuit
-#   cost: 30000
-#   category: cargoproduct-category-name-hardsuits
-#   group: market
+- type: cargoProduct
+  id: SecurityGuanYuTacsuit
+  icon:
+    sprite: Nyanotrasen/Clothing/OuterClothing/ReverseEngineering/juggernaut.rsi
+    state: icon
+  product: CrateSecurityGuanYuTacsuit
+  cost: 125000
+  category: cargoproduct-category-name-hardsuits
+  group: market
 
 - type: cargoProduct
   id: SecurityBaghaturTacsuit

Resources/Prototypes/Catalog/Cargo/cargo_security.yml

@@ -54,7 +54,7 @@
     sprite: Objects/Storage/boxes.rsi
     state: box_security
   product: CrateSecuritySupplies
-  cost: 500
+  cost: 1000
   category: cargoproduct-category-name-security
   group: market
 

Resources/Prototypes/Catalog/Fills/Crates/security.yml

@@ -42,7 +42,7 @@
   id: CrateSecurityRiot
   parent: CrateSecgear
   name: riot crate
-  description: Contains two sets of riot armor, helmets, shields, and enforcers loaded with beanbags. Extra ammo is included. Requires Armory access to open.
+  description: Contains two sets of riot armor, helmets, shields, and enforcers loaded with beanbags. Extra ammo is included. Requires Security access to open.
   components:
   - type: StorageFill
     contents:
@@ -63,21 +63,21 @@
 - type: entity
   id: CrateSecuritySwat
   parent: CrateSecgear
-  name: swat armor crate
-  description: Contains two sets of swat helmets, masks, boots and advanced riot suits.
+  name: swat crate
+  description: Contains two sets of all encompassing swat suits. Requires Security access to open.
   components:
   - type: StorageFill
     contents:
-      - id: ClothingOuterArmorRiot # EE - ClothingOuterArmorRiot added rather than ClothingOuterArmorSwat until proper set is made
+      - id: ClothingOuterArmorSwat
         amount: 2
       - id: ClothingHeadHelmetSwat
         amount: 2
       - id: ClothingMaskGasSwat
         amount: 2
-      - id: ClothingShoesSwat
-        amount: 2
       - id: ClothingHandsGlovesCombat
         amount: 2
+      - id: ClothingShoesSwat
+        amount: 2
 
 - type: entity
   id: CrateSecuritySupplies
@@ -89,9 +89,9 @@
     contents:
       - id: BoxHandcuff
       - id: BoxSechud
-#      - SecBelt
-#      - SecGasmask
-#      - SpacelawBook
+      - id: ClothingBeltSecurityFilled
+      - id: ClothingMaskGasSecurity
+      - id: BookSecurity # replace with lawbook at some point
 
 - type: entity
   id: CrateRestraints

Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_armory.yml

@@ -8,7 +8,7 @@
   category: Armory
   group: market
 
-#NOTE: Comments out MK32 Universals due to them being CC weapon.
+# NOTE: Comments out MK32 Universals due to them being CC weapon.
 # - type: cargoProduct
 #   id: ArmoryUniversal
 #   icon:

Resources/Prototypes/Entities/Clothing/Head/helmets.yml

@@ -37,7 +37,7 @@
 
 #SWAT Helmet
 - type: entity
-  parent: ClothingHeadBase
+  parent: [ClothingHeadBase, ClothingHeadEVAHelmetBase]
   id: ClothingHeadHelmetSwat
   name: SWAT helmet
   description: An extremely robust helmet, commonly used by paramilitary forces. This one has the Nanotrasen logo emblazoned on the top.
@@ -46,15 +46,18 @@
     sprite: Clothing/Head/Helmets/swat.rsi
   - type: Clothing
     sprite: Clothing/Head/Helmets/swat.rsi
-  - type: Armor #This is intentionally not spaceproof, when the time comes to port the values from SS13 this should be buffed from what it was.
+  - type: PressureProtection
+    highPressureMultiplier: 0.45
+    lowPressureMultiplier: 1000
+  - type: Armor
     modifiers:
       coefficients:
-        Blunt: 0.80
-        Slash: 0.80
-        Piercing: 0.80
-        Heat: 0.80
-        Radiation: 0.80
-        Caustic: 0.95
+        Blunt: 0.85
+        Slash: 0.85
+        Piercing: 0.85
+        Heat: 0.85
+        Radiation: 0.8
+        Caustic: 0.9
   - type: ExplosionResistance
     damageCoefficient: 0.75
 

Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml

@@ -56,6 +56,35 @@
     damageCoefficient: 0.9
   - type: GroupExamine
 
+- type: entity
+  parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing, ClothingOuterEVASuitBase]
+  id: ClothingOuterArmorSwat
+  name: swat suit
+  description: Composed of semi-flexible polycarbonate, reinforced materials, and integrated ballistic plating, it offers exceptional protection against melee, bullet, and environmental threats, ensuring officers remain combat-ready in the harshest conditions.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Armor/swat.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Armor/swat.rsi
+  - type: PressureProtection
+    highPressureMultiplier: 0.45
+    lowPressureMultiplier: 1000
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.6
+        Slash: 0.6
+        Piercing: 0.6
+        Heat: 0.85
+        Radiation: 0.75
+        Caustic: 0.85
+  - type: ExplosionResistance
+    damageCoefficient: 0.50
+  - type: ClothingSpeedModifier # Burdensome for running, but perfect for speedy gliding, even though running is still probably better
+    walkModifier: 0.9
+    sprintModifier: 0.7
+  - type: GroupExamine
+
 - type: entity
   parent: ClothingOuterArmorBasic
   id: ClothingOuterArmorBulletproof

Resources/Prototypes/Entities/Clothing/Shoes/specific.yml

@@ -127,7 +127,7 @@
     sprintModifier: 1.3
 
 - type: entity
-  parent: ClothingShoesBaseButcherable
+  parent: ClothingShoesMilitaryBase
   id: ClothingShoesSwat
   name: swat shoes
   description: When you want to turn up the heat.
@@ -136,6 +136,8 @@
     sprite: Clothing/Shoes/Specific/swat.rsi
   - type: Clothing
     sprite: Clothing/Shoes/Specific/swat.rsi
+  - type: ClothingSlowOnDamageModifier
+    modifier: 0.5
 
 - type: entity
   parent: ClothingShoesBaseButcherable

Resources/Textures/Clothing/OuterClothing/Armor/swat.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise. Inhands by BluHNT.",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}