Merge pull request #1388 from dvir001/2024-05-19-Rubber

Rubber Bullets
new-frontiers-14 · Jun 1, 2024 · ad53d7c · ad53d7c
2 parents 799f963 + 09a6dae
commit ad53d7c
Show file tree

Hide file tree

Showing 39 changed files with 800 additions and 207 deletions.
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml
@@ -7,15 +7,15 @@
     WeaponSniperRepeater: 10
     MagazineBoxLightRifle: 10
     MagazineBoxLightRiflePractice: 10
-#    MagazineBoxLightRifleRubber: 15 # Frontier - TODO: Restore Rubber
+    MagazineBoxLightRifleRubber: 15
     WeaponShotgunDoubleBarreled: 10
     BoxShotgunSlug: 10
     BoxLethalshot: 10
     BoxBeanbag: 10
     BoxShotgunPractice: 10
     WeaponRevolverArgenti: 10
     MagazineBoxRifle: 10
-#    MagazineBoxRifleRubber: 15 # Frontier - TODO: Restore Rubber
+    MagazineBoxRifleRubber: 15
     MagazineBoxRiflePractice: 10
     MagazineBoxMagnum: 10
   emaggedInventory:

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml
@@ -102,4 +102,4 @@
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
-    - state: uranium
+    - state: uranium
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml
@@ -43,3 +43,4 @@
       - state: tip
         map: [ "enum.AmmoVisualLayers.Tip" ]
         color: "#dbdbdb"
+
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml
@@ -19,3 +19,14 @@
     damage:
       types:
         Blunt: 2
+
+- type: entity
+  id: BulletCaselessRifleRubber
+  name: bullet (.25 caseless rubber)
+  parent: BaseBulletRubber
+  noSpawn: true
+  components:
+  - type: Projectile
+    damage:
+      types:
+        Blunt: 3
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml
@@ -20,6 +20,17 @@
       types:
         Blunt: 2
 
+- type: entity
+  id: BulletLightRifleRubber
+  name: bullet (.20 rifle rubber)
+  parent: BaseBulletRubber
+  noSpawn: true
+  components:
+  - type: Projectile
+    damage:
+      types:
+        Blunt: 3
+
 - type: entity
   id: BulletLightRifleIncendiary
   parent: BaseBulletIncendiary

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml
@@ -20,6 +20,19 @@
       types:
         Blunt: 1
 
+- type: entity
+  id: BulletMagnumRubber
+  name: bullet (.45 magnum rubber)
+  parent: BaseBulletRubber
+  noSpawn: true
+  components:
+  - type: Projectile
+    damage:
+      types:
+        Blunt: 3
+  - type: StaminaDamageOnCollide
+    damage: 35 # 3 hits to stun cuz revolver
+
 - type: entity
   id: BulletMagnumIncendiary
   parent: BaseBulletIncendiary
@@ -31,7 +44,7 @@
       types:
         Blunt: 3
         Heat: 32
-
+        
 - type: entity
   id: BulletMagnumAP
   name: bullet (.45 magnum armor-piercing)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml
@@ -20,6 +20,17 @@
       types:
         Blunt: 2
 
+- type: entity
+  id: BulletPistolRubber
+  name: bullet (.35 auto rubber)
+  parent: BaseBulletRubber
+  noSpawn: true
+  components:
+  - type: Projectile
+    damage:
+      types:
+        Blunt: 3
+
 - type: entity
   id: BulletPistolIncendiary
   parent: BaseBulletIncendiary

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml
@@ -20,6 +20,17 @@
       types:
         Blunt: 2
 
+- type: entity
+  id: BulletRifleRubber
+  name: bullet (0.20 rifle rubber)
+  parent: BaseBulletRubber
+  noSpawn: true
+  components:
+  - type: Projectile
+    damage:
+      types:
+        Blunt: 3
+
 - type: entity
   id: BulletRifleIncendiary
   parent: BaseBulletIncendiary
@@ -31,7 +42,7 @@
       types:
         Blunt: 2
         Heat: 15
-
+  
 - type: entity
   id: BulletRifleUranium
   parent: BaseBulletUranium
@@ -43,4 +54,4 @@
       types:
         Radiation: 7
         Piercing: 8
-
+        
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -104,6 +104,25 @@
       types:
         Blunt: 1
 
