Roundstart Secfab Rubbers (#2758)

* re-add rubbers * removed research entirely
DeltaV-Station · Jan 17, 2025 · fb01fc8 · fb01fc8
1 parent 90629ee
commit fb01fc8
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 26 deletions.
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -841,6 +841,20 @@
       - SpeedLoaderSpecialEmpty
       - SpeedLoaderSpecialPractice
       - MagazinePistolSpecial
+      - MagazineRifleRubber
+      - MagazinePistolRubber
+      - MagazineLightRifleRubber
+      - SpeedLoaderMagnumRubber
+      - SpeedLoaderSpecialRubber
+      - MagazineBoxPistolRubber
+      - MagazineBoxMagnumRubber
+      - MagazineBoxLightRifleRubber
+      - MagazineBoxRifleRubber
+      - MagazineBoxSpecialRubber
+      - MagazineShotgunBeanbag
+      - BoxShellTranquilizer
+      - BoxBeanbag
+      - WeaponDisabler
       # End DeltaV additions
     dynamicRecipes:
       - EncryptionKeySyndie # Nyano

diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml
@@ -34,32 +34,21 @@
   recipeUnlocks:
   - WeaponLaserCarbine
 
-- type: technology
-  id: NonlethalAmmunition
-  name: research-technology-nonlethal-ammunition
-  icon:
-    sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi
-    state: beanbag
-  discipline: Arsenal
-  tier: 1
-  cost: 5000
-  recipeUnlocks:
-  - MagazineShotgunBeanbag
-  - BoxShellTranquilizer
-  - BoxBeanbag
-  - WeaponDisabler
-  # DeltaV - rubber ammo which upstream removed
-  - MagazineRifleRubber
-  - MagazinePistolRubber
-  - MagazineLightRifleRubber
-  - SpeedLoaderMagnumRubber
-  - SpeedLoaderSpecialRubber
-  - MagazineBoxPistolRubber
-  - MagazineBoxMagnumRubber
-  - MagazineBoxLightRifleRubber
-  - MagazineBoxRifleRubber
-  - MagazineBoxSpecialRubber
-  # End of modified code
+# DeltaV: made nonlethals roundstart, see #2758
+#- type: technology
+#  id: NonlethalAmmunition
+#  name: research-technology-nonlethal-ammunition
+#  icon:
+#    sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi
+#    state: beanbag
+#  discipline: Arsenal
+#  tier: 1
+#  cost: 5000
+#  recipeUnlocks:
+#  - MagazineShotgunBeanbag
+#  - BoxShellTranquilizer
+#  - BoxBeanbag
+#  - WeaponDisabler
 
 - type: technology
   id: UraniumMunitions