Merge pull request #512 from VividPups/adding-nonlethal-prefill-mags-

Add the other Rubber Mags and fix the visuals of the any mags
Fansana · Feb 2, 2025 · 1772f21 · 1772f21
2 parents b23443a + 9d3775d
commit 1772f21
Show file tree

Hide file tree

Showing 8 changed files with 109 additions and 4 deletions.
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml
@@ -80,6 +80,9 @@
     layers:
     - state: base
       map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+
 
 - type: entity
   id: MagazineLightRiflePractice

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
@@ -59,6 +59,8 @@
     layers:
     - state: base
       map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1 # floof it fix the visual problem
+      map: ["enum.GunVisualLayers.Mag"]
 
 - type: entity
   id: MagazineMagnum
@@ -142,6 +144,8 @@
     layers:
     - state: base
       map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1 # floof it fix the visual problem
+      map: ["enum.GunVisualLayers.Mag"]
 
 - type: entity
   id: MagazineMagnumSubMachineGun

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
@@ -162,6 +162,8 @@
     layers:
     - state: base
       map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1 #floof fix the visials of it not filling
+      map: ["enum.GunVisualLayers.Mag"]
 
 
 - type: entity
@@ -226,6 +228,8 @@
     layers:
     - state: base
       map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1 # Floof fix the mag not filling
+      map: ["enum.GunVisualLayers.Mag"]
 
 - type: entity
   id: MagazinePistolHighCapacity
@@ -301,6 +305,8 @@
     layers:
     - state: base
       map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1 # Floof fix the mag not filling
+      map: ["enum.GunVisualLayers.Mag"]
 
 - type: entity
   id: MagazinePistolSubMachineGunPractice
@@ -332,7 +338,7 @@
 
 - type: entity
   id: MagazinePistolSubMachineGunUranium
-  name: SMG magazine (.35 auto rubber)
+  name: SMG magazine (.35 auto Uranium)  #floof  Name fix
   parent: BaseMagazinePistolSubMachineGun
   components:
   - type: BallisticAmmoProvider

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml
@@ -59,6 +59,8 @@
     layers:
     - state: base
       map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1 # floof fix the visuals
+      map: ["enum.GunVisualLayers.Mag"]
 
 - type: entity
   id: MagazineRifleIncendiary

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml
@@ -51,6 +51,8 @@
     layers:
       - state: base
         map: [ "enum.GunVisualLayers.Base" ]
+      - state: base-6
+        map: [ "enum.GunVisualLayers.Mag" ]
 
 - type: entity
   id: SpeedLoaderMagnumIncendiary

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -935,6 +935,14 @@
       - SurveillanceCameraMonitorCircuitboard
       - SurveillanceWirelessCameraMonitorCircuitboard
       - SurveillanceCameraWirelessRouterCircuitboard
+      - MagazineUniversalMagnumRubber
+      - MagazinePistolSubMachineGunRubber
+      - MagazineRifleRubber
+      - MagazineLightRifleRubber
+      - MagazineMagnumRubber
+      - MagazinePistolRubber
+      - SpeedLoaderMagnumRubber
+      - ShellShotgunBeanbag
       # Floof section end
       - SecurityCyberneticEyes
       - MedicalCyberneticEyes

diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml
@@ -76,7 +76,7 @@
     Steel: 700
     Glass: 500
     Plastic: 200
-    
+
 - type: latheRecipe
   id: BorgModuleKill
   result: BorgModuleKill
@@ -86,7 +86,7 @@
     Steel: 1500
     Glass: 1000
     Gold: 850
-    
+
 - type: latheRecipe
   id: BorgModuleInvestigation
   result: BorgModuleInvestigation
@@ -96,7 +96,7 @@
     Steel: 1500
     Glass: 1000
     Gold: 850
-    
+
 # - type: latheRecipe
   # id: WeaponEnergyShotgun
   # result: WeaponEnergyShotgun
