summey

Rxup · Mar 11, 2024 · e6836d6 · e6836d6
1 parent 82df3e6
commit e6836d6
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 5 deletions.
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -183,6 +183,8 @@
       - CartridgePistolRubber
       - CartridgeMagnumRubber
       - ShellShotgunBeanbag
+      - GrenadeTearGas
+      - GrenadeNonletal
       - CartridgeRifleRubber
       - CartridgeLightRifleRubber
       - MagazineBoxPistolRubber
@@ -338,6 +340,7 @@
     emagDynamicRecipes:
       - ExplosivePayload
       - WeaponLaserCarbine
+      - WeaponLaserPistol
       - WeaponAdvancedLaser
       - WeaponLaserCannon
       - WeaponXrayCannon
@@ -725,6 +728,8 @@
       - GrenadeEMP
       - GrenadeFlash
       - ShellShotgunBeanbag
+      - GrenadeTearGas
+      - GrenadeNonletal
       - ShellShotgunIncendiary
       - ShellShotgunUranium
       - Signaller
@@ -738,6 +743,7 @@
       - WeaponDisablerSMG
       - WeaponLaserCannon
       - WeaponLaserCarbine
+      - WeaponLaserPistol
       - WeaponLaserCarbinePractice
       - InsulativeHeadcage
       - ClothingHeadHelmetInsulated

diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml
@@ -32,14 +32,24 @@
 
 - type: latheRecipe
   id: WeaponLaserCarbine
-  result: WeaponEarthGovLaserRifle
+  result: WeaponEarthGovLaserCarbine
   category: Weapons
   completetime: 8
   materials:
     Steel: 2000
     Glass: 800
     Plastic: 500
 
+- type: latheRecipe
+  id: WeaponLaserPistol
+  result: WeaponEarthGovLaserPistol
+  category: Weapons
+  completetime: 8
+  materials:
+    Steel: 500
+    Glass: 100
+    Plastic: 200
+
 - type: latheRecipe
   id: WeaponAdvancedLaser
   result: WeaponAdvancedLaser
@@ -137,6 +147,24 @@
     Plastic: 200
     Steel: 100
 
+- type: latheRecipe
+  id: GrenadeTearGas
+  result: GrenadeTearGas
+  category: Ammo
+  completetime: 5
+  materials:
+    Plastic: 15
+    Steel: 10
+
+- type: latheRecipe
+  id: GrenadeNonletal
+  result: GrenadeNonletal
+  category: Ammo
+  completetime: 5
+  materials:
+    Plastic: 20
+    Steel: 10
+
 - type: latheRecipe
   id: ShellShotgunBeanbag
   result: ShellShotgunBeanbag

diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml
@@ -45,6 +45,7 @@
   cost: 7500
   recipeUnlocks:
   - WeaponLaserCarbine
+  - WeaponLaserPistol
 
 - type: technology
   id: NonlethalAmmunition
@@ -57,6 +58,8 @@
   cost: 5000
   recipeUnlocks:
   - ShellShotgunBeanbag
+  - GrenadeTearGas
+  - GrenadeNonletal
   - CartridgePistolRubber
   - CartridgeMagnumRubber
   - CartridgeLightRifleRubber
@@ -149,7 +152,7 @@
 - type: technology
   id: BasicShuttleArmament
   name: research-technology-basic-shuttle-armament
-  icon: 
+  icon:
     sprite: Structures/Power/cage_recharger.rsi
     state: full
   discipline: Arsenal
@@ -192,11 +195,11 @@
   cost: 15000
   recipeUnlocks:
   - WeaponLaserSvalinn
-  
+
 - type: technology
   id: AdvancedShuttleWeapon
   name: research-technology-advanced-shuttle-weapon
-  icon: 
+  icon:
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/Grenade/grenade_cartridge.rsi
     state: icon
   discipline: Arsenal

diff --git a/Resources/migration.yml b/Resources/migration.yml
@@ -363,7 +363,7 @@ Observationskit: null
 CrateBaseWeldable: CrateGenericSteel
 
 # 2024-09-03 Backmen
-WeaponRifleLecterRubber: WeaponRifleM28Rubber
+WeaponRifleLecterRubber: WeaponRifleFamas
 WeaponTaser: WeaponDominatorNT
 
 # 2024-03-11