From 03ac153417c4dc86b138026249322cda147b3052 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Sun, 25 Aug 2019 21:00:37 +1000 Subject: [PATCH] Fix 9mm guns (#311) I r dumb. Fix calibers and fix my script import of the top-mounted image. --- .../Weapons/Ammunition/9mm/ammunition.yml | 30 +++++++++--------- .../Magazine/9mm/9mmt.rsi/9mmt-2.png | Bin 258 -> 260 bytes .../Magazine/9mm/9mmt.rsi/9mmt-3.png | Bin 256 -> 259 bytes .../Magazine/9mm/9mmt.rsi/9mmt-4.png | Bin 259 -> 258 bytes .../Magazine/9mm/9mmt.rsi/9mmt-5.png | Bin 260 -> 256 bytes .../Ammunition/Magazine/9mm/9mmt.rsi/9mmt.png | Bin 260 -> 256 bytes 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/9mm/ammunition.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/9mm/ammunition.yml index 0637fe5fed..bbb7153955 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/9mm/ammunition.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/9mm/ammunition.yml @@ -74,7 +74,7 @@ components: - type: BallisticMagazine fill: ammo_casing_9mm_flash - caliber: A9mmFlash + caliber: A9mm capacity: 10 - type: Icon sprite: Objects/Guns/Ammunition/Magazine/9mm/9x19pf.rsi @@ -95,7 +95,7 @@ components: - type: BallisticMagazine fill: ammo_casing_9mm_hv - caliber: A9mmHighVelocity + caliber: A9mm capacity: 10 - type: Icon sprite: Objects/Guns/Ammunition/Magazine/9mm/9x19phv.rsi @@ -116,7 +116,7 @@ components: - type: BallisticMagazine fill: ammo_casing_9mm_l - caliber: A9mmL + caliber: A9mm capacity: 10 - type: Icon sprite: Objects/Guns/Ammunition/Magazine/9mm/9x19pl.rsi @@ -137,7 +137,7 @@ components: - type: BallisticMagazine fill: ammo_casing_9mm_p - caliber: A9mmPractice + caliber: A9mm capacity: 10 - type: Icon sprite: Objects/Guns/Ammunition/Magazine/9mm/9x19pp.rsi @@ -158,7 +158,7 @@ components: - type: BallisticMagazine fill: ammo_casing_9mm_r - caliber: A9mmRubber + caliber: A9mm capacity: 10 - type: Icon sprite: Objects/Guns/Ammunition/Magazine/9mm/9x19pr.rsi @@ -200,7 +200,7 @@ components: - type: BallisticMagazine fill: ammo_casing_9mm_f - caliber: A9mmFlash + caliber: A9mm capacity: 30 - type: Icon sprite: Objects/Guns/Ammunition/Magazine/9mm/smg9mmf.rsi @@ -221,7 +221,7 @@ components: - type: BallisticMagazine fill: ammo_casing_9mm_hv - caliber: A9mmHighVelocity + caliber: A9mm capacity: 30 - type: Icon sprite: Objects/Guns/Ammunition/Magazine/9mm/smg9mmhv.rsi @@ -242,7 +242,7 @@ components: - type: BallisticMagazine fill: ammo_casing_9mm_l - caliber: A9mmL + caliber: A9mm capacity: 30 - type: Icon sprite: Objects/Guns/Ammunition/Magazine/9mm/smg9mml.rsi @@ -263,7 +263,7 @@ components: - type: BallisticMagazine fill: ammo_casing_9mm_p - caliber: A9mmPractice + caliber: A9mm capacity: 30 - type: Icon sprite: Objects/Guns/Ammunition/Magazine/9mm/smg9mmp.rsi @@ -284,7 +284,7 @@ components: - type: BallisticMagazine fill: ammo_casing_9mm_r - caliber: A9mmRubber + caliber: A9mm capacity: 30 - type: Icon sprite: Objects/Guns/Ammunition/Magazine/9mm/smg9mmr.rsi @@ -321,7 +321,7 @@ parent: BaseItem components: - type: BallisticBullet - caliber: A9mmFlash + caliber: A9mm projectile: bullet_9mmf - type: Sprite sprite: Objects/Guns/Ammunition/ammo_casing.rsi @@ -337,7 +337,7 @@ parent: BaseItem components: - type: BallisticBullet - caliber: A9mmHighVelocity + caliber: A9mm projectile: bullet_9mmhv - type: Sprite sprite: Objects/Guns/Ammunition/ammo_casing.rsi @@ -353,7 +353,7 @@ parent: BaseItem components: - type: BallisticBullet - caliber: A9mmL + caliber: A9mm projectile: bullet_9mml - type: Sprite sprite: Objects/Guns/Ammunition/ammo_casing.rsi @@ -369,7 +369,7 @@ parent: BaseItem components: - type: BallisticBullet - caliber: A9mmPractice + caliber: A9mm projectile: bullet_9mmp - type: Sprite sprite: Objects/Guns/Ammunition/ammo_casing.rsi @@ -385,7 +385,7 @@ parent: BaseItem components: - type: BallisticBullet - caliber: A9mmRubber + caliber: A9mm projectile: bullet_9mmr - type: Sprite sprite: Objects/Guns/Ammunition/ammo_casing.rsi diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9mmt.rsi/9mmt-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9mmt.rsi/9mmt-2.png index 2859e93a4312b1bf77cf278559dc400e598e760c..1b89b4a9ab6c5e47c07b31167c6d1751ce5e5f12 100644 GIT binary patch delta 232 zcmV7mSI7%w zw4gsQ4oYYp&z z@k5_;ODzVC57oN&ADaK60aHI?uPAfiQBm0>y$SZmoB6US}aju$Hh zW**gv2*wzA@6j~PWEUno;Jr`YE6WmH*P$qiSQ~~R)~D8fC)t6ye16Zb%zgDLfVGl+ i8wx-G0uX=zvIE{>&_<-1It|PK0000c(HjIk`)PcjC%zVA^|x1zTjfB_hQ0T_S*0J!HInx@gZt^s|V zK6H^6VvK0p*5!PY6(AxN5lqvBWqE_2pXB@>F-C~UDOh*Z4_^?Gh7i{EFbw-(=b)-P zyNDo!0A@zlb;&9upMaSU_q_KQ#}QRkt+sidS9>aUtHTQ9L`3`4f68Tj3BXk<{tXSl g01UtY44^o`7wbG>0Vr;^E&u=k07*qoM6N<$f;+5Y_W%F@ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9mmt.rsi/9mmt-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9mmt.rsi/9mmt-3.png index e3722c32d13f8615f5102399d7bae15bc04ef469..9bb095072c1dbb7113c2047cec484eb689b014b6 100644 GIT binary patch delta 199 zcmZo*YG#_C!gy+;s!Dyff;X@1BEMHbPAjFYoey-|NhC*ZnxDc`bl70Q5`v{duZ<)C8qbbGbC&8tFN9=!<2UKZuTs;%O(r0SFJj`P3Lr)|Ixba y?M#+}fpdPj?_A^0XyJWy|3XHI1`rZquV5B5Pi&Oi_Tm}?5O})!xvXl^(1oElR~5Rp@` z?&v>2MC!fY=JP!7lbwUA?tBq}_a4lQaU8Q<$X)?6AFg#>hhc(HjIk`)PcjC%zVA^|x1zTjfB_hQ0T_S*0J!HInx@gZt^s|V zK6H^6VvK0p*5!PY6(AxN5lqvBWqE_2pXB@>F-C~UDOh*Z4_^?Gh7i{EFbw-(=b)-P zyNDo!0A@zlb;&9upMaSU_q_KQ#}QRkt+sidS9>aUtHTQ9L`3`4f68Tj3BXk<{tXSl g01UtY44^o`7wbG>0Vr;^E&u=k07*qoM6N<$f;z@x_5c6? delta 231 zcmV+;!b}vQl8? zQJsjOwT5#JP1DSFVYUO#xyiArs?hg6ilP{5A%vkmH}^Y}9Z2Q#d445z>Qw-1CHrqE h009U<00PJkcmq{gL!=o-j{pDw002ovPDHLkV1l3cXY&96 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9mmt.rsi/9mmt-5.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9mmt.rsi/9mmt-5.png index 1b89b4a9ab6c5e47c07b31167c6d1751ce5e5f12..e3722c32d13f8615f5102399d7bae15bc04ef469 100644 GIT binary patch delta 228 zcmVl^(1oElR~5Rp@`?&v>2L|y8=-{$i??~|Q_s_uLd zf%hKFjBy;ZUC3SmGas&XU58~^&@|2F#TYj~m;0~74wOVh`_g|ZRecG-RjU3B4Zr{l ezyJ)OI=~mnP+)=c<9THO00007mSI7%w zw4gsQ4oYYp&z z@k5_;ODzVC57oN&ADaK60aHI?uPAfiQBm0>y$SZmoB6US}aju$Hh zW**gv2*wzA@6j~PWEUno;Jr`YE6WmH*P$qiSQ~~R)~D8fC)t6ye16Zb%zgDLfVGl+ i8wx-G0uX=zvIE{>&_<-1It|PK0000l^(1oElR~5Rp@`?&v>2L|y8=-{$i??~|Q_s_uLd zf%hKFjBy;ZUC3SmGas&XU58~^&@|2F#TYj~m;0~74wOVh`_g|ZRecG-RjU3B4Zr{l ezyJ)OI=~mnP+)=c<9THO00007mSI7%w zw4gsQ4oYYp&z z@k5_;ODzVC57oN&ADaK60aHI?uPAfiQBm0>y$SZmoB6US}aju$Hh zW**gv2*wzA@6j~PWEUno;Jr`YE6WmH*P$qiSQ~~R)~D8fC)t6ye16Zb%zgDLfVGl+ i8wx-G0uX=zvIE{>&_<-1It|PK0000