Riot gear expansion

space-wizards · Mar 19, 2024 · 8ecb915 · 8ecb915
1 parent 2e4fb28
commit 8ecb915
Show file tree

Hide file tree

Showing 5 changed files with 220 additions and 1 deletion.
diff --git a/Resources/Locale/en-US/research/technologies.ftl b/Resources/Locale/en-US/research/technologies.ftl
@@ -30,7 +30,7 @@ research-technology-nonlethal-ammunition = Nonlethal Ammunition
 research-technology-practice-ammunition = Practice Ammunition
 research-technology-concentrated-laser-weaponry = Concentrated Laser Weaponry
 research-technology-wave-particle-harnessing = Wave Particle Harnessing
-research-technology-advanced-riot-control = Advanced Riot Control
+research-technology-advanced-riot-control = Advanced Riot Gear
 research-technology-portable-microfusion-weaponry = Portable Microfusion Weaponry
 research-technology-experimental-battery-ammo = Experimental Battery Ammo
 research-technology-basic-shuttle-armament = Shuttle basic armament

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/security.yml b/Resources/Prototypes/Catalog/Fills/Crates/security.yml
@@ -56,6 +56,42 @@
         amount: 2
       - id: RiotShield
         amount: 2
+      - id: ClothingNeckCloakPan
+        amount: 2
+      - id: ClothingNeckCloakEnby
+        amount: 2
+      - id: ClothingNeckCloakGay
+        amount: 2
+      - id: ClothingNeckCloakLesbian
+        amount: 2
+      - id: ClothingNeckCloakIntersex
+        amount: 2
+      - id: ClothingNeckCloakBi
+        amount: 2
+      - id: ClothingNeckCloakAro
+        amount: 2
+      - id: ClothingNeckCloakAce
+        amount: 2
+      - id: ClothingNeckCloakTrans
+        amount: 2
+      - id: ClothingNeckTransPin
+        amount: 2
+      - id: ClothingNeckPansexualPin
+        amount: 2
+      - id: ClothingNeckNonBinaryPin
+        amount: 2
+      - id: ClothingNeckLesbianPin
+        amount: 2
+      - id: ClothingNeckIntersexPin
+        amount: 2
+      - id: ClothingNeckBisexualPin
+        amount: 2
+      - id: ClothingNeckAsexualPin
+        amount: 2
+      - id: ClothingNeckAromanticPin
+        amount: 2
+      - id: ClothingNeckLGBTPin
+        amount: 2
 #      - SecGasmask
 
 - type: entity

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -162,6 +162,25 @@
       - WeaponCapacitorRechargerCircuitboard
       - HandheldStationMap
       - ClothingHeadHatWelding
+    dynamicRecipes:
+      - ClothingNeckCloakPan
+      - ClothingNeckCloakEnby
+      - ClothingNeckCloakGay
+      - ClothingNeckCloakLesbian
+      - ClothingNeckCloakIntersex
+      - ClothingNeckCloakBi
+      - ClothingNeckCloakAro
+      - ClothingNeckCloakAce
+      - ClothingNeckCloakTrans
+      - ClothingNeckTransPin
+      - ClothingNeckPansexualPin
+      - ClothingNeckNonBinaryPin
+      - ClothingNeckLesbianPin
+      - ClothingNeckIntersexPin
+      - ClothingNeckBisexualPin
+      - ClothingNeckAsexualPin
+      - ClothingNeckAromanticPin
+      - ClothingNeckLGBTPin
   - type: EmagLatheRecipes
     emagStaticRecipes:
        - CartridgePistol
@@ -732,6 +751,24 @@
       - ShuttleGunPerforatorCircuitboard
       - ShuttleGunFriendshipCircuitboard
       - ShuttleGunDusterCircuitboard
+      - ClothingNeckCloakPan
+      - ClothingNeckCloakEnby
+      - ClothingNeckCloakGay
+      - ClothingNeckCloakLesbian
+      - ClothingNeckCloakIntersex
+      - ClothingNeckCloakBi
+      - ClothingNeckCloakAro
+      - ClothingNeckCloakAce
+      - ClothingNeckCloakTrans
+      - ClothingNeckTransPin
+      - ClothingNeckPansexualPin
+      - ClothingNeckNonBinaryPin
+      - ClothingNeckLesbianPin
+      - ClothingNeckIntersexPin
+      - ClothingNeckBisexualPin
+      - ClothingNeckAsexualPin
+      - ClothingNeckAromanticPin
+      - ClothingNeckLGBTPin
   - type: MaterialStorage
     whitelist:
       tags:

