From bb9c6dbe9d16e5d877a6e41ae9e7870cb5a24f94 Mon Sep 17 00:00:00 2001
From: Tiniest Shark
Date: Sat, 26 Apr 2025 19:36:01 -0400
Subject: [PATCH] Ammo Mag + Speedloader Inhand Sprites (#34235)
* Added inhand visuals to (most) ammo magazines and speedloaders
* whoops mixed up a single inhand on the rifle mag
* Didn't realize rubber ammo got removed.
* added attributions
* adjusted inhand visuals to account for magazine types
* missed one :eye::eye:
---------
Co-authored-by: EmoGarbage404
---
.../Ammunition/Magazines/caseless_rifle.yml | 56 +++++++++
.../Guns/Ammunition/Magazines/light_rifle.yml | 36 ++++++
.../Guns/Ammunition/Magazines/magnum.yml | 93 ++++++++++++++-
.../Guns/Ammunition/Magazines/pistol.yml | 106 +++++++++++++++++-
.../Guns/Ammunition/Magazines/rifle.yml | 36 ++++++
.../Guns/Ammunition/Magazines/shotgun.yml | 49 ++++++++
.../Guns/Ammunition/SpeedLoaders/magnum.yml | 50 +++++++++
.../CaselessRifle/10x24.rsi/inhand-left.png | Bin 0 -> 353 bytes
.../CaselessRifle/10x24.rsi/inhand-right.png | Bin 0 -> 366 bytes
.../CaselessRifle/10x24.rsi/meta.json | 12 +-
.../inhand-left-mag.png | Bin 0 -> 196 bytes
.../inhand-left-stripe.png | Bin 0 -> 128 bytes
.../inhand-right-mag.png | Bin 0 -> 198 bytes
.../inhand-right-stripe.png | Bin 0 -> 133 bytes
.../caseless_pistol_mag.rsi/meta.json | 18 ++-
.../inhand-left-mag.png | Bin 0 -> 318 bytes
.../inhand-left-stripe.png | Bin 0 -> 126 bytes
.../inhand-right-mag.png | Bin 0 -> 329 bytes
.../inhand-right-stripe.png | Bin 0 -> 133 bytes
.../caseless_rifle_mag.rsi/meta.json | 18 ++-
.../inhand-left-mag.png | Bin 0 -> 305 bytes
.../inhand-left-stripe.png | Bin 0 -> 135 bytes
.../inhand-right-mag.png | Bin 0 -> 312 bytes
.../inhand-right-stripe.png | Bin 0 -> 138 bytes
.../caseless_rifle_mag_short.rsi/meta.json | 18 ++-
.../Magazine/Dart/darts.rsi/inhand-left.png | Bin 0 -> 441 bytes
.../Magazine/Dart/darts.rsi/inhand-right.png | Bin 0 -> 464 bytes
.../Magazine/Dart/darts.rsi/meta.json | 12 +-
.../light_rifle_box.rsi/inhand-left.png | Bin 0 -> 390 bytes
.../light_rifle_box.rsi/inhand-right.png | Bin 0 -> 410 bytes
.../LightRifle/light_rifle_box.rsi/meta.json | 12 +-
.../light_rifle_mag.rsi/inhand-left-mag.png | Bin 0 -> 282 bytes
.../inhand-left-stripe.png | Bin 0 -> 134 bytes
.../light_rifle_mag.rsi/inhand-right-mag.png | Bin 0 -> 293 bytes
.../inhand-right-stripe.png | Bin 0 -> 133 bytes
.../LightRifle/light_rifle_mag.rsi/meta.json | 18 ++-
.../LightRifle/maxim.rsi/inhand-left.png | Bin 0 -> 436 bytes
.../LightRifle/maxim.rsi/inhand-right.png | Bin 0 -> 437 bytes
.../Magazine/LightRifle/maxim.rsi/meta.json | 12 +-
.../magnum_smg_mag.rsi/inhand-left-mag.png | Bin 0 -> 228 bytes
.../magnum_smg_mag.rsi/inhand-left-stripe.png | Bin 0 -> 125 bytes
.../magnum_smg_mag.rsi/inhand-right-mag.png | Bin 0 -> 244 bytes
.../inhand-right-stripe.png | Bin 0 -> 130 bytes
.../Magnum/magnum_smg_mag.rsi/meta.json | 18 ++-
.../inhand-left-mag.png | Bin 0 -> 244 bytes
.../inhand-left-stripe.png | Bin 0 -> 131 bytes
.../inhand-right-mag.png | Bin 0 -> 257 bytes
.../inhand-right-stripe.png | Bin 0 -> 135 bytes
.../pistol_high_capacity_mag.rsi/meta.json | 19 +++-
.../Pistol/pistol_mag.rsi/inhand-left-mag.png | Bin 0 -> 230 bytes
.../pistol_mag.rsi/inhand-left-stripe.png | Bin 0 -> 131 bytes
.../pistol_mag.rsi/inhand-right-mag.png | Bin 0 -> 249 bytes
.../pistol_mag.rsi/inhand-right-stripe.png | Bin 0 -> 132 bytes
.../Magazine/Pistol/pistol_mag.rsi/meta.json | 19 +++-
.../Pistol/smg_mag.rsi/inhand-left-mag.png | Bin 0 -> 311 bytes
.../Pistol/smg_mag.rsi/inhand-left-stripe.png | Bin 0 -> 140 bytes
.../Pistol/smg_mag.rsi/inhand-right-mag.png | Bin 0 -> 302 bytes
.../smg_mag.rsi/inhand-right-stripe.png | Bin 0 -> 145 bytes
.../Magazine/Pistol/smg_mag.rsi/meta.json | 18 ++-
.../smg_mag_top_mounted.rsi/inhand-left.png | Bin 0 -> 242 bytes
.../smg_mag_top_mounted.rsi/inhand-right.png | Bin 0 -> 242 bytes
.../Pistol/smg_mag_top_mounted.rsi/meta.json | 12 +-
.../Rifle/rifle_mag.rsi/inhand-left-mag.png | Bin 0 -> 270 bytes
.../rifle_mag.rsi/inhand-left-stripe.png | Bin 0 -> 144 bytes
.../Rifle/rifle_mag.rsi/inhand-right-mag.png | Bin 0 -> 283 bytes
.../rifle_mag.rsi/inhand-right-stripe.png | Bin 0 -> 145 bytes
.../Magazine/Rifle/rifle_mag.rsi/meta.json | 18 ++-
.../Shotgun/m12.rsi/inhand-left-mag.png | Bin 0 -> 305 bytes
.../Shotgun/m12.rsi/inhand-left-stripe.png | Bin 0 -> 142 bytes
.../Shotgun/m12.rsi/inhand-right-mag.png | Bin 0 -> 311 bytes
.../Shotgun/m12.rsi/inhand-right-stripe.png | Bin 0 -> 144 bytes
.../Magazine/Shotgun/m12.rsi/meta.json | 18 ++-
.../inhand-left.png | Bin 0 -> 346 bytes
.../inhand-right.png | Bin 0 -> 358 bytes
.../light_rifle_speed_loader.rsi/meta.json | 12 +-
.../inhand-left-ammo.png | Bin 0 -> 283 bytes
.../inhand-left-mag.png | Bin 0 -> 215 bytes
.../inhand-left-stripe.png | Bin 0 -> 160 bytes
.../inhand-right-ammo.png | Bin 0 -> 291 bytes
.../inhand-right-mag.png | Bin 0 -> 220 bytes
.../inhand-right-stripe.png | Bin 0 -> 160 bytes
.../Magnum/magnum_speed_loader.rsi/meta.json | 26 ++++-
.../pistol_speed_loader.rsi/inhand-left.png | Bin 0 -> 335 bytes
.../pistol_speed_loader.rsi/inhand-right.png | Bin 0 -> 340 bytes
.../Pistol/pistol_speed_loader.rsi/meta.json | 10 +-
85 files changed, 688 insertions(+), 28 deletions(-)
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/10x24.rsi/inhand-left.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/10x24.rsi/inhand-right.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/inhand-left-mag.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/inhand-left-stripe.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/inhand-right-mag.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/inhand-right-stripe.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/inhand-left-mag.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/inhand-left-stripe.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/inhand-right-mag.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/inhand-right-stripe.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/inhand-left-mag.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/inhand-left-stripe.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/inhand-right-mag.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/inhand-right-stripe.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Dart/darts.rsi/inhand-left.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Dart/darts.rsi/inhand-right.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/inhand-left.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/inhand-right.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/inhand-left-mag.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/inhand-left-stripe.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/inhand-right-mag.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/inhand-right-stripe.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/maxim.rsi/inhand-left.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/maxim.rsi/inhand-right.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/inhand-left-mag.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/inhand-left-stripe.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/inhand-right-mag.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/inhand-right-stripe.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/inhand-left-mag.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/inhand-left-stripe.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/inhand-right-mag.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/inhand-right-stripe.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/inhand-left-mag.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/inhand-left-stripe.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/inhand-right-mag.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/inhand-right-stripe.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/inhand-left-mag.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/inhand-left-stripe.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/inhand-right-mag.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/inhand-right-stripe.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/inhand-left.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/inhand-right.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/inhand-left-mag.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/inhand-left-stripe.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/inhand-right-mag.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/inhand-right-stripe.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/inhand-left-mag.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/inhand-left-stripe.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/inhand-right-mag.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/inhand-right-stripe.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/inhand-left.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/inhand-right.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/inhand-left-ammo.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/inhand-left-mag.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/inhand-left-stripe.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/inhand-right-ammo.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/inhand-right-mag.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/inhand-right-stripe.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/inhand-left.png
create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/inhand-right.png
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml
index c0af2b67e1..e3584701f0 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml
@@ -116,6 +116,12 @@
steps: 6
zeroVisible: false
- type: Appearance
+ - type: Item
+ inhandVisuals:
+ left:
+ - state: inhand-left-mag
+ right:
+ - state: inhand-right-mag
- type: entity
id: MagazinePistolCaselessRiflePractice
@@ -137,6 +143,16 @@
steps: 6
zeroVisible: false
- type: Appearance
+ - type: Item
+ inhandVisuals:
+ left:
+ - state: inhand-left-mag
+ - state: inhand-left-stripe
+ color: "#ea5800"
+ right:
+ - state: inhand-right-mag
+ - state: inhand-right-stripe
+ color: "#ea5800"
- type: entity
id: MagazineCaselessRifle
@@ -151,6 +167,16 @@
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
+ - type: Item
+ inhandVisuals:
+ left:
+ - state: inhand-left-mag
+ - state: inhand-left-stripe
+ color: "#9b0000"
+ right:
+ - state: inhand-right-mag
+ - state: inhand-right-stripe
+ color: "#9b0000"
- type: entity
id: MagazineCaselessRiflePractice
@@ -165,6 +191,16 @@
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
+ - type: Item
+ inhandVisuals:
+ left:
+ - state: inhand-left-mag
+ - state: inhand-left-stripe
+ color: "#ea5800"
+ right:
+ - state: inhand-right-mag
+ - state: inhand-right-stripe
+ color: "#ea5800"
- type: entity
id: MagazineCaselessRifleShort
@@ -180,6 +216,16 @@
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
+ - type: Item
+ inhandVisuals:
+ left:
+ - state: inhand-left-mag
+ - state: inhand-left-stripe
+ color: "#9b0000"
+ right:
+ - state: inhand-right-mag
+ - state: inhand-right-stripe
+ color: "#9b0000"
- type: entity
id: MagazineCaselessRifleShortPractice
@@ -195,3 +241,13 @@
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
+ - type: Item
+ inhandVisuals:
+ left:
+ - state: inhand-left-mag
+ - state: inhand-left-stripe
+ color: "#ea5800"
+ right:
+ - state: inhand-right-mag
+ - state: inhand-right-stripe
+ color: "#ea5800"
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
index 58fb5ae6a0..880cc4d773 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml
@@ -69,6 +69,16 @@
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
+ - type: Item
+ inhandVisuals:
+ left:
+ - state: inhand-left-mag
+ - state: inhand-left-stripe
+ color: "#9b0000"
+ right:
+ - state: inhand-right-mag
+ - state: inhand-right-stripe
+ color: "#9b0000"
- type: entity
id: MagazineLightRifleEmpty
@@ -85,6 +95,12 @@
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
+ - type: Item
+ inhandVisuals:
+ left:
+ - state: inhand-left-mag
+ right:
+ - state: inhand-right-mag
- type: entity
id: MagazineLightRiflePractice
@@ -100,6 +116,16 @@
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
+ - type: Item
+ inhandVisuals:
+ left:
+ - state: inhand-left-mag
+ - state: inhand-left-stripe
+ color: "#ea5800"
+ right:
+ - state: inhand-right-mag
+ - state: inhand-right-stripe
+ color: "#ea5800"
- type: entity
id: MagazineLightRifleUranium
@@ -115,6 +141,16 @@
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
+ - type: Item
+ inhandVisuals:
+ left:
+ - state: inhand-left-mag
+ - state: inhand-left-stripe
+ color: "#00cd42"
+ right:
+ - state: inhand-right-mag
+ - state: inhand-right-stripe
+ color: "#00cd42"
- type: entity
id: MagazineLightRifleIncendiary
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
index d94bc444a7..04f6ef741e 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
@@ -62,6 +62,12 @@
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
+ - type: Item
+ inhandVisuals:
+ left:
+ - state: inhand-left-mag
+ right:
+ - state: inhand-right-mag
- type: entity
id: MagazineMagnum
@@ -77,6 +83,16 @@
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
+ - type: Item
+ inhandVisuals:
+ left:
+ - state: inhand-left-mag
+ - state: inhand-left-stripe
+ color: "#9b0000"
+ right:
+ - state: inhand-right-mag
+ - state: inhand-right-stripe
+ color: "#9b0000"
- type: entity
id: MagazineMagnumPractice
@@ -92,6 +108,16 @@
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
+ - type: Item
+ inhandVisuals:
+ left:
+ - state: inhand-left-mag
+ - state: inhand-left-stripe
+ color: "#ea5800"
+ right:
+ - state: inhand-right-mag
+ - state: inhand-right-stripe
+ color: "#ea5800"
- type: entity
id: MagazineMagnumUranium
@@ -107,6 +133,16 @@
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
+ - type: Item
+ inhandVisuals:
+ left:
+ - state: inhand-left-mag
+ - state: inhand-left-stripe
+ color: "#00cd42"
+ right:
+ - state: inhand-right-mag
+ - state: inhand-right-stripe
+ color: "#00cd42"
- type: entity
id: MagazineMagnumAP
@@ -122,7 +158,16 @@
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
-
+ - type: Item
+ inhandVisuals:
+ left:
+ - state: inhand-left-mag
+ - state: inhand-left-stripe
+ color: "#540000"
+ right:
+ - state: inhand-right-mag
+ - state: inhand-right-stripe
+ color: "#540000"
- type: entity
id: MagazineMagnumSubMachineGunEmpty
@@ -138,6 +183,12 @@
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
+ - type: Item
+ inhandVisuals:
+ left:
+ - state: inhand-left-mag
+ right:
+ - state: inhand-right-mag
- type: entity
id: MagazineMagnumSubMachineGun
@@ -152,6 +203,16 @@
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
+ - type: Item
+ inhandVisuals:
+ left:
+ - state: inhand-left-mag
+ - state: inhand-left-stripe
+ color: "#9b0000"
+ right:
+ - state: inhand-right-mag
+ - state: inhand-right-stripe
+ color: "#9b0000"
- type: entity
id: MagazineMagnumSubMachineGunPractice
@@ -166,6 +227,16 @@
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
+ - type: Item
+ inhandVisuals:
+ left:
+ - state: inhand-left-mag
+ - state: inhand-left-stripe
+ color: "#ea5800"
+ right:
+ - state: inhand-right-mag
+ - state: inhand-right-stripe
+ color: "#ea5800"
- type: entity
id: MagazineMagnumSubMachineGunUranium
@@ -180,6 +251,16 @@
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
+ - type: Item
+ inhandVisuals:
+ left:
+ - state: inhand-left-mag
+ - state: inhand-left-stripe
+ color: "#00cd42"
+ right:
+ - state: inhand-right-mag
+ - state: inhand-right-stripe
+ color: "#00cd42"
- type: entity
id: MagazineMagnumSubMachineGunPiercing
@@ -194,3 +275,13 @@
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
+ - type: Item
+ inhandVisuals:
+ left:
+ - state: inhand-left-mag
+ - state: inhand-left-stripe
+ color: "#540000"
+ right:
+ - state: inhand-right-mag
+ - state: inhand-right-stripe
+ color: "#540000"
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
index 5e82be567f..0af1c92d12 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
@@ -152,6 +152,16 @@
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
+ - type: Item
+ inhandVisuals:
+ left:
+ - state: inhand-left-mag
+ - state: inhand-left-stripe
+ color: "#9b0000"
+ right:
+ - state: inhand-right-mag
+ - state: inhand-right-stripe
+ color: "#9b0000"
- type: entity
id: MagazinePistolEmpty
@@ -168,7 +178,12 @@
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
-
+ - type: Item
+ inhandVisuals:
+ left:
+ - state: inhand-left-mag
+ right:
+ - state: inhand-right-mag
- type: entity
id: MagazinePistolIncendiary
@@ -193,6 +208,16 @@
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
+ - type: Item
+ inhandVisuals:
+ left:
+ - state: inhand-left-mag
+ - state: inhand-left-stripe
+ color: "#ea5800"
+ right:
+ - state: inhand-right-mag
+ - state: inhand-right-stripe
+ color: "#ea5800"
- type: entity
id: MagazinePistolUranium
@@ -208,6 +233,16 @@
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
+ - type: Item
+ inhandVisuals:
+ left:
+ - state: inhand-left-mag
+ - state: inhand-left-stripe
+ color: "#00cd42"
+ right:
+ - state: inhand-right-mag
+ - state: inhand-right-stripe
+ color: "#00cd42"
- type: entity
id: MagazinePistolHighCapacityEmpty
@@ -223,6 +258,12 @@
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
+ - type: Item
+ inhandVisuals:
+ left:
+ - state: inhand-left-mag
+ right:
+ - state: inhand-right-mag
- type: entity
id: MagazinePistolHighCapacity
@@ -237,6 +278,16 @@
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
+ - type: Item
+ inhandVisuals:
+ left:
+ - state: inhand-left-mag
+ - state: inhand-left-stripe
+ color: "#9b0000"
+ right:
+ - state: inhand-right-mag
+ - state: inhand-right-stripe
+ color: "#9b0000"
- type: entity
id: MagazinePistolHighCapacityPractice
@@ -251,6 +302,16 @@
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
+ - type: Item
+ inhandVisuals:
+ left:
+ - state: inhand-left-mag
+ - state: inhand-left-stripe
+ color: "#ea5800"
+ right:
+ - state: inhand-right-mag
+ - state: inhand-right-stripe
+ color: "#ea5800"
- type: entity
id: MagazinePistolSubMachineGun
@@ -271,6 +332,16 @@
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
+ - type: Item
+ inhandVisuals:
+ left:
+ - state: inhand-left-mag
+ - state: inhand-left-stripe
+ color: "#9b0000"
+ right:
+ - state: inhand-right-mag
+ - state: inhand-right-stripe
+ color: "#9b0000"
- type: entity
id: MagazinePistolSubMachineGunEmpty
@@ -287,6 +358,12 @@
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
+ - type: Item
+ inhandVisuals:
+ left:
+ - state: inhand-left-mag
+ right:
+ - state: inhand-right-mag
- type: entity
id: MagazinePistolSubMachineGunPractice
@@ -302,6 +379,16 @@
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
+ - type: Item
+ inhandVisuals:
+ left:
+ - state: inhand-left-mag
+ - state: inhand-left-stripe
+ color: "#ea5800"
+ right:
+ - state: inhand-right-mag
+ - state: inhand-right-stripe
+ color: "#ea5800"
- type: entity
id: MagazinePistolSubMachineGunUranium
@@ -317,6 +404,16 @@
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
+ - type: Item
+ inhandVisuals:
+ left:
+ - state: inhand-left-mag
+ - state: inhand-left-stripe
+ color: "#00cd42"
+ right:
+ - state: inhand-right-mag
+ - state: inhand-right-stripe
+ color: "#00cd42"
- type: entity
parent: BaseMagazinePistolSubMachineGun
@@ -326,3 +423,10 @@
components:
- type: BallisticAmmoProvider
proto: CartridgePistolIncendiary
+ - type: Item
+ inhandVisuals:
+ left:
+ - state: inhand-left-mag
+ right:
+ - state: inhand-right-mag
+
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml
index d7a3571177..88f3df5388 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml
@@ -46,6 +46,16 @@
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
+ - type: Item
+ inhandVisuals:
+ left:
+ - state: inhand-left-mag
+ - state: inhand-left-stripe
+ color: "#9b0000"
+ right:
+ - state: inhand-right-mag
+ - state: inhand-right-stripe
+ color: "#9b0000"
- type: entity
id: MagazineRifleEmpty
@@ -61,6 +71,12 @@
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
+ - type: Item
+ inhandVisuals:
+ left:
+ - state: inhand-left-mag
+ right:
+ - state: inhand-right-mag
- type: entity
id: MagazineRifleIncendiary
@@ -83,6 +99,16 @@
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
+ - type: Item
+ inhandVisuals:
+ left:
+ - state: inhand-left-mag
+ - state: inhand-left-stripe
+ color: "#ea5800"
+ right:
+ - state: inhand-right-mag
+ - state: inhand-right-stripe
+ color: "#ea5800"
- type: entity
id: MagazineRifleUranium
@@ -97,3 +123,13 @@
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
+ - type: Item
+ inhandVisuals:
+ left:
+ - state: inhand-left-mag
+ - state: inhand-left-stripe
+ color: "#00cd42"
+ right:
+ - state: inhand-right-mag
+ - state: inhand-right-stripe
+ color: "#00cd42"
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml
index a27ed12304..d7defb78b8 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml
@@ -17,6 +17,15 @@
path: /Audio/Weapons/Guns/Cock/smg_cock.ogg
- type: Item
size: Small
+ inhandVisuals:
+ left:
+ - state: inhand-left-mag
+ - state: inhand-left-stripe
+ color: "#d73307"
+ right:
+ - state: inhand-right-mag
+ - state: inhand-right-stripe
+ color: "#d73307"
- type: ContainerContainer
containers:
ballistic-ammo: !type:Container
@@ -55,6 +64,16 @@
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
+ - type: Item
+ inhandVisuals:
+ left:
+ - state: inhand-left-mag
+ - state: inhand-left-stripe
+ color: "#ba7710"
+ right:
+ - state: inhand-right-mag
+ - state: inhand-right-stripe
+ color: "#ba7710"
- type: entity
id: MagazineShotgunBeanbag
@@ -69,6 +88,16 @@
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
+ - type: Item
+ inhandVisuals:
+ left:
+ - state: inhand-left-mag
+ - state: inhand-left-stripe
+ color: "#30722d"
+ right:
+ - state: inhand-right-mag
+ - state: inhand-right-stripe
+ color: "#30722d"
- type: entity
id: MagazineShotgunSlug
@@ -83,6 +112,16 @@
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
+ - type: Item
+ inhandVisuals:
+ left:
+ - state: inhand-left-mag
+ - state: inhand-left-stripe
+ color: "#72382d"
+ right:
+ - state: inhand-right-mag
+ - state: inhand-right-stripe
+ color: "#72382d"
- type: entity
id: MagazineShotgunIncendiary
@@ -97,3 +136,13 @@
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
+ - type: Item
+ inhandVisuals:
+ left:
+ - state: inhand-left-mag
+ - state: inhand-left-stripe
+ color: "#72382d"
+ right:
+ - state: inhand-right-mag
+ - state: inhand-right-stripe
+ color: "#72382d"
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml
index 9976c88314..58ba6326c1 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml
@@ -39,6 +39,14 @@
steps: 7
zeroVisible: false
- type: Appearance
+ - type: Item
+ inhandVisuals:
+ left:
+ - state: inhand-left-mag
+ - state: inhand-left-ammo
+ right:
+ - state: inhand-right-mag
+ - state: inhand-right-ammo
- type: entity
id: SpeedLoaderMagnumEmpty
@@ -58,6 +66,12 @@
# use the one it was printed for.
- state: base-6
map: [ "enum.GunVisualLayers.Mag" ]
+ - type: Item
+ inhandVisuals:
+ left:
+ - state: inhand-left-mag
+ right:
+ - state: inhand-right-mag
- type: entity
id: SpeedLoaderMagnumIncendiary
@@ -88,6 +102,18 @@
steps: 7
zeroVisible: false
- type: Appearance
+ - type: Item
+ inhandVisuals:
+ left:
+ - state: inhand-left-mag
+ - state: inhand-left-ammo
+ - state: inhand-left-stripe
+ color: "#ea5800"
+ right:
+ - state: inhand-right-mag
+ - state: inhand-right-ammo
+ - state: inhand-right-stripe
+ color: "#ea5800"
- type: entity
id: SpeedLoaderMagnumAP
@@ -109,6 +135,18 @@
steps: 7
zeroVisible: false
- type: Appearance
+ - type: Item
+ inhandVisuals:
+ left:
+ - state: inhand-left-mag
+ - state: inhand-left-ammo
+ - state: inhand-left-stripe
+ color: "#540000"
+ right:
+ - state: inhand-right-mag
+ - state: inhand-right-ammo
+ - state: inhand-right-stripe
+ color: "#540000"
- type: entity
id: SpeedLoaderMagnumUranium
@@ -130,3 +168,15 @@
steps: 7
zeroVisible: false
- type: Appearance
+ - type: Item
+ inhandVisuals:
+ left:
+ - state: inhand-left-mag
+ - state: inhand-left-ammo
+ - state: inhand-left-stripe
+ color: "#00cd42"
+ right:
+ - state: inhand-right-mag
+ - state: inhand-right-ammo
+ - state: inhand-right-stripe
+ color: "#00cd42"
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/10x24.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/10x24.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..9179b83fa2eda26b00afb78b6065ed733f7a99a9
GIT binary patch
literal 353
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zr9E97Ln`LH
zy|vNnaDu>rkE<*`kX$Cnz`AAK)3
z-)EVEpV9P8qg;o$C0a^F8g^Z6MdiC+UFm)P^39XJr>?7}KlHj6ci;8N<{!18*R<{#
z-P2qqY_RLy$!Cc<)7F&QlvhrCRbpr;9sRljViyC$0e5M$!%Dn5?)BE6*(!3{{P#W<
z-M!7?WQke)E;R}DnNcPOpK@2|8}m=TIxYWMl3Dz!>laP^C~
u&XskMum65~_TTStiQz@HbD2PM?|)*PDjZsoztp)EWS6I_pUXO@geCwNAeL-|#7AiH_CU2C>xlV8?zzPm@uKd`=%?%;o*
z64NeJl9{|key`^L`?F#`J-wrHx|0QHJOe{Re&UUi+4BzGI=8C%cW?7r{=`g%?dAM_
ztKvBdFRe6reTiY6o_>=?mSh`*)TUq9
zG1YPRGzOjW6Thcf@yuSAr5YPL>uK8cAK!%oLY^P>i`3xq*FWlcd}-vn`-?N5ra#`r
zYrg;cbl22s
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/10x24.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/10x24.rsi/meta.json
index ae6061f323..2f89a1e026 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/10x24.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/10x24.rsi/meta.json
@@ -5,7 +5,7 @@
"y": 32
},
"license": "CC-BY-SA-3.0",
- "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi",
+ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi, inhands by TiniestShark",
"states": [
{
"name": "base"
@@ -30,6 +30,14 @@
},
{
"name": "mag-7"
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
}
]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/inhand-left-mag.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/inhand-left-mag.png
new file mode 100644
index 0000000000000000000000000000000000000000..8f14f7108e876e247b37f09e03cc836fca034d90
GIT binary patch
literal 196
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|>O5T>Ln`LH
zy?KzA$&iQTfUvqk5|X(U<$Dd}vbln80mm7<}N=z4vnLK*bC`lV?7@Zoa43+IY`a
zGu_pzw&{P?RB{XL?fCKQMTf*pOV#X^Guh+cRf5zqF#He>pK(;)Z|3pzbC1^NM1NUj
py8ZjUct-8zIh%hjWMN>iD`nr8ByJfvA-(~m+|$+1Wt~$(698Y>MuPwV
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/inhand-left-stripe.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/inhand-left-stripe.png
new file mode 100644
index 0000000000000000000000000000000000000000..04d5b14613de9064a5fe98a2c334b71ad65c6983
GIT binary patch
literal 128
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|tUO&DLn`LH
zy?KxmsEXO~cfQrP0(K>%UR1H<%M#=2;M1&
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/inhand-right-stripe.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/inhand-right-stripe.png
new file mode 100644
index 0000000000000000000000000000000000000000..0040782096bcfd1f373b10175931b88a341fbdd0
GIT binary patch
literal 133
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|>^)r^Ln`LH
zy}6N>L4k+);G6whUaoX-66oB`d2j1#paKR4HP27G60dK3w*ELXn9p#a_HEw#GDil6
a4LJI)606$^lJRu)b6Mw<&;$Uk7%EW!
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/meta.json
index 296090da5d..cf0bdc58af 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/meta.json
@@ -5,7 +5,7 @@
"y": 32
},
"license": "CC-BY-SA-3.0",
- "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334",
+ "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, inhands by TiniestShark (github)",
"states": [
{
"name": "base"
@@ -36,6 +36,22 @@
},
{
"name": "mag-5"
+ },
+ {
+ "name": "inhand-left-mag",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left-stripe",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right-mag",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right-stripe",
+ "directions": 4
}
]
}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/inhand-left-mag.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/inhand-left-mag.png
new file mode 100644
index 0000000000000000000000000000000000000000..5d6f6c492d852f0442120238c2b9208b11e60c1a
GIT binary patch
literal 318
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|et5b#hE&XX
zdut)rp#YI%9~b{%NQ$1=7%5>SC?+;N{2Lp0SnY(!?>cVHuFVNzZAaDi9W*_`+MW6Q
zK->TL$lns>&o_OL6$Bc@z|b)5)1s2fz+D+LE#JnRwaH&0J40=w$=TSr^X*mZSidq0
z2yz}?S@o=Jv)qdIsLp9KxzmfMPUKB5{`&gMT5;h7!$7rFv2RWG?|Z&{!L6%llNYGz
zdrfBE@QWL4IGCtEw50g^-3JvyC!TJ3U$QI#lK17OFvsX?~R(v2n>$)J&d2F9lb;*D#?Qk_H^}g
JS?83{1OWQAgFgTO
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/inhand-left-stripe.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/inhand-left-stripe.png
new file mode 100644
index 0000000000000000000000000000000000000000..90827282bafeca8fd743d09ce0a70c7342aacc95
GIT binary patch
literal 126
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|EIeHtLn`LH
zy|q!0!GMF=@LRmpEFS@jJ}0RM+}Hbn3K$r6ecE}A3Cv<(ka&1z!3q5eT`0c&Z=8&!!Db(&hAUh__vEwWPQ(yP{t?1|PM$+?+{i(M5;6EaXg&kOAK{~&zMJ;}(cY42MysCH*lbDIeploC
z^;f0y`}|AYLW|{W7(9)Zm4?jlmf*W5H%H9GF=MgC&dzW8E`>?H0@F^_l*=kqo`^0v
zm|?T?m7hef`nFSVr>8Z2SQf|loE>Zjn0TPGr>5fHs<}}MIKuKxzV4i}Q`S%8n}P1r
zNnidx-BY&mXG86xGWV};mw)pde0_RzP0jiFCCT;7XT`OB?eFa^0h#gO9)II1`(@=v
RKE45QJzf1=);T3K0RV%ihZ+C?
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/inhand-right-stripe.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/inhand-right-stripe.png
new file mode 100644
index 0000000000000000000000000000000000000000..c762e9a79f342605b40a1f425054f24145d1db7f
GIT binary patch
literal 133
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|>^)r^Ln`LH
zy|q!0K|qA{;Pv{;EG#K5^Jm`WTG!wWRKU;>I(wCM-k%#hAPx{rNa^9f$~*gc69dD8
Z2=?0(#9uPyEz<|dc)I$ztaD0e0sst(Ch!0N
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/meta.json
index 71fb04b7f3..3cf2583ec8 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/meta.json
@@ -5,7 +5,7 @@
"y": 32
},
"license": "CC-BY-SA-3.0",
- "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi",
+ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi, inhands by TiniestShark (github)",
"states": [
{
"name": "base"
@@ -18,6 +18,22 @@
},
{
"name": "mag-1"
+ },
+ {
+ "name": "inhand-left-mag",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left-stripe",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right-mag",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right-stripe",
+ "directions": 4
}
]
}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/inhand-left-mag.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/inhand-left-mag.png
new file mode 100644
index 0000000000000000000000000000000000000000..ea1d7dcd79b00c24640eb355f29bdf0c77e5ea54
GIT binary patch
literal 305
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|UVFMYhE&XX
zdrS9}lcU7ZkBeul5#w$0_0eLJ+;Q*)lZ%8vOoL}k`$g6nI`5h8v2r98b2c4~?QwJy
zU^!gNw*TLL);YfmW|Z}_0L=n|C);Ay9o7j9ED|wNL%C
zO6oM7!_!umPFTk}r!W2Ow%JXt>rVfzYp2d@6L=ZEEn7
zdv1zCV1CHeH>JTY_f4u}uS#FNWBH8rh^qVj(lv|UANjNAwBTe`_a{d3Zgm=-QD>Gd
vyV-xl_0;`m_j7tDMccfJ-p|g!u*b2!GMS9z?=PBViyKT3GI+}_>wOQRKV~-%hN2SZtFS&5C;ejtbLb!%t+<3&>u(C25m7x?
z?hX5%q=)BKBG&t)ycAs%zUf1HSXzB4L#%Z2;%RA@zPxz0yfX8TT95tR6_0$%53b66
zDCzyhWvlLd1C^L@++;se2{()sFc^GtUw
fa_eJfxbcQz_9N-1V%L|JfaE+~{an^LB{Ts5WFIUk
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/meta.json
index 71fb04b7f3..3cf2583ec8 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/meta.json
@@ -5,7 +5,7 @@
"y": 32
},
"license": "CC-BY-SA-3.0",
- "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi",
+ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi, inhands by TiniestShark (github)",
"states": [
{
"name": "base"
@@ -18,6 +18,22 @@
},
{
"name": "mag-1"
+ },
+ {
+ "name": "inhand-left-mag",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left-stripe",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right-mag",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right-stripe",
+ "directions": 4
}
]
}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Dart/darts.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Dart/darts.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..774a92f0cdc97af5a74a3cb6685af93c4b9322ce
GIT binary patch
literal 441
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%yJzX3_D(1Ys
zW$4XRC~^Gb{F#bXoP3I6S7&%TJ4>kSYh2)aDDqa;#iP?7Eb7j?6!V~)L*?MfrfL5J
ziykagzawx%)A5Mu6mfRnpIffH-+Y(%K6_vKZgvGF2oMU;nR>Ts@k_5QuX>k7>r8cx
zx*s{M=k2@HJ0V%@znU3~Q@TxV&(%u{X5U$JFx2b#-?zRFDt|IPjm%D`Tzu^WICU?u0
zzqZx?B_8$1DJ8p@dGpH0dyRQ+c5@zn@%xwiarJixWd8jqa`|G%z;Gqv@ZHD8S0bEM
zRxJ!$+mRQ!Hj2|_(X9M)N-p*dxxEb~Ob7qwD$H#N+Ldx|@sxM7lcN{M&vXX4p#G+{
Y#@DignUgo|1I7h|r>mdKI;Vst08_@i4gdfE
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Dart/darts.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Dart/darts.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..c6dc9eafb2e2d4652f56b4f1796a530977b4508b
GIT binary patch
literal 464
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zyF6VSLn`LH
zy=CvsR4Bvt;rJPWy)5kl-C1Xr9#rHJy6tv|>=$U&7uh!d
z9P7RSi8@8D2kP4egM}|l{>{N4arOP1<;4e=)OD|YVOI5N)noyv^T5=__{{}373ZFO
z<=b=Rq~SU}eHrb5kX5E@FXp_wp7#GoRN^jqgZDtkeJd+Bn7iVat>>m2eg+DjcW3_f
zKYwoPygTJvmL}~|{3Knd@!;cA-bVor3K|Pyw5)!$o?5y{T|gx5T;Z&@;s!x%4oXb#
zFWOD$a1gQfdv>WaDgD`;iAE8pEM0)$%l#V0Y29T9o6p#K1EYw+)78&qol`;+0D_3i
A?EnA(
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Dart/darts.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Dart/darts.rsi/meta.json
index 36cca70899..4e74806f27 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Dart/darts.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Dart/darts.rsi/meta.json
@@ -5,7 +5,7 @@
"y": 32
},
"license": "CC-BY-SA-3.0",
- "copyright": "https://github.com/discordia-space/CEV-Eris/raw/831c7c2743530e8a31910d781bae9dc34f3f1ec8/icons/obj/ammo_mags.dmi",
+ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/831c7c2743530e8a31910d781bae9dc34f3f1ec8/icons/obj/ammo_mags.dmi, inhands by TiniestShark",
"states": [
{
"name": "base"
@@ -24,6 +24,14 @@
},
{
"name": "mag-unshaded-5"
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
}
]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..1454d3c5f6e4e02918442d923f144840da8892b0
GIT binary patch
literal 390
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z9XwqeLn`LH
zy`}Ge*g@vl$8?rM4@w`-bO=#6ks`|EyzI5W3QrLxL&po=7xr+5u%<1F{2#M^NqdA9
z+svC)%fJ2oVORcr$?|vVj6j2dfIanr@ta={ui4(Wxh;t{#Cs;sH;W#@s%&b?ut1
zSz5cp{emMSv#&=^|8DN+^p&`QPdr?>>BfnX~?Wx!qjeT|!Quq8c=N*KF0=wCDOm
z>sU_LY3%w;5Z3_71Me28lm!a0S6`YIwwc2&uBX2?=h=QOediR4a3_W9O^vu8yj-x*h}p1e8O^RL(UI@T_o>qfCJ9>2A{5!0`td%1Pi
gs&7TSK*JM%G0rTQw}wCW=qHekp00i_>zopr0Bydiy#N3J
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..a39f11055a13608844272d8fbe2b66f2f7dc82f1
GIT binary patch
literal 410
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zLp)s^Ln`LH
zy|q5?kb?~Shy3Zir8bA<*!h!~8Wm1x9pPEI&e}tk9wO@DFaU0$?+lO27DLV|I{!ous~0|C+4~4L4`Oa#m3o={NU1w?cKGMs
z?T43tX;Rnyd?<9<dRGQVjOn)7uC(!>bkP+!K^lN*FnF9Wod)F1YMAxcK;xtagNclFbXp8G(lX!w=j}ZMbZc
z4Acw+2L8d@_vvWOU%GSpxv6J@ml`tYX7>g>x4Qg&uSb}S>Z-#cvJR0UKowI@XFbhZ
z(ll$=*TV%n_y4{8bH}6;d!On&DmRLp_1nTLL~r#}ZitZ}a&qk|8O6fB8&x$+wjQrn
zQ1f-=M4`j_68mkQTWz*~^Y7Wtdz)6MNis0}*rna`
V!}S37q{c>&NuI8LF6*2UngH%-ap(X5
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/inhand-left-stripe.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/inhand-left-stripe.png
new file mode 100644
index 0000000000000000000000000000000000000000..20c98c30051ed0bf6eb2471926ea25bf8384c764
GIT binary patch
literal 134
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%~c)B=-RLpsM
zYa=g%0SB|=l)vSCzGe#;7VYMYTPMp1RKbw?{pGtKO@?4L14BdMwz-mi5immvv4FO#l-BCr$tW
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/inhand-right-mag.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/inhand-right-mag.png
new file mode 100644
index 0000000000000000000000000000000000000000..e2f62646e7c48ea70cd231cc179cd85d63e9ae16
GIT binary patch
literal 293
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|?t8j8hE&XX
zd&`%r*+8J};l`5n>?=--RdKVfUs%ET)oZEklm*^%i)8gKnSDO7rJLr$fvJo8Nw|${==C
z-`AQ0GYt0ZIFT5d-ubg7lJ`e#m0tHLmd5vH7dsR_q;^JaZsP#jcDU0%o_{+thx^9w
doPt38(fM!9oqwq29dZR3=IQF^vd$@?2>`fubcFx_
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/inhand-right-stripe.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/inhand-right-stripe.png
new file mode 100644
index 0000000000000000000000000000000000000000..25cac18d8ad598fde5e8e655df22cf43914aa860
GIT binary patch
literal 133
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|>^)r^Ln`LH
zy=BP7puod?;L`v9k>b<)f?T-Ds}&}g3Idfd1gv>n&aWrI3t|I-#OtFk6|EEXc^DX;
Y-TEXZ{`wok6=RTur>mdKI;Vst0I0!lx1OS
z$;F$dD&8K`UMp}qvbNu8@i=d;D&Y6&UA6w{S_VM~xY%a6rRmqz&cJovJv^Vdf~p2Gq2SME&Bc4rFEIk5U|
zLVCHsww_@A+92@*-(y0u)t*i3)!><=TX=czi9JG#3>X-IVrq}qWZJL%!^~EGz3u%@
z3yVAL?{_kku+2YLSyy$j<8=J$yA$`%*YaOCD{Qy&(*GVx2oPi%ZKb62f0_M)OH$sO
zmvKj|-dgr%y^Bkl_wt&f@A%zY*D&=ST)m#*!Rp1cziSByUbN_#=*?JjKGa_6^W3db
z>T5siT;aa(_OAFQb!pMdA8gG(|Gwhaapc~8I|E7kCsx0ghNrBqNsj(x)9>KoGUcXv
Y9%I*H9*HmafziO=>FVdQ&MBb@03-*whyVZp
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/maxim.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/maxim.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..59e3fd30a37ce8db2d7454bcaa00982400a30f6f
GIT binary patch
literal 437
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z^F3W0Ln`LH
zy=9nvC_seu!Q@Nv7kADz;&}98enC;$+6QWUw^mwp%ytg1cbM*EF3$O5frkK(innz+
z?@6UycleHOo3?GAyN}O{pJora)b*!tpTpn+1^;`N8k@xbTr}tC@%MhK7k=FzEYYW)
zH0ixh`is|xnGd{u;m1?_^xDpI0n4v$aB-O;o?upb>D-hPlZ$$vZ8c+Hm?G|A$*mK6
z-y-B%+v8528@6M#;-I3Yn(Bv!kBn!_40qSzpr>_4b7nUwh@NdCE~h5Do$hJ3G#V|GQ|-`L^hb
z`sbU#|@xb8e>gTe~DWM4ffkDHM
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/maxim.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/maxim.rsi/meta.json
index 2f72b6e9dd..eb84050ce4 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/maxim.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/maxim.rsi/meta.json
@@ -5,13 +5,21 @@
"y": 32
},
"license": "CC-BY-SA-3.0",
- "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi",
+ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi, inhands by TiniestShark",
"states": [
{
"name": "base"
},
{
"name": "mag-1"
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
}
]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/inhand-left-mag.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/inhand-left-mag.png
new file mode 100644
index 0000000000000000000000000000000000000000..14b249508d200ceaacdd67b67115e195f71d5bb7
GIT binary patch
literal 228
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|=6Sj}hE&XX
zdvl}UAp;)PfP)(&rd@QKrEa|BoWU|KR@OVJWetz_GX6U`X}3HhP(4FzNa*P^-(FhY
z+u6qzH%;|gsqLKLP+g^@SmdKI;Vst08KGq9smFU
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/inhand-left-stripe.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/inhand-left-stripe.png
new file mode 100644
index 0000000000000000000000000000000000000000..f7582688595aba1215890b7194f11ca9970a0811
GIT binary patch
literal 125
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|%spKkLn`LH
zy=BPDz`()m_-D4BoQDEWIaA$>J6b?_28OgrPm*6x5d^at7#eu%SQr?XdEeIxzYS=7
Q`U52F>FVdQ&MBb@03*vFk^lez
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/inhand-right-mag.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/inhand-right-mag.png
new file mode 100644
index 0000000000000000000000000000000000000000..6718d70e49315e7dcc48605fe806842d76fe0174
GIT binary patch
literal 244
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|)_J-(hE&XX
zdvh=EVFihnhs9GuSIlfo&6v?%Iiqn_qDN}^#tBRk$KPL8vXiyH>j~5W1P2aQ$0zrE
zeI=v3_nerw<|)hbr!KV?uk#Ap-d=nz^!?wpbqD9|d@8iB!6TuRYdH>N$M-@kGynY+9k1H%LP8ipsgoi4H8ycbg0akg?GE)Y!nw3nHo<{g7v
Ww(#4ze-!V6#5`U7T-G@yGywpXcO~Wk
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/meta.json
index b766264c79..9916225771 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/meta.json
@@ -5,7 +5,7 @@
"y": 32
},
"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",
+ "copyright": "https://github.com/shiptest-ss13/Shiptest/commit/662c08272acd7be79531550919f56f846726eabb , https://github.com/shiptest-ss13/Shiptest/blob/master/icons/obj/ammo.dmi, inhands by TiniestShark (github)",
"states": [
{
"name": "base"
@@ -24,6 +24,22 @@
},
{
"name": "mag-1"
+ },
+ {
+ "name": "inhand-left-mag",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left-stripe",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right-mag",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right-stripe",
+ "directions": 4
}
]
}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/inhand-left-mag.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/inhand-left-mag.png
new file mode 100644
index 0000000000000000000000000000000000000000..15d648c1ad2a9dcfca2ee6a4cff856ad81db6b0a
GIT binary patch
literal 244
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|)_J-(hE&XX
zdut=_VFdxVhuB81qcn7VHU>Xz=wEbY0Xj`^Ry|PrunJ%x)~QJOk7L1Pg+_B(1ll
zofi$<{GEIE?lsGE&Q8m1*d6V1qUzMOHw*dd_SLvVto>SIZ`{7>Yp=`j?|7
z%Z8m2gO~s$H=I~ix$l>x_p!&Xb~C!)`TIpp=O)9~yA8^MiF?2ARXaY@GSBwv-{+6k
kTa<4reZ8NLf#HF;e)~()b7J%7a)3!GMQp!=L{qe-)jhIe#;#M9gFaDqu)Z_pCd!>l6ow4Fn<;m6_r9UtWF6$Y92o
WvQ+vhf4q}rJoZI>C
vX#0L;CDj@>|x`v1y%!--Q%`x(wd2=Ja|^ncJtR2Qtai)z4*}Q$iB}U(;d0
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/inhand-right-stripe.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/inhand-right-stripe.png
new file mode 100644
index 0000000000000000000000000000000000000000..8841f5867f50cf6c2badfc5a2f3b63679c01af38
GIT binary patch
literal 135
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|96eneLn`LH
zy?Kz6L4k+m;FtSfZZ^mVc1)Pbw&}Z{C{P6hL$&9ny9KWzKfm}0<}xt&T>6{$Zr^`@
c76yjzVwZxYpKeepwgt&~y85}Sb4q9e05rcW2mk;8
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/meta.json
index aa11185ac3..d760950257 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/meta.json
@@ -5,7 +5,7 @@
"y": 32
},
"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",
+ "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi, inhands by TiniestShark (github)",
"states": [
{
"name": "base"
@@ -36,7 +36,22 @@
},
{
"name": "mag-5"
-
+ },
+ {
+ "name": "inhand-left-mag",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left-stripe",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right-mag",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right-stripe",
+ "directions": 4
}
]
}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/inhand-left-mag.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/inhand-left-mag.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac7862f9ca4fbc0c2a2f9314ec134e9f2eaad886
GIT binary patch
literal 230
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|7I?ZihE&XX
zd+T85VFQ7-z}y=`%NV9UW2yHfyj
zFEa#l-N1-F0SL?#BP7H<>_s
z85lmL-Ti#|ujccQUv4)Thl)lX%1@f%|8hHHdfNB>X2))>D~;Kzco0{an^LB{Ts5I?rQO
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/inhand-left-stripe.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/inhand-left-stripe.png
new file mode 100644
index 0000000000000000000000000000000000000000..7edafd914ca3dda7a970f0eee1319281cf434556
GIT binary patch
literal 131
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|Y&~5ZLn`LH
zy|s~-!GMQp!=L{qe;4-7;`zqfA-W1E&%hw3aez97FwPz2-E}we~w7p
zzANe0n^yOoFZ63+|AJM{pXc98ANKewa{zK3~Dj9UFdDCkRf8lQVf|gZ&_mv~c{12YF6>7R=
px4Cij>QDQ2H820n&cJY>a$jh+`DzR6l${`RJYD@<);T3K0RSSkV>|!=
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/inhand-right-stripe.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/inhand-right-stripe.png
new file mode 100644
index 0000000000000000000000000000000000000000..fa1666307ef4d053c8b61e39242d95a810b484f1
GIT binary patch
literal 132
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|>^xl@Ln`LH
zy?KzAL4k*Pk39GU$aB|%&uQ2X`w;O{?-3>D8A
X*t3M+o;ksl2om;m^>bP0l+XkK6_qFC
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/meta.json
index 1aed17caca..9bc9d85529 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/meta.json
@@ -5,7 +5,7 @@
"y": 32
},
"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",
+ "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi, inhands by TiniestShark (github)",
"states": [
{
"name": "base"
@@ -39,7 +39,22 @@
},
{
"name": "mag-5"
-
+ },
+ {
+ "name": "inhand-left-mag",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left-stripe",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right-mag",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right-stripe",
+ "directions": 4
}
]
}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/inhand-left-mag.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/inhand-left-mag.png
new file mode 100644
index 0000000000000000000000000000000000000000..6fba0bbe06209cd4baa8d5c43c3b41cacda278d6
GIT binary patch
literal 311
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|K6<)1hE&XX
zduwCv5d)sqL{;MgHr)e^A(HbNH)pZsC$0F%;G=qAhmxz)-HQkQ^Ew2d4|1Kx1k}jD
zpfq#l?3wku`tR4Q*UCw=JEpPs`y|_zg0-gMq2d!aNPpNN;CduFJJEM_)<1@KzHahy
zE=BAMR>ft1ePM5(?RK^Lt7v4-y@tmY|6;>K|L$66bWG!UW!tx(602VISNsOs03!T1
z
zUMte`-Shav_xz4~4^v+5)oA{#3cw=n4##590O@ww1LAe@g!bGThVE&t;ucLK6U6
C$AESK
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/inhand-left-stripe.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/inhand-left-stripe.png
new file mode 100644
index 0000000000000000000000000000000000000000..9875aa44895287b5eeeb256d3d67382b318aa6fe
GIT binary patch
literal 140
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|+&o*b2!GMGLz`Ok=zh1H^wH&(3VEE%|F;E2q1KXq}cNglN54+}e?z)*c$ZQaJlX3sk
f?a$dZKs$uR4+g2p?8D
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/inhand-right-mag.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/inhand-right-mag.png
new file mode 100644
index 0000000000000000000000000000000000000000..b101a1a033edc2f9be300ce6b3eed3ef4874b2ae
GIT binary patch
literal 302
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|UU<4VhE&XX
zduyX$vjLAopsFqJa>+dnYy~HIW=)lhXce7us$4|x#8I}IpX;AEOiL;CU;*l4U=VpH
z_fD?-`NiA2zg@VS92YjQqH_yZ9Tw47N=nQ9Y6dqugKc2R`T=d-L9FX+WRWLENWX7x5?@A3ALEenvWf^
us>a<@f?{I-eEhTe{2H~79WFpa>OL_3jnBKJ_>ol!WUi;HpUXO@geCyJUVnQ4
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/inhand-right-stripe.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/inhand-right-stripe.png
new file mode 100644
index 0000000000000000000000000000000000000000..48812502a51bce5709cb06bfd6709fe7a1de086b
GIT binary patch
literal 145
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|yggkULn`LH
zy?K!HfPnzB)qo1--^&-hra
zvC^M9^W?u8H#vwAU}H2_pWVp)PHyA3AIF8_o_4+|-}mfYV%o~)m9sU9l6$VGzFB3t
f$gP-#fkDHDkw?z^c>3!UH;_h8S3j3^P6BnWb&qzw&h2M*rLLbMw{%9?>m@u3FDwmketYCY{py2tLUQvtfck*I
z?48{6heDSvj^B&)n)1xH*7}6y>Bp7RZ+{J~c{%UjEc2xzX<{3fef*v
z7pw(jcxx!cH1sm_3+(s
hnSZ@zK$fY^k`}oN<@&`d0Jzf1=);T3K0RVA?V^078
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/meta.json
index cfc60ae1e0..ead6df3a37 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/meta.json
@@ -5,7 +5,7 @@
"y": 32
},
"license": "CC-BY-SA-3.0",
- "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi",
+ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi, inhands by TiniestShark (github)",
"states": [
{
"name": "base"
@@ -24,6 +24,14 @@
},
{
"name": "mag-unshaded-5"
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
}
]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/inhand-left-mag.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/inhand-left-mag.png
new file mode 100644
index 0000000000000000000000000000000000000000..c81e69b22942c0bd64eba905f099c77e1a77972f
GIT binary patch
literal 270
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|PI$UFhE&XX
zdut=tAp;S&htYzy3`@&`T7q_2amdQl{8twcbXmDg?5?!vBL&&6$zR@=?NhzYsdBUE
zEKoBLT=1QBq;B`gnpsEU?uLGoVlFM%ZqM>6ZT{VbRy$(O)V`f#`F+aQw1-DNWoQ0e
zIzhha59^+L>#wbP_0_eG;pbA0tc!2Wv%bH1`i&7{9Eglv;;A!V;AJ-d&+ir6;(lt(
zi4yU<`cmww+$YY7(O)-wtXOjHpT_FlGi%j7`j#7SW(I2cahW}PjeTMA!4nffCV0B~
KxvXPyz+WGeW7j`Kz>3P98hwXL9lZA7Z+Y-mdKI;Vst018@gfB*mh
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/inhand-right-stripe.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/inhand-right-stripe.png
new file mode 100644
index 0000000000000000000000000000000000000000..31f747ba362458b2998d5eba78f53f1c0b33e2f6
GIT binary patch
literal 145
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|yggkULn`LH
zy`{)^z<`I@AwB5d|N9eodBu54_8tz?kyK{{Dte%^mFvuzxhi+(u8MjF5&(g^=d}xN
lY<>Rg(F?ymc?O1tVA~DK+z-BQ@kjv4db;|#taD0e0sw)DF24W(
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/meta.json
index b31e570fab..2a9924621d 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/meta.json
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "All sprites by https://github.com/august-sun.",
+ "copyright": "All sprites by https://github.com/august-sun, inhands by TiniestShark (github)",
"size": {
"x": 32,
"y": 32
@@ -24,6 +24,22 @@
},
{
"name": "mag-1"
+ },
+ {
+ "name": "inhand-left-mag",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left-stripe",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right-mag",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right-stripe",
+ "directions": 4
}
]
}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/inhand-left-mag.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/inhand-left-mag.png
new file mode 100644
index 0000000000000000000000000000000000000000..248486fa6e82705a1e6fc7d0228223335d7a27a3
GIT binary patch
literal 305
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|UVFMYhE&XX
zduwCn5d(>%AIo3zXE!)py77Q9XHP?z$E-ICOr4Dm9E?qFW}mQ=v1IDQJ8I_@IseBm
ze&=bk&u=~p&#pG8(WKearg
zK3z52^nEAT3NX=df62<*o4)U_yU#mKzxZ`mkILSCdqh3GG;eNq3G=->ZOWx*`_^w-
wKljVsfTB1Nr=|VpzsFvSs{14d)cq&i{I6ZulnL*@JO!EM>FVdQ&MBb@0G+0SumAu6
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/inhand-left-stripe.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/inhand-left-stripe.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ff0b2222fb8e1eb16e3d6721edd3d45a1394ccf
GIT binary patch
literal 142
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|JUm?-Ln`LH
zy>*b6L6L{q;K;YPmr~jJWEI{pF4B0v1*DB(zKhG-cN;=OV@)06WoOJ>t;`4#1%h**
hzPmpA>CMN$FqzFsg*W@`0iD?(aZgu2mvv4FO#q#3Dm(xH
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/inhand-right-mag.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/inhand-right-mag.png
new file mode 100644
index 0000000000000000000000000000000000000000..a022bff12ec494e2de7058107fba0f461fab65dd
GIT binary patch
literal 311
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|K6<)1hE&XX
zd&@EFuz^79!|CsuOBi&;x;9TaZfc))z(3B##d-3c?V_4@wL
zH=fPN+kZ1t1!x8XLxZ&w$Ipw#QzERM2YUtwZ{PWz&9rp)Pk~=~5m)S`8#dd8KhyAB
zbtdrKFW>fpeRKG{f2A`UEDO5NJ9!uT(%V+j4ql7n;^wQDo}Tm7vSotz^Etc^YAj`s
zl}uIXeYvaRs9d6cF%#G#5OJW+;`QfS)0KViKHJJ?+~t?@uCo63iAf^KF>i~GM9xp{
znf$%(a{s>zvv-}<>@`|;>H7EQS^q!Qf8_(}{Wn=UBrt4>tl7u)Afr58{an^LB{Ts5
DcJ+jk
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/inhand-right-stripe.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/inhand-right-stripe.png
new file mode 100644
index 0000000000000000000000000000000000000000..488d7d1bee45c31a497abdfc0e60fa54db24466d
GIT binary patch
literal 144
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|ygXeTLn`LH
zy=BOEK!JzZ;mUpW`F!#T2@94s?Y`Ok^yXSdprQi-E?3_1MTcIU$ZWIu;F+4u>_9;f
lIAC8}JA3E9Wy}l*oMb;G^Ja6jg)Ra~c)I$ztaD0e0syL6E=d3Y
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/meta.json
index ca09e4892e..eaa0f484ad 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/meta.json
@@ -5,7 +5,7 @@
"y": 32
},
"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",
+ "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi, inhands by TiniestShark (github)",
"states": [
{
"name": "base"
@@ -21,6 +21,22 @@
},
{
"name": "mag-1"
+ },
+ {
+ "name": "inhand-left-mag",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left-stripe",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right-mag",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right-stripe",
+ "directions": 4
}
]
}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..f2b86304155d955734c26bea549690d2ef1beb74
GIT binary patch
literal 346
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zMLb;`Ln`LH
zy|v%#aDqtN$LsbxZmv9dbfb8{o*C!n9(gTbRr3DU(Ua8zFoKGdd5=isp;jDmOTCQ{{ELY$1f)B4vSMebz0@r(uhf`GXH0v
zc8c%6VeT-g>iPOfOMY3p)&6ID_$cFluZ}He)=l;gJ7&m!5qtN_KUDW=s*>iPk1kVq
pJJ#O*dC%zOm+=3r3=9wM|6+)`5fICeb3z>C4o_DsJ-O&)@pIdSU)zi>o)^c}<$4`upB@YtakxJgZ-ScK4M3FTf(6
zdE9$depgUcl$_V9^0&E9Lma00Y_-`nUB&m&+dC)NVqZR~`1-TtLGAuv#-B;wO08UX
y&Sg5}A?rH(?!WsF|M1?JWJLy05P*k#rO2F2EdT`aSs6%sO))2GIL
zkQJ-j&uGVYue4qeXbuS6&sufn?=Rl@Tw9u5=k0j@VN!wZ^uI4x-MemfnQz-yjoXLa
zZdHZ66s>$TORLy*Ud7K)?zagyZ!6fjuY0rh)YscpQ-E5|*_jkUOaqZqOhcdbt^8<|
zAs763i(19k!jhuhclPqmnp^8pv2*p7E6+c6-dw8^=N5PCqmj_&=*moHpr-mqyhh)w
U#Jabt)q>3MboFyt=akR{0LvF~0RR91
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/inhand-left-mag.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/inhand-left-mag.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0f55636c6bec664d18c4036fafa1cfb379bf33a
GIT binary patch
literal 215
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|CVIL!hE&XX
zd&`mcumKNiK)zJ#EWf}O7lx^ko=X&V1;3yCY|W)Fat-gFXq&4u0W~n}yH;)g-tO@7
zc~=|PZY{q5J!9?EsTrWxOS(|7C74WH6Rt@kN=
zV?C#q&wufGlgYQxnXX#Be;xOit>c!_dwb+=^s9nQ_m96q@10!x?&+Pl{jsbN6M^Ip
z%T%$IDqnhhUUe
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/inhand-right-mag.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/inhand-right-mag.png
new file mode 100644
index 0000000000000000000000000000000000000000..c3ab2bfc33a9bc164108bd619459e1cc4540b722
GIT binary patch
literal 220
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|rg^$JhE&XX
zd+Q|cVFdx!0HLL<{?_Z7)HF`ay~v_>$nxnF=4pFUE8p8(`ros|(F>@9;lr{in_})h
z)cAhS;aug)t;^
zFTZ`o2hz{LaDd;(|A}AuD|QBk154w=!gM$O`xL$#q|DRR&t;ucLK6T4
Ctu|W#
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/meta.json
index 4aff585ea3..ba3886eb43 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/meta.json
@@ -5,7 +5,7 @@
"y": 32
},
"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",
+ "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi, inhands by TiniestShark",
"states": [
{
"name": "base"
@@ -84,6 +84,30 @@
},
{
"name": "piercing-6"
+ },
+ {
+ "name": "inhand-left-mag",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left-stripe",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left-ammo",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right-mag",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right-stripe",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right-ammo",
+ "directions": 4
}
]
}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..c8d3a33b8d9d59ab94ab1bea20ce0b6aa04cfd50
GIT binary patch
literal 335
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zIXzt*Ln`LH
zy=CZq*g@jh$8Z7m!txU<`1GtITm+0$&zBWDO!9va{^G*k$-&Ro$Xd55b(l;l$!xpe
zlvyyP$$8uLz1icp!q-pu|JGWIyijm*4_O36je31Q3XBPXuslnMn{=2O%
zseS!-Zfn)feVf9}_-k|@U%0gZY&@8FBiVNhX!x|k7f)>0_c*_O<&pcx*Q48fkTs9cbLY
Z#`vsXF{=wp*&cul_jL7hS?83{1OQ?Ylo$X2
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..8fe331202f9b7207efc12de4b27c130725e3682c
GIT binary patch
literal 340
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z`8-`5Ln`LH
zy|vN%aDc$^kHSYB@5mahYVPI}6FlN~ck|w#jVkqx|DD?3&7EVEURt8%Dv+u2@)FO&
z)=LjGSle@+UodoTRcU$f-B|wk`@4JJ+6n?~0D=W67E;-_C8Lsi*1Kk1mDq3W{Nk?d
zAIsMV_ciGhe0jcBUH!YU<@TTVer=O{{QB$JsVWy^4t>~Jb?@YY^$!=nNV)L-2=56d
z_wFlMVisSY*6!N#;>bhSGVX5M?Z({95F3Ext|Xu(6Qg=mdKI;Vst0J83wR{#J2
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/meta.json
index 6aab220483..e5a0d8d203 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/meta.json
@@ -5,7 +5,7 @@
"y": 32
},
"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",
+ "copyright": "Taken from and modified https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_speed.dmi, inhands by TiniestShark",
"states": [
{
"name": "base"
@@ -45,6 +45,14 @@
},
{
"name": "practice-6"
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
}
]
}
|