+- type: entity
+  id: BaseBulletRubber
+  name: base bullet rubber
+  parent: BaseBullet
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
+    layers:
+    - state: rubber
+  - type: Projectile
+    damage:
+      types:
+        Blunt: 3
+    soundHit:
+      path: /Audio/Weapons/Guns/Hits/snap.ogg
+  - type: StaminaDamageOnCollide
+    damage: 22 # 5 hits to stun sounds reasonable
+
 - type: entity
   id: BaseBulletIncendiary
   name: base bullet incendiary

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
@@ -186,3 +186,4 @@
     steps: 1
     zeroVisible: true
   - type: Appearance
+
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -20,7 +20,7 @@
     maxAngle: 16
     fireRate: 8
     angleIncrease: 3
-    angleDecay: 16
+    angleDecay: 16  
     selectedMode: FullAuto
     availableModes:
     - SemiAuto
@@ -235,7 +235,7 @@
     minAngle: 1
     maxAngle: 6
     angleIncrease: 1.5
-    angleDecay: 6
+    angleDecay: 6  
     selectedMode: FullAuto
     shotsPerBurst: 5
     availableModes:

diff --git a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml
@@ -205,7 +205,7 @@
     id: ERTSecurityPDA
     ears: ClothingHeadsetAltCentCom
     belt: ClothingBeltSecurityFilled
-    pocket1: WeaponPistolMk58
+    pocket1: WeaponPistolMk58Nonlethal
     pocket2: FlashlightSeclite
 
 - type: startingGear
@@ -222,7 +222,7 @@
     id: ERTSecurityPDA
     ears: ClothingHeadsetAltCentCom
     belt: ClothingBeltSecurityFilled
-    pocket1: WeaponPistolMk58
+    pocket1: WeaponPistolMk58Nonlethal
     pocket2: FlashlightSeclite
 
 - type: startingGear

diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Boxes/ammunition.yml b/Resources/Prototypes/_NF/Catalog/Fills/Boxes/ammunition.yml
@@ -0,0 +1,69 @@
+# CaselessRifle
+- type: entity
+  name: box of .25 caseless (rubber) magazines
+  parent: BoxMagazine
+  id: BoxMagazineCaselessRifleRubber
+  description: A box full of
+  components:
+  - type: StorageFill
+    contents:
+      - id: MagazineCaselessRifleRubber
+        amount: 4
+
+# LightRifle
+- type: entity
+  name: box of .30 rifle (rubber) magazines
+  parent: BoxMagazine
+  id: BoxMagazineLightRifleRubber
+  description: A box full of .30 rifle (practice) magazines.
+  components:
+  - type: StorageFill
+    contents:
+      - id: MagazineLightRifleRubber
+        amount: 4
+
+- type: entity
+  name: box of Vector (rubber) magazines
+  parent: BoxMagazine
+  id: BoxMagazineMagnumSubMachineGunRubber
+  description: A box full of Vector (rubber) magazines.
+  components:
+  - type: StorageFill
+    contents:
+      - id: MagazineMagnumSubMachineGunRubber
+        amount: 3
+
+# Pistol
+- type: entity
+  name: box of pistol .35 auto (rubber) magazines
+  parent: BoxMagazine
+  id: BoxMagazinePistolRubber
+  description: A box full of pistol .35 auto (rubber) magazines.
+  components:
+  - type: StorageFill
+    contents:
+      - id: MagazinePistolRubber
+        amount: 4
+
+- type: entity
+  name: box of SMG .35 auto (rubber) magazines
+  parent: BoxMagazine
+  id: BoxMagazinePistolSubMachineGunRubber
+  description: A box full of SMG .35 auto (rubber) magazines.
+  components:
+  - type: StorageFill
+    contents:
+      - id: MagazinePistolSubMachineGunRubber
+        amount: 3
+
+# Rifle
+- type: entity
+  name: box of .20 rifle (rubber) magazines
+  parent: BoxMagazine
+  id: BoxMagazineRifleRubber
+  description: A box full of .20 rifle (rubber) magazines.
+  components:
+  - type: StorageFill
+    contents:
+      - id: MagazineRifleRubber
+        amount: 4
Original file line number	Diff line number	Diff line change
Expand Up		@@ -43,3 +43,4 @@
		- state: tip
		map: [ "enum.AmmoVisualLayers.Tip" ]
		color: "#dbdbdb"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -186,3 +186,4 @@
		steps: 1
		zeroVisible: true
		- type: Appearance