From 621a39016feecb6c90b2f9b1ad3b4f4a4788d6f5 Mon Sep 17 00:00:00 2001
From: Clement-O <topy72.mine@gmail.com>
Date: Thu, 8 Oct 2020 17:48:57 +0200
Subject: [PATCH] Created and added empty ammo shell sprite (#2126)

---
 .../Guns/Ammunition/Pistol/cartridges.yml        |  11 +++++++++--
 .../Ammunition/Casings/ammo_casing.rsi/base.png  | Bin 0 -> 6759 bytes
 .../Ammunition/Casings/ammo_casing.rsi/meta.json |  10 +++++++---
 .../ammo_casing.rsi/{s-casing.png => spent.png}  | Bin
 4 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi/base.png
 rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi/{s-casing.png => spent.png} (100%)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/cartridges.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/cartridges.yml
index 7bab3b00bb..573b980b1d 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/cartridges.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/cartridges.yml
@@ -10,9 +10,16 @@
     netsync: false
     directional: false
     sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi
-    state: s-casing
+    layers:
+    - state: base
+      map: ["enum.AmmoVisualLayers.Base"]
     drawdepth: FloorObjects
-
+  - type: Icon
+    sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi
+    state: base
+  - type: Appearance
+    visuals:
+    - type: SpentAmmoVisualizer
 
 - type: entity
   id: CartridgePistol
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi/base.png
new file mode 100644
index 0000000000000000000000000000000000000000..3189d08e7b3dc555a3a7fff1acaa43422481c5f6
GIT binary patch
literal 6759
zcmdT|eQXp(6kkBF41%Cg3X*Vz8X98C?#%AYE`C&@wJq2R#0Ujqd%fGmB1nZ+TQCTi
zV)+mQ0RoaxsRd~bnD~KEK|-L^5T!yzh#(ds2<RX6D{VrozS+I)?Ow0+8Va?0+1Z_s
z_j|wJdvE5FT{R^mr9T>u1VQMZmYOsTo*sTj^?`QL;>CXnLXW)Mi4&*f`h0>AzrJAo
zp~*+546c55R`Q-r1JG*K|6=uy;xf;=nQtW|Pui1x=Ha6BnXzd{C$Ann{YdqWdQVl8
z(lqkg*!^RpR*Wi9n}#-hmb$7@DUQy~+J7MN<dR?hSlF|vZan#I`#srP2Gs7_aC+|2
z^czcRgr_UYqE39hFB)%^tM-<rG$p-JvL^G#+Jf0{_C8}Q`>3>VbLNHE?PD?)Xq)RF
zzdY#q4gHRdIVNQcjr(#))#cx})tA*|ttd+PBC4tSnTm7ACq4AZ1FYnOlF=()@P2c%
zWL)2ht0(Z^uT=Iu_tmK4xVZS;*$<8%ajat7#>_ccWtV16*!tMoi_w+!KgX9PU5u$1
z@^0m{v#HaspPD-4z`wP1-y6FQUEdM+?adoirBmNqFmm_V*^Q0g75qBq$@<>=>8xga
zMQ%)Ayk}?fy5$W6@`~zCZ|qe+cWBI#ef|ViE^NxGTlP-B?D+fd`>EHFf^i>Sed1*4
zvJ3Q|vPbJ1qPCR(dFk!Mnj>=>hF3<fh7|P8OU+y)2nnP4-J@`4;;WF5rTNJ-@~3%U
z^W-gDVC2rzJ^4j>x<@a}H3Y<4<l&dZL?kOrr5dFoT(Tx>*b6Tz@4;m~B~gZV$s7@}
z_27NiIBJ=|FhO7yzu}^~^_09YuE2W$h;dNf&2f(-=CdZS8UP9y*sclp%)JHHsR1Cu
z9mBX3aEvqyC)jd1fgAf^F~4kCA$^%aF#HPO5sa`-0Mu+T!32ij_QFlA78Xh7yFyeL
z!2~=bGQWH$q-SQ>OyuU}`vk;WD-#|}ks?x+8cc?pm~Y%U0k6Q4s50h+AQJ(#CV3In
zoXWi*2+@gQy%f&R6A(0}56m<P5g##_%0wzrLUX9XWGqrl70RFnbmGTYH*#`v42)r1
zqcR^+7*S+D5oJFUWdduVUXZLZF9Sn`Ft4mDGKD7q5&}jT6NBiYm-rZj1Ih~wsh>Ne
z5*B%%`l!wbpF`XOumRPa2k}}HEz3<NK^TC@F*&JLa)6J)X<&%A458w;i2YVkGfF@Q
zX99ur!7`ab!W1maG7aHj&2cI!Vvu_V`Nak{n0aBH0b8t_z8E$j+ZzAD8`J`{P!-s3
zIe;f&5KAT_DlrxNxgb7o@o+K$8W3BE9Htr*L7E0Z(1BTiDTD=sO9dEl&5#lhV*Ok}
z<c4sWkyM@RP1kxbx=_fFc7yssSip#jF=GaSZUf%TpBo(U*o2}xz*UeghJ&`<LK;*B
z@`gaaL4AzZhN+(WAq2w8g&KTg1$jA)HE!&*MLcv78i$y2OGTkNBmv@#z`rBZL7%b)
zMJd5XQ53#eph&11a2R$y3L3~h*flz3ZJ1aA_R4->Vy1;@P#O}fR=5LX9yf60VAzC&
zTCF079yvUVX53oxXze`Wm3f6JRDwF<6%3ozfS-?JJC8X4XgTGA<!TnJU146Cm#Pd|
zgTqPzC;}1TyBh@B_00=3xZA)0V&<H4&LS|>hz_Tw4@%N5dvh#Uj822L)}yvOv}NF2
z?{tnr37eB4`fnxQ21ER;3BSWF-}b`bnZ(D<QP-)-vnDy|+GjvVpYRXeIltQmvU7Xe
zK(?N)1hU20T&!nTGIBGqdl4}TFUE%GX3`=N(`}@6T+IJhnx!S8f^>@r-|JeSaEa+!
zM&Y6qA)|0&+;9;BxsAg0?mSTYV%)s$JR`Ti_InOS9TnpScL2F3I@;?LAg-lTfH?cE
z25Oy{u4dFarx7!1EyfKNF_7D=b?<HfwI{~S>TWP{du*@gV$?A)ZfF;fd#Yo-P686W
zodneNyC1$cwtSSaV%e>wg^F>PM>mspYcbtST1Uh<rNLec`_Y$wkTO3jG6o-e;Cn4P
zxbEOf@WDDKE$OM}W~BJCV|u?ID-Q1&Y<i98xwia=!=J8dJUn%tIQ#s~&l88eoT2r(
zIwqko_2Z&P%Et@k&CM$dqV9dYxwhe2v7jAadt+Gt<);S51e+1Df^a@%VDq5#D+j=v
Okd~a0w0A=GivIxUjp8H#

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi/meta.json
index b27dd8d3a3..200af9fe84 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi/meta.json
@@ -5,11 +5,15 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/0b3ab17dbad632ddf738b63900ef8df1926bba47/icons/obj/ammo.dmi",
+    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/0b3ab17dbad632ddf738b63900ef8df1926bba47/icons/obj/ammo.dmi, modified by Topy",
     "states": [
         {
-            "name": "s-casing",
+            "name": "base",
+            "directions": 1
+        },
+        {
+            "name": "spent",
             "directions": 1
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi/s-casing.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi/spent.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi/s-casing.png
rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi/spent.png