diff --git a/Resources/Prototypes/Recipes/Lathes/clothing.yml b/Resources/Prototypes/Recipes/Lathes/clothing.yml
@@ -1282,3 +1282,131 @@
   completetime: 1
   materials:
     Cloth: 100
+
+# Cloaks
+- type: latheRecipe
+  id: ClothingNeckCloakPan
+  result: ClothingNeckCloakPan
+  completetime: 2
+  materials:
+    Cloth: 200
+
+- type: latheRecipe
+  id: ClothingNeckCloakEnby
+  result: ClothingNeckCloakEnby
+  completetime: 2
+  materials:
+    Cloth: 200
+
+- type: latheRecipe
+  id: ClothingNeckCloakGay
+  result: ClothingNeckCloakGay
+  completetime: 2
+  materials:
+    Cloth: 200
+
+- type: latheRecipe
+  id: ClothingNeckCloakLesbian
+  result: ClothingNeckCloakLesbian
+  completetime: 2
+  materials:
+    Cloth: 200
+
+- type: latheRecipe
+  id: ClothingNeckCloakIntersex
+  result: ClothingNeckCloakIntersex
+  completetime: 2
+  materials:
+    Cloth: 200
+
+- type: latheRecipe
+  id: ClothingNeckCloakBi
+  result: ClothingNeckCloakBi
+  completetime: 2
+  materials:
+    Cloth: 200
+
+- type: latheRecipe
+  id: ClothingNeckCloakAro
+  result: ClothingNeckCloakAro
+  completetime: 2
+  materials:
+    Cloth: 200
+
+- type: latheRecipe
+  id: ClothingNeckCloakAce
+  result: ClothingNeckCloakAce
+  completetime: 2
+  materials:
+    Cloth: 200
+
+- type: latheRecipe
+  id: ClothingNeckCloakTrans
+  result: ClothingNeckCloakTrans
+  completetime: 2
+  materials:
+    Cloth: 200
+
+# Pins
+- type: latheRecipe
+  id: ClothingNeckTransPin
+  result: ClothingNeckTransPin
+  completetime: 2
+  materials:
+    Steel: 300
+
+- type: latheRecipe
+  id: ClothingNeckPansexualPin
+  result: ClothingNeckPansexualPin
+  completetime: 2
+  materials:
+    Steel: 300
+
+- type: latheRecipe
+  id: ClothingNeckNonBinaryPin
+  result: ClothingNeckNonBinaryPin
+  completetime: 2
+  materials:
+    Steel: 300
+
+- type: latheRecipe
+  id: ClothingNeckLesbianPin
+  result: ClothingNeckLesbianPin
+  completetime: 2
+  materials:
+    Steel: 300
+
+- type: latheRecipe
+  id: ClothingNeckIntersexPin
+  result: ClothingNeckIntersexPin
+  completetime: 2
+  materials:
+    Steel: 300
+
+- type: latheRecipe
+  id: ClothingNeckBisexualPin
+  result: ClothingNeckBisexualPin
+  completetime: 2
+  materials:
+    Steel: 300
+
+- type: latheRecipe
+  id: ClothingNeckAsexualPin
+  result: ClothingNeckAsexualPin
+  completetime: 2
+  materials:
+    Steel: 300
+
+- type: latheRecipe
+  id: ClothingNeckAromanticPin
+  result: ClothingNeckAromanticPin
+  completetime: 2
+  materials:
+    Steel: 300
+
+- type: latheRecipe
+  id: ClothingNeckLGBTPin
+  result: ClothingNeckLGBTPin
+  completetime: 2
+  materials:
+    Steel: 300
diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml
@@ -101,6 +101,24 @@
   - TelescopicShield
   - HoloprojectorSecurity
   - WeaponDisablerSMG
+  - ClothingNeckCloakPan
+  - ClothingNeckCloakEnby
+  - ClothingNeckCloakGay
+  - ClothingNeckCloakLesbian
+  - ClothingNeckCloakIntersex
+  - ClothingNeckCloakBi
+  - ClothingNeckCloakAro
+  - ClothingNeckCloakAce
+  - ClothingNeckCloakTrans
+  - ClothingNeckTransPin
+  - ClothingNeckPansexualPin
+  - ClothingNeckNonBinaryPin
+  - ClothingNeckLesbianPin
+  - ClothingNeckIntersexPin
+  - ClothingNeckBisexualPin
+  - ClothingNeckAsexualPin
+  - ClothingNeckAromanticPin
+  - ClothingNeckLGBTPin
 
 # Tier 2