From 2e3b615590e7e6a33b891dcb1c84a6ba2bbac25d Mon Sep 17 00:00:00 2001
From: keslik <simonov.danila20@gmail.com>
Date: Wed, 5 Mar 2025 02:24:31 +0300
Subject: [PATCH] magnum nerf, tranquilizer box sprite

---
 .../Weapons/Guns/Ammunition/Boxes/shotgun.yml     |   2 +-
 .../Guns/Ammunition/Projectiles/magnum.yml        |   2 +-
 .../Textures/Objects/Storage/boxes.rsi/meta.json  |   5 ++++-
 .../Storage/boxes.rsi/shelltranquilizer.png       | Bin 0 -> 238 bytes
 4 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 Resources/Textures/Objects/Storage/boxes.rsi/shelltranquilizer.png

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml
index 831c3c3352..2d4941dd7e 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml
@@ -113,4 +113,4 @@
     - type: Sprite
       layers:
         - state: boxwide
-        - state: shellslug
\ No newline at end of file
+        - state: shelltranquilizer # WD
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml
index 364ba18c42..a31a086845 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml
@@ -7,7 +7,7 @@
   - type: Projectile
     damage:
       types:
-        Piercing: 35
+        Piercing: 32 # WD
 
 - type: entity
   id: BulletMagnumPractice
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
index 1c7574b71a..357b36f5bb 100644
--- a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
+++ b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/cc65477c04f7403ca8a457bd5bae69a01abadbf0, encryptokey was taken from Baystation12 at https://github.com/infinitystation/Baystation12/blob/073f678cdce92edb8fcd55f9ffc9f0523bf31506/icons/obj/radio.dmi and modified by lapatison. boxwidetoy, shelltoy, swab, flare, inflatable, trashbag, magazine, holo and forensic created by potato1234x (github) for ss14 based on toys.rsi, mouth_swab.rsi, flare.rsi, inflatable_wall.rsi, trashbag.rsi, caseless_pistol_mag.rsi, guardians.rsi and bureaucracy.rsi respectively, candle and darts created by TheShuEd for ss14, vials was drawn by Ubaser, evidence_markers by moomoobeef, ziplock by CaypenNow.",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/cc65477c04f7403ca8a457bd5bae69a01abadbf0, encryptokey was taken from Baystation12 at https://github.com/infinitystation/Baystation12/blob/073f678cdce92edb8fcd55f9ffc9f0523bf31506/icons/obj/radio.dmi and modified by lapatison. boxwidetoy, shelltoy, swab, flare, inflatable, trashbag, magazine, holo and forensic created by potato1234x (github) for ss14 based on toys.rsi, mouth_swab.rsi, flare.rsi, inflatable_wall.rsi, trashbag.rsi, caseless_pistol_mag.rsi, guardians.rsi and bureaucracy.rsi respectively, candle and darts created by TheShuEd for ss14, vials was drawn by Ubaser, evidence_markers by moomoobeef, ziplock by CaypenNow, shelltranquilizer modified by keslik.",
     "size": {
         "x": 32,
         "y": 32
@@ -203,6 +203,9 @@
         {
             "name": "shelltoy"
         },
+        {
+            "name": "shelltranquilizer"
+        },
         {
             "name": "ziptie"
         },
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/shelltranquilizer.png b/Resources/Textures/Objects/Storage/boxes.rsi/shelltranquilizer.png
new file mode 100644
index 0000000000000000000000000000000000000000..344de1168268bbbf9cce1685621e6b84e86a0ec9
GIT binary patch
literal 238
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWND7e7W
z#W5tJ_3ibIyoU@#ST1lUHHhqAw9KP%6Q{62jF#F4@snJdL4g|%23mNO{F^2dsZoAu
zdfmE@lY@6EcTTf3wT)$9WD#&+VEo4>kgUSM^kCcW-C7N{mt`0x-JE&WW68|35tp7G
zW93l%Fgv%rJd~mO-hrE+XHUyK^y#y$Sjo;E42P?ZAHB41A49{tbzBdsm@n90`d24b
jy0fH8oI~NjLq_><NpGnjiF#R}TNylE{an^LB{Ts5hX7U5

literal 0
HcmV?d00001