From 0edc918beb2eec415a469a67ba6d12a61e0a3ab2 Mon Sep 17 00:00:00 2001
From: KaiserMaus <kaiser.ratte@gmail.com>
Date: Thu, 25 Dec 2025 00:35:10 +0000
Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5/=D0=94=D0=BE=20=D1=81=D0=BF=D1=80?=
 =?UTF-8?q?=D0=B0=D0=B9=D1=82=20=D0=B3=D1=80=D0=B0=D0=B6=D0=B4=D0=B0=D0=BD?=
 =?UTF-8?q?=D1=81=D0=BA=D0=BE=D0=B3=D0=BE=20=D0=BD=D0=B0=D0=BD=D0=BE=D0=BC?=
 =?UTF-8?q?=D0=B5=D0=B4=D0=B0=20=D0=BF=D0=BE=D0=B4=20=D0=BD=D0=B0=D1=88=20?=
 =?UTF-8?q?=D0=BD=D0=B0=D0=BD=D0=BE=D0=BC=D0=B5=D0=B4=20(#3508)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Specific/Mechs/Weapons/Gun/Ammunition.yml   |  14 ++++++++++----
 .../VendingMachines/wallmed.rsi/meta.json       |   8 ++++----
 .../wallmed.rsi/off-civilian.png                | Bin 229 -> 340 bytes
 .../VendingMachines/wallmed.rsi/panel.png       | Bin 226 -> 189 bytes
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/Resources/Prototypes/_Starlight/Entities/Objects/Specific/Mechs/Weapons/Gun/Ammunition.yml b/Resources/Prototypes/_Starlight/Entities/Objects/Specific/Mechs/Weapons/Gun/Ammunition.yml
index 989eba9fbb..8cc8b90791 100644
--- a/Resources/Prototypes/_Starlight/Entities/Objects/Specific/Mechs/Weapons/Gun/Ammunition.yml
+++ b/Resources/Prototypes/_Starlight/Entities/Objects/Specific/Mechs/Weapons/Gun/Ammunition.yml
@@ -1,19 +1,25 @@
 - type: entity
   id: MechCartridge
   abstract: true
+
+- type: entity
+  id: ShellShotgunMechIncendiary
+  parent: [ShellShotgunIncendiary, MechCartridge]
   components:
     - type: CartridgeAmmo
       deleteOnSpawn: true
 
-- type: entity
-  id: ShellShotgunMechIncendiary
-  parent: [ShellShotgunIncendiary, MechCartridge]
-
 - type: entity
   id: ShellShotgunMech
   parent: [ShellShotgun, MechCartridge]
+  components:
+    - type: HitScanCartridgeAmmo
+      deleteOnSpawn: true
 
 
 - type: entity
   id: CartridgeHeavyRifleRFMJMech
   parent: [CartridgeHeavyRifleRFMJ, MechCartridge]
+  components:
+    - type: HitScanCartridgeAmmo
+      deleteOnSpawn: true
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/meta.json
index 52f8ffb982..c66507fb78 100644
--- a/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/meta.json
+++ b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/meta.json
@@ -17,8 +17,8 @@
       "name": "deny-unshaded",
       "delays": [
         [
-          0.1,
-          0.1
+          0.4,
+          0.4
         ]
       ]
     },
@@ -26,8 +26,8 @@
       "name": "normal-unshaded",
       "delays": [
         [
-          0.1,
-          0.1
+          0.4,
+          0.4
         ]
       ]
     },
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/off-civilian.png b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/off-civilian.png
index 22c86d0823f9464ceaee69062394badf588f7651..24f04ee98b3dd2692501d76437382b7c32fa9add 100644
GIT binary patch
delta 313
zcmV-90mlC20n`GJB!2;OQb$4nuFf3k0003FNkl<ZScPL?7zLwX6bvw6Bu0_Dr_X<K
z4BxqZ3qkW)h&9Y6N{}SWk1TsnlsYDoOr-%JIs_~%O-VBN$g*A3bHJV34;ki8TSJlq
z?%XCW3WyE?1_lO(<D0%Ph)KxfxA@)_2KNX_qRk}90SpWb41cE%uVe6!%4WED`UI(3
zu>z74AvG;0%K_B1oGb@W8;m+&z#TwRHvIJM^T0Y_)uCLX)R9tZlH>qVi({%gKua{7
z;o9q!aK4I^H-ovEHj0{)r>-*GdA5}{4nVe?fq{YH$CvjE5AHt15F-VU<bZoeIpAz1
z>mMXpL=^|%vNBXb8B#-{hXyf#s5YUpiY{4g!n=1a6J`D=7})>-y){Za&v*@}00000
LNkvXXu0mjfFU^By

delta 201
zcmV;)05<>B0_6daB!8?)L_t(o!((6=1*2eq0VA;r4Gj(dlWO?+^XCbg&q9iUrlzJu
zt37@CG*RkUNcGjplP3wPF*i3S+B~L#P6MM37<Is?14bP%>VQ!P47dXrNl^PgqR5VD
z#Vh&_5oJC}?SboiKQe@r=rOG6xx~Q0z`zhvq6e3=utYRgPC^_%O`8yCUL1=dxTfb4
zLr94p!@kWI;9^d`1`M^ai-|IyBnQwqibugH7@+_FIRGN43a5Tp00000NkvXXu0mjf
DwCYq$

diff --git a/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/panel.png
index 851c8b78938473b8edf3a8f1c699cdee4499a722..ce4567893e14792ae54cb02ba4cee56fdc39a238 100644
GIT binary patch
delta 148
zcmaFFxR-H)VSTx$i(^PcYjT1F>*55Fo~A$pF1LdkU=EK#!V;Iw9UUj?Q})e!rqbqp
z{j<cqJ(bQ|cKS@QNVv%qXQ6xlS6d?x9K3XGhKlhCKF09y>;Hv>gd(1b>BsqO*{Sm+
y>fC_?2R=MH%DqG4jNz<Vvz|y;0?j|b$gs0T)G(4kfY*=#2s~Z=T-G@yGywolxjpOv

delta 185
zcmdnX_=s_WVLeN_qpu?a!^VE@KZ&di3=EtF9+AZi419+{nDKc2iWHz=xu=U`NQ8T`
z1nc4ik)EbN11`6N8ek5ONkYpd7e+zBiT?xCBwl3tCG9A&?SFW7wz<m8W}X=fOac>b
zGR0Zw-v7mRX4@81w#!eL7RA1M_3Br=lM~Y^XI7(bas6ev91S|`7xm-zG$c!0xN@as
g6Ug*Q4ULQplQX2kKiasN0^Pvi>FVdQ&MBb@0QWOPF#rGn