bring back rubber ammo sprites

Resources/Migrations/deltaMigrations.yml

@@ -137,3 +137,8 @@ SpawnMobSmile: SentientSmileCore
 
 #2025-01-12
 ForensicMantisPDA: PsionicMantisPDA
+
+#2025-02-10
+MagazineBoxCaselessRifleBigRubber: null
+MagazineBoxCaselessRifleRubber: null
+MagazineMagnumSubMachineGunRubber: null

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml

@@ -80,26 +80,6 @@
     zeroVisible: false
   - type: Appearance
 
-- type: entity
-  id: SpeedLoaderMagnumRubber
-  name: "speed loader (.45 magnum rubber)"
-  parent: BaseSpeedLoaderMagnum
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeMagnumRubber
-  - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi
-    layers:
-      - state: base
-        map: [ "enum.GunVisualLayers.Base" ]
-      - state: rubber-6
-        map: [ "enum.GunVisualLayers.Mag" ]
-  - type: MagazineVisuals
-    magState: rubber
-    steps: 7
-    zeroVisible: false
-  - type: Appearance
-
 - type: entity
   id: SpeedLoaderMagnumAP
   name: "speed loader (.45 magnum armor-piercing)"

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml

@@ -57,22 +57,3 @@
     steps: 7
     zeroVisible: false
   - type: Appearance
-
-- type: entity
-  id: SpeedLoaderPistolRubber
-  name: "speed loader (.35 auto rubber)"
-  parent: BaseSpeedLoaderPistol
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgePistolRubber
-  - type: Sprite
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: rubber-6
-      map: ["enum.GunVisualLayers.Mag"]
-  - type: MagazineVisuals
-    magState: rubber
-    steps: 7
-    zeroVisible: false
-  - type: Appearance

Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml

@@ -104,26 +104,6 @@
       types:
         Blunt: 1
 
-# DeltaV - We're keping rubbers so make sure to keep this updated
-- type: entity
-  id: BaseBulletRubber
-  name: base bullet rubber
-  parent: BaseBullet
-  categories: [ HideSpawnMenu ]
-  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

Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml

@@ -1,32 +0,0 @@
-- type: entity
-  parent: BaseMagazineBoxCaselessRifle
-  id: MagazineBoxCaselessRifleBigRubber
-  name: ammunition box (.25 caseless rubber)
-  components:
-  - type: BallisticAmmoProvider
-    capacity: 200
-    proto: CartridgeCaselessRifleRubber
-  - type: Sprite
-    layers:
-    - state: base-b
-      map: ["enum.GunVisualLayers.Base"]
-    - state: magb-1
-      map: ["enum.GunVisualLayers.Mag"]
-    - state: rubber-b
-  - type: MagazineVisuals
-    magState: magb
-
-- type: entity
-  parent: BaseMagazineBoxCaselessRifle
-  id: MagazineBoxCaselessRifleRubber
-  name: ammunition box (.25 caseless rubber)
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeCaselessRifleRubber
-  - type: Sprite
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-    - state: rubber

Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml

@@ -12,3 +12,4 @@
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
     - state: rubber
+      sprite: _DV/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi

Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml

@@ -12,4 +12,4 @@
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
     - state: rubber
-
+      sprite: _DV/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi

Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml

@@ -12,3 +12,4 @@
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
     - state: rubber
+      sprite: _DV/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi

Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml

@@ -5,16 +5,17 @@
   components:
   - type: BallisticAmmoProvider
     capacity: 200
-    proto: CartridgeRiflePractice
+    proto: CartridgeRifleRubber
   - type: Sprite
     layers:
-    - state: base-b
+    - state: base-big
       map: ["enum.GunVisualLayers.Base"]
-    - state: magb-1
+    - state: mag-big-1
       map: ["enum.GunVisualLayers.Mag"]
-    - state: practice-b
+    - state: rubber
+      sprite: _DV/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi
   - type: MagazineVisuals
-    magState: magb
+    magState: mag-big
 
 - type: entity
   parent: BaseMagazineBoxRifle
@@ -30,3 +31,4 @@
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
     - state: rubber
+      sprite: _DV/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi

Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml

@@ -11,6 +11,7 @@
   - type: Sprite
     layers:
     - state: rubber
+      sprite: _DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
@@ -27,6 +28,7 @@
   - type: Sprite
     layers:
     - state: rubber
+      sprite: _DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
@@ -42,6 +44,7 @@
   - type: Sprite
     layers:
     - state: rubber
+      sprite: _DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]

Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml

@@ -10,6 +10,7 @@
   - type: Sprite
     layers:
     - state: rubber
+      sprite: _DV/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]

Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml

