From 2b7cc01e7fed4f2172c2e5a9f54fc25dafb032fa Mon Sep 17 00:00:00 2001
From: Alekshhh <44923899+Alekshhh@users.noreply.github.com>
Date: Sat, 24 Jun 2023 22:56:42 +0300
Subject: [PATCH] Capgun Ammo Recolor (#17617)

* he's got a gun

* gung

* oops
---
 .../Weapons/Guns/Ammunition/Cartridges/toy.yml |   2 +-
 .../Guns/Ammunition/Boxes/magnum.rsi/cap.png   | Bin 189 -> 177 bytes
 .../Casings/capgun_casing.rsi/base-spent.png   | Bin 0 -> 153 bytes
 .../Casings/capgun_casing.rsi/base.png         | Bin 0 -> 165 bytes
 .../Casings/capgun_casing.rsi/meta.json        |  17 +++++++++++++++++
 5 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/capgun_casing.rsi/base-spent.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/capgun_casing.rsi/base.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/capgun_casing.rsi/meta.json

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/toy.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/toy.yml
index 0ac5d95e1a..6ec93e1778 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/toy.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/toy.yml
@@ -10,7 +10,7 @@
       - CartridgeCap
   - type: CartridgeAmmo
   - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi
+    sprite: Objects/Weapons/Guns/Ammunition/Casings/capgun_casing.rsi
     layers:
     - state: base
       map: ["enum.AmmoVisualLayers.Base"]
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/cap.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/cap.png
index 20465f58e58d7aec5ae16844d854ba50bbb371d7..84ef47a1d6731a7aa29c2f74a1d563d518cec5de 100644
GIT binary patch
delta 149
zcmdnXxRG&!N_~Z=i(^QHdvc0I!U2l|-;8^#5=>a!oDoFB6M>44&+pfBim6Td`f$}Z
zPcx5~kLUkCzGJ4uil-c#WEei3wXGAI^fif_brLUQ>wy)_Y$hy={Pr=sA2cdfoV2)K
rE3@I&+Kg2{nuOeYp@tuDW?*<AC!?t8%_sko0SG)@{an^LB{Ts5+R{37

delta 161
zcmdnUxR-H)N<Cw7kh>GZx^prw85kH?(j9#r85lP9bN@+X1@buyJR*x382Ao@Fyrz3
z6)8Z$AWs*^kO=o=3D(64B0Wuk23&3jH55c8&j0yuucO0zN}Az-aLrTu6M_MHM;kc3
zCbQ(d+r^a{$akWM!Svt?W{<K1)77I7RzS2$wQ(jSFfin&2&5M0^1cHa&*16m=d#Wz
Gp$P!gIWv*~

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/capgun_casing.rsi/base-spent.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/capgun_casing.rsi/base-spent.png
new file mode 100644
index 0000000000000000000000000000000000000000..316d20b2fff4a45670d1dce076063a6afd686dc0
GIT binary patch
literal 153
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJI8PVHkO=qW6p4fb76-l=_gE#E
zu(&zHh_*bAJCO>1<-;bQir8UPkfEb++BhYXDRPh2OvZN&;ol`CioQ(@-#qCpL)KPh
lH(3KIrp1Z~f`K7Ro>Ou1>VpYDn;1M@{an^LB{VTG005FKEZP77

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/capgun_casing.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/capgun_casing.rsi/base.png
new file mode 100644
index 0000000000000000000000000000000000000000..4f59568a181fa28e0d5d936d7adf188d24eae9e2
GIT binary patch
literal 165
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJEKe85kO=qW6p4fb76-l=_gE#E
zu(&zHh_*Nm5edUT=TA;<3twa;wvH!iQt^R5)qiwUsykA671$#rm9##Ff0vZ#+q$2b
yTgO;j>88yj(}3N74PG@|6p-L;gcFPmx%E7Xul%l>18rsSboFyt=akUIzyJUlC^DA-

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/capgun_casing.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/capgun_casing.rsi/meta.json
new file mode 100644
index 0000000000..af7e9d94a1
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/capgun_casing.rsi/meta.json
@@ -0,0 +1,17 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/0b3ab17dbad632ddf738b63900ef8df1926bba47/icons/obj/ammo.dmi, modified by Topy, recolored by Alekshhh",
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "base-spent"
+        }
+    ]
+}