@@ -308,6 +308,15 @@
     Steel: 25
     Plastic: 120
 
+- type: latheRecipe #floof
+  id: MagazinePistolRubber
+  result: MagazinePistolRubber
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 25
+    Plastic: 120
+
 - type: latheRecipe
   id: MagazinePistolSubMachineGunEmpty
   result: MagazinePistolSubMachineGunEmpty
@@ -324,6 +333,15 @@
   materials:
     Steel: 300
 
+- type: latheRecipe # Floof
+  id: MagazinePistolSubMachineGunRubber
+  result: MagazinePistolSubMachineGunRubber
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 350
+    Plastic: 300
+
 - type: latheRecipe
   id: MagazinePistolSubMachineGunTopMountedEmpty
   result: MagazinePistolSubMachineGunTopMountedEmpty
@@ -382,6 +400,15 @@
     Steel: 350
     Plastic: 300
 
+- type: latheRecipe #floof
+  id: MagazineUniversalMagnumRubber
+  result: MagazineUniversalMagnumRubber
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 400
+    Plastic: 350
+
 - type: latheRecipe
   id: MagazineRifle
   result: MagazineRifle
@@ -418,6 +445,15 @@
     Steel: 25
     Plastic: 450
 
+- type: latheRecipe #floof
+  id: MagazineRifleRubber
+  result: MagazineRifleRubber
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 325
+    Plastic: 340
+
 - type: latheRecipe
   id: MagazineLightRifleEmpty
   result: MagazineLightRifleEmpty
@@ -462,6 +498,15 @@
     Steel: 25
     Plastic: 540
 
+- type: latheRecipe #floof
+  id: MagazineLightRifleRubber
+  result: MagazineLightRifleRubber
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 325
+    Plastic: 340
+
 - type: latheRecipe
   id: MagazineBoxRifle
   result: MagazineBoxRifle
@@ -565,6 +610,15 @@
     Steel: 50
     Plastic: 150
 
+- type: latheRecipe
+  id: SpeedLoaderMagnumRubber
+  result: SpeedLoaderMagnumRubber
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 50
+    Plastic: 150
+
 - type: latheRecipe
   id: MagazineShotgunEmpty
   result: MagazineShotgunEmpty
@@ -624,6 +678,14 @@
   materials:
     Plastic: 240
 
+- type: latheRecipe #floof
+  id: MagazineMagnumRubber
+  result: MagazineMagnumRubber
+  category: Ammo
+  completetime: 5
+  materials:
+    Plastic: 240
+
 - type: latheRecipe
   id: MagazineBoxLightRifleIncendiary
   result: MagazineBoxLightRifleIncendiary
@@ -853,6 +915,16 @@
     Plastic: 20
     Steel: 5
 
+- type: latheRecipe
+  id: ShellShotgunBeanbag #floof
+  result: ShellShotgunBeanbag
+  category: Ammo
+  completetime: 2
+  materials:
+    Plastic: 20
+    Steel: 5
+
+
 - type: latheRecipe
   id: CartridgeLightRifleIncendiary
   result: CartridgeLightRifleIncendiary

diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml
@@ -63,6 +63,7 @@
   recipeUnlocks:
   - MagazineShotgunBeanbag
   - ShellTranquilizer
+  - ShellShotgunBeanbag #floof
   - BoxBeanbag
   - CartridgePistolRubber
   - CartridgeMagnumRubber
@@ -74,6 +75,13 @@
   - MagazineBoxRifleRubber
   - CartridgeSpecialRubber
   - MagazineBoxSpecialRubber
+  - MagazinePistolSubMachineGunRubber #floof
+  - MagazineUniversalMagnumRubber #floof
+  - MagazineRifleRubber #floof
+  - MagazineLightRifleRubber #floof
+  - MagazineMagnumRubber #floof
+  - MagazinePistolRubber #floof
+  - SpeedLoaderMagnumRubber #floof
   - WeaponDisabler
 
 - type: technology