From: Cojoke <83733158+Cojoke-dot@users.noreply.github.com>
Date: Thu, 13 Jun 2024 02:17:35 +0000 (-0500)
Subject: New Sprites for Tranq Shells + Add consistancy to printing Tranqs (#28903)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=865810c6e122cb2f4f8eb601c17bf9b84690f890;p=space-station-14.git

New Sprites for Tranq Shells + Add consistancy to printing Tranqs (#28903)

* New Sprites for Tranq

* Add consistancy to secfab print
---

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 63ad52c032..063937aee9 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml
@@ -126,4 +126,4 @@
     - type: Sprite
       layers:
         - state: boxwide
-        - state: shellslug
+        - state: shelltranquilizer
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
index e26c4e9540..57b95cb901 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: BaseShellShotgun
   name: shell (.50)
   parent: BaseCartridge
@@ -114,7 +114,7 @@
   components:
   - type: Sprite
     layers:
-      - state: practice
+      - state: tranquilizer
         map: [ "enum.AmmoVisualLayers.Base" ]
   - type: CartridgeAmmo
     proto: PelletShotgunTranquilizer
@@ -129,7 +129,7 @@
   - type: SolutionTransfer
     maxTransferAmount: 7
   - type: SpentAmmoVisuals
-    state: "practice"
+    state: "tranquilizer"
     
 - type: entity
   id: ShellShotgunImprovised
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 537c42346e..ab3cf20ac3 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -334,6 +334,7 @@
       - BoxBeanbag
       - BoxShotgunIncendiary
       - BoxShotgunUranium
+      - BoxShellTranquilizer
       - ExplosivePayload
       - GrenadeBlast
       - GrenadeEMP
@@ -361,7 +362,6 @@
       - PowerCageHigh
       - PowerCageMedium
       - PowerCageSmall
-      - ShellTranquilizer
       - SpeedLoaderMagnumIncendiary
       - SpeedLoaderMagnumUranium
       - TelescopicShield
@@ -747,6 +747,7 @@
       - BoxBeanbag
       - BoxShotgunIncendiary
       - BoxShotgunUranium
+      - BoxShellTranquilizer
       - ExplosivePayload
       - FlashPayload
       - GrenadeBlast
@@ -774,7 +775,6 @@
       - PowerCageHigh
       - PowerCageMedium
       - PowerCageSmall
-      - ShellTranquilizer
       - ShuttleGunDusterCircuitboard
       - ShuttleGunFriendshipCircuitboard
       - ShuttleGunPerforatorCircuitboard
@@ -828,6 +828,7 @@
         - BoxLethalshot
         - BoxShotgunFlare
         - BoxShotgunSlug
+        - BoxShellTranquilizer
         - MagazineBoxLightRifle
         - MagazineBoxMagnum
         - MagazineBoxPistol
@@ -841,7 +842,6 @@
         - MagazineShotgun
         - MagazineShotgunEmpty
         - MagazineShotgunSlug
-        - ShellTranquilizer
         - SpeedLoaderMagnum
         - SpeedLoaderMagnumEmpty
     - type: MaterialStorage
diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml
index 1efbd3b42d..1e6b70f943 100644
--- a/Resources/Prototypes/Recipes/Lathes/security.yml
+++ b/Resources/Prototypes/Recipes/Lathes/security.yml
@@ -139,16 +139,16 @@
     Steel: 100
 
 - type: latheRecipe
-  id: ShellTranquilizer
-  result: ShellTranquilizer
+  id: BoxShellTranquilizer
+  result: BoxShellTranquilizer
   category: Ammo
-  completetime: 4
+  completetime: 5
   materials:
-    Plastic: 15
-    Steel: 10
-    Glass: 5
-    Plasma: 10
-    Silver: 5
+    Plastic: 240
+    Steel: 160
+    Glass: 80
+    Plasma: 160
+    Silver: 80
 
 - type: latheRecipe
   id: TargetHuman
diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml
index 97b0c1e82b..5a55a34cdf 100644
--- a/Resources/Prototypes/Research/arsenal.yml
+++ b/Resources/Prototypes/Research/arsenal.yml
@@ -58,7 +58,7 @@
   cost: 5000
   recipeUnlocks:
   - MagazineShotgunBeanbag
-  - ShellTranquilizer 
+  - BoxShellTranquilizer 
   - BoxBeanbag 
   - WeaponDisabler
 
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
index 788c43845c..f30d9c9ae7 100644
--- a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
+++ b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
@@ -35,7 +35,7 @@
             "name": "sechud"
         },
         {
-        "name": "bottle"
+            "name": "bottle"
         },
         {
             "name": "box"
@@ -155,12 +155,12 @@
             "name": "writing_of_doom"
         },
         {
-        "name": "headset"
+            "name": "headset"
         },
         {
             "name": "encryptokey"
-    },
-    {
+        },
+        {
             "name": "inhand-left",
             "directions": 4
         },
@@ -200,6 +200,9 @@
         {
             "name": "shelluranium"
         },
+        {
+            "name": "shelltranquilizer"
+        },
         {
             "name": "shelltoy"
         },
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 0000000000..96990098bf
Binary files /dev/null and b/Resources/Textures/Objects/Storage/boxes.rsi/shelltranquilizer.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/meta.json
index 9274592a7f..a7aa232dec 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/meta.json
@@ -60,6 +60,12 @@
         },
         {
             "name": "depleted-uranium-spent"
+        },
+        {
+            "name": "tranquilizer"
+        },
+        {
+            "name": "tranquilizer-spent"
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/tranquilizer-spent.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/tranquilizer-spent.png
new file mode 100644
index 0000000000..1f05d6388d
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/tranquilizer-spent.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/tranquilizer.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/tranquilizer.png
new file mode 100644
index 0000000000..9eaa42de84
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/tranquilizer.png differ