Adjusts Cargo Market

Resources/Prototypes/Catalog/Cargo/cargo_hardsuits.yml

@@ -41,13 +41,14 @@
   group: market
 
 # Security
+# 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: 17500
+  cost: 75000
   category: cargoproduct-category-name-hardsuits
   group: market
 
@@ -57,7 +58,7 @@
     sprite: Nyanotrasen/Clothing/OuterClothing/ReverseEngineering/juggernaut.rsi
     state: icon
   product: CrateSecurityGuanYuTacsuit
-  cost: 30000
+  cost: 125000
   category: cargoproduct-category-name-hardsuits
   group: market
 

Resources/Prototypes/Catalog/Cargo/cargo_security.yml

@@ -38,13 +38,23 @@
   category: cargoproduct-category-name-security
   group: market
 
+- type: cargoProduct
+  id: SecuritySwat
+  icon:
+    sprite: DeltaV/Clothing/OuterClothing/Armor/riot.rsi # DeltaV - resprite
+    state: icon
+  product: CrateSecuritySwat
+  cost: 12500
+  category: cargoproduct-category-name-security
+  group: market
+
 - type: cargoProduct
   id: SecuritySupplies
   icon:
     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

@@ -41,22 +41,43 @@
 - type: entity
   id: CrateSecurityRiot
   parent: CrateSecgear
-  name: swat crate
-  description: Contains two sets of riot armor, helmets, shields, and enforcers loaded with beanbags. Extra ammo is included. Requires Armory access to open.
+  name: riot crate
+  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:
       - id: ClothingOuterArmorARC # DeltaV - ClothingOuterArmorRiot replaced in favour of ARC suit
         amount: 2
       - id: ClothingHeadHelmetRiot
         amount: 2
+      - id: Clothing
       - id: WeaponShotgunEnforcerRubber
         amount: 2
       - id: BoxBeanbag
         amount: 2
       - id: RiotShield
         amount: 2
-#      - SecGasmask
+      - id: ClothingMaskGasSecurity
+        amount: 2
+
+- type: entity
+  id: CrateSecuritySwat
+  parent: CrateSecgear
+  name: swat crate
+  description: Contains two sets of all encompassing swat suits. Requires Security access to open.
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingOuterArmorSwat
+        amount: 2
+      - id: ClothingHeadHelmetSwat
+        amount: 2
+      - id: ClothingMaskGasSwat
+        amount: 2
+      - id: ClothingHandsGlovesCombat
+        amount: 2
+      - id: ClothingShoesSwat
+        amount: 2
 
 - type: entity
   id: CrateSecuritySupplies
@@ -68,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,15 +8,16 @@
   category: Armory
   group: market
 
-- type: cargoProduct
-  id: ArmoryUniversal
-  icon:
-    sprite: Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi
-    state: icon
-  product: CrateArmoryUniversal
-  cost: 6500
-  category: Armory
-  group: market
+# NOTE: Comments out MK32 Universals due to them being CC weapon.
+# - type: cargoProduct
+#   id: ArmoryUniversal
+#   icon:
+#     sprite: Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi
+#     state: icon
+#   product: CrateArmoryUniversal
+#   cost: 6500
+#   category: Armory
+#   group: market
 
 - type: cargoProduct
   id: ArmoryShotgunAdjutant
@@ -37,7 +38,7 @@
   cost: 5500
   category: Armory
   group: market
- 
+
 - type: cargoProduct
   id: ArmoryEnergyGunMini
   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 BlueHNT.",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}