@@ -10,20 +10,7 @@
   - type: Sprite
     layers:
     - state: rubber
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-
-- type: entity
-  id: MagazineMagnumSubMachineGunRubber
-  name: "Vector magazine (.45 magnum rubber)"
-  parent: BaseMagazineMagnumSubMachineGun
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeMagnumRubber
-  - type: Sprite
-    layers:
-    - state: rubber
+      sprite: _DV/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]

Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml

@@ -10,6 +10,7 @@
   - type: Sprite
     layers:
     - state: rubber
+      sprite: _DV/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
@@ -24,6 +25,7 @@
   - type: Sprite
     layers:
     - state: rubber
+      sprite: _DV/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]

Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml

@@ -0,0 +1,20 @@
+- type: entity
+  id: SpeedLoaderMagnumRubber
+  name: "speed loader (.45 magnum rubber)"
+  parent: BaseSpeedLoaderMagnum
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeMagnumRubber
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi
+    layers:
+      - state: base
+        map: [ "enum.GunVisualLayers.Base" ]
+      - state: rubber-6
+        sprite: _DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi
+        map: [ "enum.GunVisualLayers.Mag" ]
+  - type: MagazineVisuals
+    magState: rubber
+    steps: 7
+    zeroVisible: false
+  - type: Appearance

Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml

@@ -0,0 +1,19 @@
+- type: entity
+  parent: BaseSpeedLoaderPistol
+  id: SpeedLoaderPistolRubber
+  name: "speed loader (.35 auto rubber)"
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgePistolRubber
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: rubber-6
+      sprite: _DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: MagazineVisuals
+    magState: rubber
+    steps: 7
+    zeroVisible: false
+  - type: Appearance

Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml

@@ -46,6 +46,25 @@
     soundHit:
       collection: MeatLaserImpact
 
+- type: entity
+  abstract: true
+  parent: BaseBullet
+  id: BaseBulletRubber
+  name: base bullet rubber
+  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
   parent: BulletPistolIncendiary
   id: BulletLighterIncendiary

Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/meta.json

@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/space-wizards/space-station-14/tree/96cb951555347f47f886d1f7524a8e8a92292eff/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi and recoloured by deltanedas (github)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "rubber"
+        }
+    ]
+}

Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/meta.json

@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/space-wizards/space-station-14/tree/96cb951555347f47f886d1f7524a8e8a92292eff/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi and recoloured by deltanedas (github)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "rubber"
+        }
+    ]
+}

Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/meta.json

@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/space-wizards/space-station-14/tree/96cb951555347f47f886d1f7524a8e8a92292eff/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi and recoloured by deltanedas (github)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "rubber"
+        }
+    ]
+}

Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/meta.json

@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/space-wizards/space-station-14/tree/96cb951555347f47f886d1f7524a8e8a92292eff/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi and recoloured by deltanedas (github)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "rubber"
+        }
+    ]
+}

Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/meta.json

@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "rubber"
+        }
+    ]
+}

Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/meta.json

@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "rubber"
+        }
+    ]
+}

Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/meta.json

@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi",
+    "states": [
+        {
+            "name": "rubber"
+        }
+    ]
+}

Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/meta.json

@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/shiptest-ss13/Shiptest/pull/1602/commits/3e6cfea9d468508a7f64ad5543c3b22479cb465f , https://github.com/shiptest-ss13/Shiptest/blob/master/icons/obj/ammo.dmi",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "rubber"
+        }
+    ]
+}

Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/meta.json

@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/shiptest-ss13/Shiptest/commit/662c08272acd7be79531550919f56f846726eabb , https://github.com/shiptest-ss13/Shiptest/blob/master/icons/obj/ammo.dmi",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "rubber"
+        }
+    ]
+}

Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/meta.json

@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "rubber"
+        }
+    ]
+}

Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/meta.json

@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "rubber"
+        }
+    ]
+}

Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/meta.json

@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "rubber"
+        }
+    ]
+}

Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/meta.json

@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "All sprites by https://github.com/august-sun.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "rubber"
+        }
+    ]
+}

Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/meta.json

@@ -0,0 +1,29 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "rubber-1"
+        },
+        {
+            "name": "rubber-2"
+        },
+        {
+            "name": "rubber-3"
+        },
+        {
+            "name": "rubber-4"
+        },
+        {
+            "name": "rubber-5"
+        },
+        {
+            "name": "rubber-6"
+        }
+    ]
+}

Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/meta.json

@@ -0,0 +1,29 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from and modified https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_speed.dmi",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "rubber-1"
+        },
+        {
+            "name": "rubber-2"
+        },
+        {
+            "name": "rubber-3"
+        },
+        {
+            "name": "rubber-4"
+        },
+        {
+            "name": "rubber-5"
+        },
+        {
+            "name": "rubber-6"
+        }
+    ]
+}