From: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com>
Date: Sat, 15 Mar 2025 16:43:49 +0000 (+1200)
Subject: Take 2: Rename ammunition box (.50), Liberation Station .50 stock (#35326)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=222331cb4994fec1cd16957b52d06ef1c213aa42;p=space-station-14.git

Take 2: Rename ammunition box (.50), Liberation Station .50 stock (#35326)

ammunition box (.50), .50 shell pellet

also die robust toolbox commits
---

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml
index f767e95e11..d911a51860 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml
@@ -15,3 +15,6 @@
 
     MagazineBoxRifle: 6
     MagazineBoxRiflePractice: 3
+
+    BoxLethalshot: 6
+    BoxShotgunPractice: 3
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 a26ef19c81..049271f998 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml
@@ -34,7 +34,7 @@
 - type: entity
   parent: AmmoProviderShotgunShell
   id: BoxBeanbag
-  name: shell box (beanbag)
+  name: ammunition box (.50 beanbag)
   components:
     - type: BallisticAmmoProvider
       proto: ShellShotgunBeanbag
@@ -51,7 +51,7 @@
       - state: beanbag
 
 - type: entity
-  name: shell box (lethal)
+  name: ammunition box (.50 pellet)
   parent: AmmoProviderShotgunShell
   id: BoxLethalshot
   components:
@@ -66,7 +66,7 @@
       - state: lethal
 
 - type: entity
-  name: shell box (slug)
+  name: ammunition box (.50 slug)
   parent: AmmoProviderShotgunShell
   id: BoxShotgunSlug
   components:
@@ -85,7 +85,7 @@
       - state: slug
 
 - type: entity
-  name: shell box (flare)
+  name: ammunition box (.50 flare)
   parent: AmmoProviderShotgunShell
   id: BoxShotgunFlare
   components:
@@ -104,7 +104,7 @@
       - state: flare
 
 - type: entity
-  name: shell box (incendiary)
+  name: ammunition box (.50 incendiary)
   parent: AmmoProviderShotgunShell
   id: BoxShotgunIncendiary
   components:
@@ -123,7 +123,7 @@
       - state: incendiary
 
 - type: entity
-  name: shell box (uranium)
+  name: ammunition box (.50 uranium)
   parent: AmmoProviderShotgunShell
   id: BoxShotgunUranium
   components:
@@ -142,7 +142,7 @@
       - state: uranium
 
 - type: entity
-  name: shell box (practice)
+  name: ammunition box (.50 practice)
   parent: AmmoProviderShotgunShell
   id: BoxShotgunPractice
   components:
@@ -161,7 +161,7 @@
       - state: practice
 
 - type: entity
-  name: shell box (tranquilizer)
+  name: ammunition box (.50 tranquilizer)
   parent: AmmoProviderShotgunShell
   id: BoxShellTranquilizer
   components:
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 3870b872a6..72411fc134 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
@@ -73,7 +73,7 @@
 
 - type: entity
   id: ShellShotgun
-  name: shell (.50)
+  name: shell (.50 pellet)
   parent: [ BaseShellShotgun, BaseSecurityContraband ]
   components:
   - type: Sprite