diff --git a/code/datums/supplypacks/munitions.dm b/code/datums/supplypacks/munitions.dm
index cec258270c0..30ccee5746e 100644
--- a/code/datums/supplypacks/munitions.dm
+++ b/code/datums/supplypacks/munitions.dm
@@ -38,7 +38,7 @@
/obj/item/weapon/gun/projectile/sec/flash,
/obj/item/ammo_magazine/m45/flash,
/obj/item/weapon/gun/projectile/shotgun/doublebarrel/flare,
- /obj/item/weapon/storage/box/flashshells
+ /obj/item/ammo_magazine/ammo_box/b12g/flash
)
cost = 25
containertype = /obj/structure/closet/crate/secure/gear
@@ -66,8 +66,8 @@
/datum/supply_pack/munitions/shotgun
name = "Weapons - Shotgun crate"
contains = list(
- /obj/item/weapon/storage/box/shotgunammo,
- /obj/item/weapon/storage/box/shotgunshells,
+ /obj/item/ammo_magazine/ammo_box/b12g,
+ /obj/item/ammo_magazine/ammo_box/b12g/pellet,
/obj/item/weapon/gun/projectile/shotgun/pump/combat = 2
)
cost = 50
@@ -198,8 +198,8 @@
/datum/supply_pack/munitions/shotgunammo
name = "Ammunition - Shotgun shells"
contains = list(
- /obj/item/weapon/storage/box/shotgunammo = 2,
- /obj/item/weapon/storage/box/shotgunshells = 2
+ /obj/item/ammo_magazine/ammo_box/b12g = 2,
+ /obj/item/ammo_magazine/ammo_box/b12g/pellet = 2
)
cost = 25
containertype = /obj/structure/closet/crate/secure/weapon
@@ -208,7 +208,7 @@
/datum/supply_pack/munitions/beanbagammo
name = "Ammunition - Beanbag shells"
- contains = list(/obj/item/weapon/storage/box/beanbags = 3)
+ contains = list(/obj/item/ammo_magazine/ammo_box/b12g/beanbag = 3)
cost = 25
containertype = /obj/structure/closet/crate
containername = "Ballistic ammunition crate"
diff --git a/code/datums/supplypacks/security.dm b/code/datums/supplypacks/security.dm
index b926fa8b8de..c19c4b00970 100644
--- a/code/datums/supplypacks/security.dm
+++ b/code/datums/supplypacks/security.dm
@@ -256,7 +256,7 @@
/obj/item/weapon/shield/riot = 3,
/obj/item/weapon/handcuffs = 3,
/obj/item/weapon/storage/box/flashbangs,
- /obj/item/weapon/storage/box/beanbags,
+ /obj/item/ammo_magazine/ammo_box/b12g/beanbag,
/obj/item/weapon/storage/box/handcuffs
)
cost = 40
diff --git a/code/datums/uplink/ammunition.dm b/code/datums/uplink/ammunition.dm
index 70ca73007d9..1cb7a02eb62 100644
--- a/code/datums/uplink/ammunition.dm
+++ b/code/datums/uplink/ammunition.dm
@@ -107,25 +107,25 @@
/datum/uplink_item/item/ammo/g12
name = "12g Shotgun Ammo Box (Slug)"
- path = /obj/item/weapon/storage/box/shotgunammo
+ path = /obj/item/ammo_magazine/ammo_box/b12g
/datum/uplink_item/item/ammo/g12/beanbag
name = "12g Shotgun Ammo Box (Beanbag)"
- path = /obj/item/weapon/storage/box/beanbags
+ path = /obj/item/ammo_magazine/ammo_box/b12g/beanbag
item_cost = 10 // Discount due to it being LTL.
/datum/uplink_item/item/ammo/g12/pellet
name = "12g Shotgun Ammo Box (Pellet)"
- path = /obj/item/weapon/storage/box/shotgunshells
+/obj/item/ammo_magazine/ammo_box/b12g/pellet
/datum/uplink_item/item/ammo/g12/stun
name = "12g Shotgun Ammo Box (Stun)"
- path = /obj/item/weapon/storage/box/stunshells
+ path = /obj/item/ammo_magazine/ammo_box/b12g/stunshell
item_cost = 10 // Discount due to it being LTL.
/datum/uplink_item/item/ammo/g12/flash
name = "12g Shotgun Ammo Box (Flash)"
- path = /obj/item/weapon/storage/box/flashshells
+ path = /obj/item/ammo_magazine/ammo_box/b12g/flash
item_cost = 10 // Discount due to it being LTL.
/datum/uplink_item/item/ammo/cell
diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
index 583363c8919..18d0ef948fe 100644
--- a/code/game/objects/items/weapons/storage/boxes.dm
+++ b/code/game/objects/items/weapons/storage/boxes.dm
@@ -142,114 +142,6 @@
/obj/item/weapon/dnainjector/m2h = 3
)
-/obj/item/weapon/storage/box/blanks
- name = "box of blank shells"
- desc = "It has a picture of a gun and several warning symbols on the front."
- icon_state = "blankshot_box"
- item_state_slots = list(slot_r_hand_str = "syringe_kit", slot_l_hand_str = "syringe_kit")
- starts_with = list(/obj/item/ammo_casing/a12g/blank = 8)
- drop_sound = 'sound/items/drop/ammobox.ogg'
- pickup_sound = 'sound/items/pickup/ammobox.ogg'
-
-/obj/item/weapon/storage/box/blanks/large
- starts_with = list(/obj/item/ammo_casing/a12g/blank = 16)
-
-/obj/item/weapon/storage/box/beanbags
- name = "box of beanbag shells"
- desc = "It has a picture of a gun and several warning symbols on the front.
WARNING: Live ammunition. Misuse may result in serious injury or death."
- icon_state = "beanshot_box"
- item_state_slots = list(slot_r_hand_str = "syringe_kit", slot_l_hand_str = "syringe_kit")
- starts_with = list(/obj/item/ammo_casing/a12g/beanbag = 8)
- drop_sound = 'sound/items/drop/ammobox.ogg'
- pickup_sound = 'sound/items/pickup/ammobox.ogg'
-
-/obj/item/weapon/storage/box/beanbags/large/New()
- starts_with = list(/obj/item/ammo_casing/a12g/beanbag = 16)
-
-/obj/item/weapon/storage/box/shotgunammo
- name = "box of shotgun slugs"
- desc = "It has a picture of a gun and several warning symbols on the front.
WARNING: Live ammunition. Misuse may result in serious injury or death."
- icon_state = "lethalshellshot_box"
- item_state_slots = list(slot_r_hand_str = "syringe_kit", slot_l_hand_str = "syringe_kit")
- starts_with = list(/obj/item/ammo_casing/a12g = 8)
- drop_sound = 'sound/items/drop/ammobox.ogg'
- pickup_sound = 'sound/items/pickup/ammobox.ogg'
-
-/obj/item/weapon/storage/box/shotgunammo/large
- starts_with = list(/obj/item/ammo_casing/a12g = 16)
-
-/obj/item/weapon/storage/box/shotgunshells
- name = "box of shotgun shells"
- desc = "It has a picture of a gun and several warning symbols on the front.
WARNING: Live ammunition. Misuse may result in serious injury or death."
- icon_state = "lethalslug_box"
- item_state_slots = list(slot_r_hand_str = "syringe_kit", slot_l_hand_str = "syringe_kit")
- starts_with = list(/obj/item/ammo_casing/a12g/pellet = 8)
- drop_sound = 'sound/items/drop/ammobox.ogg'
- pickup_sound = 'sound/items/pickup/ammobox.ogg'
-
-/obj/item/weapon/storage/box/shotgunshells/large
- starts_with = list(/obj/item/ammo_casing/a12g/pellet = 16)
-
-/obj/item/weapon/storage/box/flashshells
- name = "box of illumination shells"
- desc = "It has a picture of a gun and several warning symbols on the front.
WARNING: Live ammunition. Misuse may result in serious injury or death."
- icon_state = "illumshot_box"
- item_state_slots = list(slot_r_hand_str = "syringe_kit", slot_l_hand_str = "syringe_kit")
- starts_with = list(/obj/item/ammo_casing/a12g/flash = 8)
- drop_sound = 'sound/items/drop/ammobox.ogg'
- pickup_sound = 'sound/items/pickup/ammobox.ogg'
-
-/obj/item/weapon/storage/box/flashshells/large
- starts_with = list(/obj/item/ammo_casing/a12g/flash = 16)
-
-/obj/item/weapon/storage/box/stunshells
- name = "box of stun shells"
- desc = "It has a picture of a gun and several warning symbols on the front.
WARNING: Live ammunition. Misuse may result in serious injury or death."
- icon_state = "stunshot_box"
- item_state_slots = list(slot_r_hand_str = "syringe_kit", slot_l_hand_str = "syringe_kit")
- starts_with = list(/obj/item/ammo_casing/a12g/stunshell = 8)
- drop_sound = 'sound/items/drop/ammobox.ogg'
- pickup_sound = 'sound/items/pickup/ammobox.ogg'
-
-/obj/item/weapon/storage/box/stunshells/large
- starts_with = list(/obj/item/ammo_casing/a12g/stunshell = 16)
-
-/obj/item/weapon/storage/box/practiceshells
- name = "box of practice shells"
- desc = "It has a picture of a gun and several warning symbols on the front.
WARNING: Live ammunition. Misuse may result in serious injury or death."
- icon_state = "blankshot_box"
- item_state_slots = list(slot_r_hand_str = "syringe_kit", slot_l_hand_str = "syringe_kit")
- starts_with = list(/obj/item/ammo_casing/a12g/practice = 8)
- drop_sound = 'sound/items/drop/ammobox.ogg'
- pickup_sound = 'sound/items/pickup/ammobox.ogg'
-
-/obj/item/weapon/storage/box/practiceshells/large
- starts_with = list(/obj/item/ammo_casing/a12g/practice = 16)
-
-/obj/item/weapon/storage/box/empshells
- name = "box of emp shells"
- desc = "It has a picture of a gun and several warning symbols on the front."
- icon_state = "empshot_box"
- item_state_slots = list(slot_r_hand_str = "syringe_kit", slot_l_hand_str = "syringe_kit")
- starts_with = list(/obj/item/ammo_casing/a12g/emp = 8)
- drop_sound = 'sound/items/drop/ammobox.ogg'
- pickup_sound = 'sound/items/pickup/ammobox.ogg'
-
-/obj/item/weapon/storage/box/empshells/large
- starts_with = list(/obj/item/ammo_casing/a12g/emp = 16)
-
-/obj/item/weapon/storage/box/flechetteshells
- name = "box of shotgun flechettes"
- desc = "It has a picture of a gun and several warning symbols on the front.
WARNING: Live ammunition. Misuse may result in serious injury or death."
- icon_state = "lethalslug_box"
- item_state_slots = list(slot_r_hand_str = "syringe_kit", slot_l_hand_str = "syringe_kit")
- starts_with = list(/obj/item/ammo_casing/a12g/flechette = 8)
- drop_sound = 'sound/items/drop/ammobox.ogg'
- pickup_sound = 'sound/items/pickup/ammobox.ogg'
-
-/obj/item/weapon/storage/box/flechetteshells/large
- starts_with = list(/obj/item/ammo_casing/a12g/flechette = 16)
-
/obj/item/weapon/storage/box/flashbangs
name = "box of flashbangs (WARNING)"
desc = "WARNING: These devices are extremely dangerous and can cause blindness or deafness in repeated use."
diff --git a/code/game/objects/random/guns_and_ammo.dm b/code/game/objects/random/guns_and_ammo.dm
index 69b19e003b6..ee675519146 100644
--- a/code/game/objects/random/guns_and_ammo.dm
+++ b/code/game/objects/random/guns_and_ammo.dm
@@ -154,10 +154,10 @@
icon_state = "ammo"
/obj/random/ammo/item_to_spawn()
- return pick(prob(6);/obj/item/weapon/storage/box/beanbags,
- prob(2);/obj/item/weapon/storage/box/shotgunammo,
- prob(4);/obj/item/weapon/storage/box/shotgunshells,
- prob(1);/obj/item/weapon/storage/box/stunshells,
+ return pick(prob(6);/obj/item/ammo_magazine/ammo_box/b12g/beanbag,
+ prob(2);/obj/item/ammo_magazine/ammo_box/b12g,
+ prob(4);/obj/item/ammo_magazine/ammo_box/b12g/pellet,
+ prob(1);/obj/item/ammo_magazine/ammo_box/b12g/stunshell,
prob(2);/obj/item/ammo_magazine/m45,
prob(4);/obj/item/ammo_magazine/m45/rubber,
prob(4);/obj/item/ammo_magazine/m45/flash,
@@ -489,11 +489,11 @@
),
prob(3);list(
/obj/item/weapon/gun/projectile/shotgun/pump/slug,
- /obj/item/weapon/storage/box/shotgunammo
+ /obj/item/ammo_magazine/ammo_box/b12g
),
prob(1);list(
/obj/item/weapon/gun/projectile/shotgun/pump/combat,
- /obj/item/weapon/storage/box/shotgunammo
+ /obj/item/ammo_magazine/ammo_box/b12g
)
)
diff --git a/code/game/objects/random/mob_vr.dm b/code/game/objects/random/mob_vr.dm
index 46b3432025c..b153ce360b3 100644
--- a/code/game/objects/random/mob_vr.dm
+++ b/code/game/objects/random/mob_vr.dm
@@ -96,8 +96,8 @@
icon = 'icons/obj/ammo.dmi'
icon_state = "666"
/obj/random/ammo_all/item_to_spawn()
- return pick(prob(5);/obj/item/weapon/storage/box/shotgunammo,\
- prob(5);/obj/item/weapon/storage/box/shotgunshells,\
+ return pick(prob(5);/obj/item/ammo_magazine/ammo_box/b12g,\
+ prob(5);/obj/item/ammo_magazine/ammo_box/b12g/pellet,\
prob(5);/obj/item/ammo_magazine/clip/c762,\
prob(5);/obj/item/ammo_magazine/m380,\
prob(5);/obj/item/ammo_magazine/m45,\
@@ -127,9 +127,9 @@
/* prob(1);/obj/item/ammo_magazine/m95,\ */
prob(1);/obj/item/ammo_casing/rocket,\
prob(1);/obj/item/ammo_magazine/ammo_box/b145,\
- prob(1);/obj/item/weapon/storage/box/flashshells,\
- prob(1);/obj/item/weapon/storage/box/beanbags,\
- prob(1);/obj/item/weapon/storage/box/stunshells,\
+ prob(1);/obj/item/ammo_magazine/ammo_box/b12g/flash,\
+ prob(1);/obj/item/ammo_magazine/ammo_box/b12g/beanbag,\
+ prob(1);/obj/item/ammo_magazine/ammo_box/b12g/stunshell,\
prob(1);/obj/item/ammo_magazine/mtg,\
prob(1);/obj/item/ammo_magazine/m12gdrum,\
prob(1);/obj/item/ammo_magazine/m12gdrum/pellet,\
diff --git a/code/game/objects/structures/loot_piles.dm b/code/game/objects/structures/loot_piles.dm
index a0737da55c6..87b91e84693 100644
--- a/code/game/objects/structures/loot_piles.dm
+++ b/code/game/objects/structures/loot_piles.dm
@@ -300,8 +300,8 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh
uncommon_loot = list(
/obj/item/weapon/storage/box/sinpockets,
- /obj/item/weapon/storage/box/practiceshells,
- /obj/item/weapon/storage/box/blanks,
+ /obj/item/ammo_magazine/ammo_box/b12g/practice,
+ /obj/item/ammo_magazine/ammo_box/b12g/blank,
/obj/item/weapon/storage/box/smokes,
/obj/item/weapon/storage/box/metalfoam,
/obj/item/weapon/storage/box/handcuffs,
@@ -311,8 +311,8 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh
rare_loot = list(
/obj/item/weapon/storage/box/flashbangs,
/obj/item/weapon/storage/box/empslite,
- /obj/item/weapon/storage/box/flashshells,
- /obj/item/weapon/storage/box/stunshells,
+ /obj/item/ammo_magazine/ammo_box/b12g/flash,
+ /obj/item/ammo_magazine/ammo_box/b12g/stunshell,
/obj/item/weapon/storage/box/teargas
)
diff --git a/code/modules/awaymissions/loot_vr.dm b/code/modules/awaymissions/loot_vr.dm
index e6aeca4b10c..0e150d2e446 100644
--- a/code/modules/awaymissions/loot_vr.dm
+++ b/code/modules/awaymissions/loot_vr.dm
@@ -176,8 +176,8 @@
new new_gun(C)
if(prob(50))
var/new_ammo = pick( // Copied from Random.dm
- prob(5);/obj/item/weapon/storage/box/shotgunammo,\
- prob(5);/obj/item/weapon/storage/box/shotgunshells,\
+ prob(5);/obj/item/ammo_magazine/ammo_box/b12g,\
+ prob(5);/obj/item/ammo_magazine/ammo_box/b12g/pellet,\
prob(5);/obj/item/ammo_magazine/s357,\
prob(5);/obj/item/ammo_magazine/clip/c762,\
prob(5);/obj/item/ammo_magazine/m45,\
@@ -212,11 +212,11 @@
/* prob(1);/obj/item/ammo_magazine/m95,\ */
prob(1);/obj/item/ammo_casing/rocket,\
prob(1);/obj/item/ammo_magazine/ammo_box/b145,\
- prob(1);/obj/item/weapon/storage/box/flashshells,\
- prob(1);/obj/item/weapon/storage/box/beanbags,\
- prob(1);/obj/item/weapon/storage/box/practiceshells,\
- prob(1);/obj/item/weapon/storage/box/stunshells,\
- prob(1);/obj/item/weapon/storage/box/blanks,\
+ prob(1);/obj/item/ammo_magazine/ammo_box/b12g/flash,\
+ prob(1);/obj/item/ammo_magazine/ammo_box/b12g/beanbag,\
+ prob(1);/obj/item/ammo_magazine/ammo_box/b12g/practice,\
+ prob(1);/obj/item/ammo_magazine/ammo_box/b12g/stunshell,\
+ prob(1);/obj/item/ammo_magazine/ammo_box/b12g/blank,\
prob(1);/obj/item/ammo_magazine/mtg,\
prob(1);/obj/item/ammo_magazine/m45tommydrum,\
prob(1);/obj/item/ammo_magazine/m45tommy)
diff --git a/code/modules/projectiles/ammunition/ammo_boxes.dm b/code/modules/projectiles/ammunition/ammo_boxes.dm
index 0b4b6cdb6b4..758b6abbd44 100644
--- a/code/modules/projectiles/ammunition/ammo_boxes.dm
+++ b/code/modules/projectiles/ammunition/ammo_boxes.dm
@@ -274,7 +274,7 @@
/obj/item/ammo_magazine/ammo_box/b12g/stunshell
name = "ammo box (12 gauge stun)"
desc = "A box of 12 gauge stun rounds"
- icon_state = "stun"
+ icon_state = "stunslug"
caliber = ".12g"
ammo_type = /obj/item/ammo_casing/a12g/stunshell
matter = list(MAT_STEEL = 2880, MAT_GLASS = 5760)
@@ -284,7 +284,7 @@
/obj/item/ammo_magazine/ammo_box/b12g/emp
name = "ammo box (12 gauge EMP)"
desc = "A box of 12 gauge EMP rounds"
- icon_state = "stun"
+ icon_state = "emp"
caliber = ".12g"
ammo_type = /obj/item/ammo_casing/a12g/emp
matter = list(MAT_STEEL = 2880, MAT_URANIUM = 1920)
@@ -541,4 +541,7 @@
ammo_type = /obj/item/ammo_casing/a545/hunter
matter = list(MAT_STEEL = 18000)
max_ammo = 100
- multiple_sprites = 1
\ No newline at end of file
+ multiple_sprites = 1
+
+/obj/item/weapon/storage/box/shotgunammo/large
+/obj/item/weapon/storage/box/shotgunshells
\ No newline at end of file
diff --git a/code/modules/research/designs/weapons.dm b/code/modules/research/designs/weapons.dm
index 5013b230de3..f6644babaad 100644
--- a/code/modules/research/designs/weapons.dm
+++ b/code/modules/research/designs/weapons.dm
@@ -112,7 +112,7 @@
id = "stunshell"
req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3)
materials = list(MAT_STEEL = 4000)
- build_path = /obj/item/weapon/storage/box/stunshells
+ build_path = /obj/item/ammo_magazine/ammo_box/b12g/stunshell
sort_string = "MABBB"
/datum/design/item/weapon/ballistic/ammo/empshell
@@ -121,7 +121,7 @@
id = "empshell"
req_tech = list(TECH_COMBAT = 4, TECH_MAGNET = 3)
materials = list(MAT_STEEL = 4000, MAT_URANIUM = 1000)
- build_path = /obj/item/weapon/storage/box/empshells
+ build_path = /obj/item/ammo_magazine/ammo_box/b12g/emp
sort_string = "MABBC"
// Phase weapons
diff --git a/icons/obj/ammo_boxes.dmi b/icons/obj/ammo_boxes.dmi
index ed38e805415..0117deddeec 100644
Binary files a/icons/obj/ammo_boxes.dmi and b/icons/obj/ammo_boxes.dmi differ
diff --git a/maps/stellardelight/stellar_delight1.dmm b/maps/stellardelight/stellar_delight1.dmm
index 5be491d41c9..2e87830b16b 100644
--- a/maps/stellardelight/stellar_delight1.dmm
+++ b/maps/stellardelight/stellar_delight1.dmm
@@ -1660,20 +1660,20 @@
/area/security/security_cell_hallway)
"dD" = (
/obj/structure/table/rack/shelf/steel,
-/obj/item/weapon/storage/box/shotgunshells{
- pixel_x = -2;
- pixel_y = 7
- },
-/obj/item/weapon/storage/box/shotgunshells{
- pixel_x = 2;
- pixel_y = 3
- },
-/obj/item/weapon/storage/box/shotgunshells{
- pixel_x = 6;
- pixel_y = -1
- },
/obj/machinery/atmospherics/pipe/simple/hidden/purple,
/obj/effect/floor_decal/milspec/color/black,
+/obj/item/ammo_magazine/ammo_box/b12g/pellet{
+ pixel_x = 3;
+ pixel_y = -3
+ },
+/obj/item/ammo_magazine/ammo_box/b12g/pellet{
+ pixel_x = -1;
+ pixel_y = 2
+ },
+/obj/item/ammo_magazine/ammo_box/b12g/pellet{
+ pixel_x = -5;
+ pixel_y = 7
+ },
/turf/simulated/floor/tiled/dark,
/area/security/armoury)
"dF" = (
@@ -12022,21 +12022,22 @@
/area/security/warden)
"zE" = (
/obj/structure/table/rack/shelf/steel,
-/obj/item/weapon/storage/box/stunshells{
- pixel_x = 3;
- pixel_y = 3
- },
-/obj/item/weapon/storage/box/flashshells{
- pixel_x = 1
- },
-/obj/item/weapon/storage/box/beanbags{
- pixel_x = 4;
- pixel_y = -5
- },
/obj/machinery/atmospherics/pipe/simple/hidden/purple{
dir = 6
},
/obj/effect/floor_decal/milspec/color/black,
+/obj/item/ammo_magazine/ammo_box/b12g/stunshell{
+ pixel_x = 3;
+ pixel_y = -3
+ },
+/obj/item/ammo_magazine/ammo_box/b12g/flash{
+ pixel_x = -1;
+ pixel_y = 2
+ },
+/obj/item/ammo_magazine/ammo_box/b12g/beanbag{
+ pixel_x = -5;
+ pixel_y = 7
+ },
/turf/simulated/floor/tiled/dark,
/area/security/armoury)
"zG" = (
diff --git a/maps/stellardelight/stellar_delight2.dmm b/maps/stellardelight/stellar_delight2.dmm
index 40257a3a9a7..65d09bbfc44 100644
--- a/maps/stellardelight/stellar_delight2.dmm
+++ b/maps/stellardelight/stellar_delight2.dmm
@@ -13513,12 +13513,12 @@
/area/storage/primary)
"Ez" = (
/obj/structure/table/woodentable,
-/obj/item/weapon/storage/box/beanbags,
/obj/item/weapon/gun/projectile/shotgun/doublebarrel,
/obj/item/weapon/paper{
info = "This permit signifies that the Bartender is permitted to posess this firearm in the bar, and ONLY the bar. Failure to adhere to this permit will result in confiscation of the weapon and possibly arrest.";
name = "Shotgun permit"
},
+/obj/item/ammo_magazine/ammo_box/b12g/beanbag,
/turf/simulated/floor/wood,
/area/stellardelight/deck2/barbackroom)
"EA" = (
diff --git a/maps/submaps/surface_submaps/wilderness/Rockybase.dmm b/maps/submaps/surface_submaps/wilderness/Rockybase.dmm
index 133fd1025f6..68a7dd05970 100644
--- a/maps/submaps/surface_submaps/wilderness/Rockybase.dmm
+++ b/maps/submaps/surface_submaps/wilderness/Rockybase.dmm
@@ -38,28 +38,28 @@
"aL" = (/obj/item/weapon/stool,/turf/simulated/floor/tiled,/area/submap/Rockybase)
"aM" = (/obj/item/weapon/storage/belt/janitor,/obj/structure/table/standard,/turf/simulated/floor/tiled,/area/submap/Rockybase)
"aN" = (/turf/simulated/floor/tiled,/area/submap/Rockybase)
-"aO" = (/obj/structure/table/standard,/obj/item/modular_computer/laptop/preset/custom_loadout/cheap,/obj/effect/floor_decal/corner/red/border{icon_state = "bordercolor"; dir = 9},/turf/simulated/floor/tiled,/area/submap/Rockybase)
-"aP" = (/obj/structure/table/standard,/obj/effect/floor_decal/corner/red/border{icon_state = "bordercolor"; dir = 1},/turf/simulated/floor/tiled,/area/submap/Rockybase)
-"aQ" = (/obj/structure/table/rack,/obj/item/weapon/gun/projectile/pistol,/obj/effect/floor_decal/corner/red/border{icon_state = "bordercolor"; dir = 1},/turf/simulated/floor/tiled,/area/submap/Rockybase)
-"aR" = (/obj/structure/table/rack,/obj/item/weapon/gun/energy/gun/taser,/obj/effect/floor_decal/corner/red/border{icon_state = "bordercolor"; dir = 1},/turf/simulated/floor/tiled,/area/submap/Rockybase)
-"aS" = (/obj/machinery/light{dir = 1},/obj/effect/floor_decal/corner/red/border{icon_state = "bordercolor"; dir = 1},/turf/simulated/floor/tiled,/area/submap/Rockybase)
-"aT" = (/obj/machinery/vending/coffee,/obj/effect/floor_decal/corner/red/border{icon_state = "bordercolor"; dir = 5},/turf/simulated/floor/tiled,/area/submap/Rockybase)
+"aO" = (/obj/structure/table/standard,/obj/item/modular_computer/laptop/preset/custom_loadout/cheap,/obj/effect/floor_decal/corner/red/border{dir = 9; icon_state = "bordercolor"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
+"aP" = (/obj/structure/table/standard,/obj/effect/floor_decal/corner/red/border{dir = 1; icon_state = "bordercolor"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
+"aQ" = (/obj/structure/table/rack,/obj/item/weapon/gun/projectile/pistol,/obj/effect/floor_decal/corner/red/border{dir = 1; icon_state = "bordercolor"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
+"aR" = (/obj/structure/table/rack,/obj/item/weapon/gun/energy/gun/taser,/obj/effect/floor_decal/corner/red/border{dir = 1; icon_state = "bordercolor"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
+"aS" = (/obj/machinery/light{dir = 1},/obj/effect/floor_decal/corner/red/border{dir = 1; icon_state = "bordercolor"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
+"aT" = (/obj/machinery/vending/coffee,/obj/effect/floor_decal/corner/red/border{dir = 5; icon_state = "bordercolor"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
"aU" = (/turf/simulated/floor/tiled/techfloor,/area/submap/Rockybase)
"aV" = (/obj/structure/table/rack,/obj/item/weapon/gun/projectile/shotgun/pump/combat,/obj/item/weapon/gun/projectile/shotgun/pump/combat,/turf/simulated/floor/tiled/techfloor,/area/submap/Rockybase)
-"aW" = (/obj/machinery/vending/hydronutrients,/obj/effect/floor_decal/corner/lime/border{icon_state = "bordercolor"; dir = 9},/turf/simulated/floor/tiled,/area/submap/Rockybase)
-"aX" = (/obj/structure/closet/crate/hydroponics,/obj/effect/floor_decal/corner/lime/border{icon_state = "bordercolor"; dir = 5},/turf/simulated/floor/tiled,/area/submap/Rockybase)
+"aW" = (/obj/machinery/vending/hydronutrients,/obj/effect/floor_decal/corner/lime/border{dir = 9; icon_state = "bordercolor"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
+"aX" = (/obj/structure/closet/crate/hydroponics,/obj/effect/floor_decal/corner/lime/border{dir = 5; icon_state = "bordercolor"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
"aY" = (/obj/machinery/shower{dir = 4; icon_state = "shower"; pixel_x = 5; pixel_y = 0},/obj/structure/curtain/open/shower,/turf/simulated/floor/tiled/hydro,/area/submap/Rockybase)
"aZ" = (/obj/machinery/shower{dir = 8; icon_state = "shower"; pixel_x = -5; pixel_y = 0},/obj/structure/curtain/open/shower,/turf/simulated/floor/tiled/hydro,/area/submap/Rockybase)
"ba" = (/obj/structure/janitorialcart,/turf/simulated/floor/tiled,/area/submap/Rockybase)
-"bb" = (/obj/structure/table/standard,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor/tiled,/area/submap/Rockybase)
+"bb" = (/obj/structure/table/standard,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
"bc" = (/obj/machinery/light/small{dir = 8},/turf/simulated/floor/tiled,/area/submap/Rockybase)
-"bd" = (/obj/structure/table/standard,/obj/item/weapon/paper{info = "Carl's absolutly fucked in the head. He's trying to squeeze as much drone production out as he can since he's worried we're gonna get found out but he's getting sloppier with each batch. Now's he's telling us he can speed the time on the IFF encoding. I already have a hard enough time getting these damn things not to stare at walls and now he's gonna shortchange the only part of these tincans that tells em not to turn us into paste on a wall. I told Richter to get out while he can, We're counting days before either some Sif task force shows up at our door or these things decide we aren't there friends anymore."; name = "Note"},/obj/effect/floor_decal/corner/red/border{icon_state = "bordercolor"; dir = 8},/turf/simulated/floor/tiled,/area/submap/Rockybase)
+"bd" = (/obj/structure/table/standard,/obj/item/weapon/paper{info = "Carl's absolutly fucked in the head. He's trying to squeeze as much drone production out as he can since he's worried we're gonna get found out but he's getting sloppier with each batch. Now's he's telling us he can speed the time on the IFF encoding. I already have a hard enough time getting these damn things not to stare at walls and now he's gonna shortchange the only part of these tincans that tells em not to turn us into paste on a wall. I told Richter to get out while he can, We're counting days before either some Sif task force shows up at our door or these things decide we aren't there friends anymore."; name = "Note"},/obj/effect/floor_decal/corner/red/border{dir = 8; icon_state = "bordercolor"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
"be" = (/obj/structure/bed/chair{dir = 8},/turf/simulated/floor/tiled,/area/submap/Rockybase)
"bf" = (/mob/living/simple_mob/mechanical/viscerator,/turf/simulated/floor/tiled,/area/submap/Rockybase)
-"bg" = (/obj/machinery/vending/security,/obj/effect/floor_decal/corner/red/border{icon_state = "bordercolor"; dir = 4},/turf/simulated/floor/tiled,/area/submap/Rockybase)
-"bh" = (/obj/structure/table/rack,/obj/item/weapon/storage/box/shotgunshells,/obj/item/weapon/storage/box/shotgunshells,/obj/item/weapon/cell/device/weapon,/turf/simulated/floor/tiled/techfloor,/area/submap/Rockybase)
-"bi" = (/obj/effect/floor_decal/corner/lime/border{icon_state = "bordercolor"; dir = 8},/turf/simulated/floor/tiled,/area/submap/Rockybase)
-"bj" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/effect/floor_decal/corner/lime/border{icon_state = "bordercolor"; dir = 4},/turf/simulated/floor/tiled,/area/submap/Rockybase)
+"bg" = (/obj/machinery/vending/security,/obj/effect/floor_decal/corner/red/border{dir = 4; icon_state = "bordercolor"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
+"bh" = (/obj/structure/table/rack,/obj/item/weapon/cell/device/weapon,/obj/item/ammo_magazine/ammo_box/b12g/pellet,/obj/item/ammo_magazine/ammo_box/b12g/pellet,/turf/simulated/floor/tiled/techfloor,/area/submap/Rockybase)
+"bi" = (/obj/effect/floor_decal/corner/lime/border{dir = 8; icon_state = "bordercolor"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
+"bj" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/effect/floor_decal/corner/lime/border{dir = 4; icon_state = "bordercolor"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
"bk" = (/obj/machinery/shower{dir = 8; icon_state = "shower"; pixel_x = -5; pixel_y = 0},/obj/structure/curtain/open/shower,/obj/machinery/light/small{dir = 4; pixel_y = 0},/turf/simulated/floor/tiled/hydro,/area/submap/Rockybase)
"bl" = (/obj/item/mecha_parts/part/gygax_left_leg,/turf/simulated/floor/holofloor/lino,/area/submap/Rockybase)
"bm" = (/obj/machinery/light,/turf/simulated/floor/holofloor/lino,/area/submap/Rockybase)
@@ -67,17 +67,17 @@
"bo" = (/obj/structure/closet/crate/trashcart,/turf/simulated/floor/tiled,/area/submap/Rockybase)
"bp" = (/obj/structure/loot_pile/maint/trash,/turf/simulated/floor/tiled,/area/submap/Rockybase)
"bq" = (/obj/structure/table/standard,/obj/item/weapon/storage/bag/trash,/obj/item/weapon/storage/bag/trash,/turf/simulated/floor/tiled,/area/submap/Rockybase)
-"br" = (/obj/structure/table/standard,/obj/item/weapon/paper_bin,/obj/effect/floor_decal/corner/red/border{icon_state = "bordercolor"; dir = 10},/turf/simulated/floor/tiled,/area/submap/Rockybase)
+"br" = (/obj/structure/table/standard,/obj/item/weapon/paper_bin,/obj/effect/floor_decal/corner/red/border{dir = 10; icon_state = "bordercolor"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
"bs" = (/obj/machinery/light,/obj/structure/table/standard,/obj/item/weapon/pen,/obj/effect/floor_decal/corner/red/border,/turf/simulated/floor/tiled,/area/submap/Rockybase)
"bt" = (/obj/effect/floor_decal/corner/red/border,/turf/simulated/floor/tiled,/area/submap/Rockybase)
"bu" = (/obj/effect/floor_decal/corner/red/border,/mob/living/simple_mob/mechanical/viscerator,/turf/simulated/floor/tiled,/area/submap/Rockybase)
"bv" = (/obj/machinery/door/airlock/security{icon_state = "door_locked"; locked = 1},/turf/simulated/floor/tiled/techfloor,/area/submap/Rockybase)
"bw" = (/obj/machinery/light,/turf/simulated/floor/tiled/techfloor,/area/submap/Rockybase)
"bx" = (/obj/structure/table/rack,/obj/item/weapon/gun/energy/ionrifle/pistol,/turf/simulated/floor/tiled/techfloor,/area/submap/Rockybase)
-"by" = (/obj/machinery/portable_atmospherics/hydroponics,/obj/effect/floor_decal/corner/lime/border{icon_state = "bordercolor"; dir = 4},/turf/simulated/floor/tiled,/area/submap/Rockybase)
+"by" = (/obj/machinery/portable_atmospherics/hydroponics,/obj/effect/floor_decal/corner/lime/border{dir = 4; icon_state = "bordercolor"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
"bz" = (/obj/machinery/door/airlock,/turf/simulated/floor/tiled,/area/submap/Rockybase)
-"bA" = (/obj/effect/floor_decal/corner/lime/border{icon_state = "bordercolor"; dir = 8},/mob/living/bot/farmbot{faction = "malf_drone"; name = "Mr. Weddleton"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
-"bB" = (/obj/machinery/portable_atmospherics/hydroponics,/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/effect/floor_decal/corner/lime/border{icon_state = "bordercolor"; dir = 4},/turf/simulated/floor/tiled,/area/submap/Rockybase)
+"bA" = (/obj/effect/floor_decal/corner/lime/border{dir = 8; icon_state = "bordercolor"},/mob/living/bot/farmbot{faction = "malf_drone"; name = "Mr. Weddleton"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
+"bB" = (/obj/machinery/portable_atmospherics/hydroponics,/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/effect/floor_decal/corner/lime/border{dir = 4; icon_state = "bordercolor"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
"bC" = (/obj/effect/decal/remains/posi,/turf/template_noop,/area/template_noop)
"bD" = (/obj/machinery/vending/cola,/obj/effect/floor_decal/borderfloor{dir = 1},/turf/simulated/floor/tiled,/area/submap/Rockybase)
"bE" = (/obj/effect/floor_decal/borderfloor{dir = 1},/turf/simulated/floor/tiled,/area/submap/Rockybase)
@@ -156,20 +156,20 @@
"cZ" = (/obj/item/mecha_parts/part/gygax_armour,/turf/simulated/floor,/area/submap/Rockybase)
"da" = (/obj/item/mecha_parts/chassis/gygax,/turf/simulated/floor/tiled,/area/submap/Rockybase)
"dc" = (/obj/effect/floor_decal/industrial/hatch/yellow,/turf/simulated/floor/tiled,/area/submap/Rockybase)
-"dd" = (/obj/machinery/vending/robotics,/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor/tiled,/area/submap/Rockybase)
+"dd" = (/obj/machinery/vending/robotics,/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
"de" = (/obj/machinery/power/apc{cell_type = /obj/item/weapon/cell/super; dir = 8; name = "Unknown APC"; pixel_x = -24},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
"df" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
"dg" = (/obj/effect/decal/cleanable/dirt,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
-"dh" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
+"dh" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
"di" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/blood,/turf/simulated/floor,/area/submap/Rockybase)
-"dj" = (/obj/item/mecha_parts/part/gygax_right_leg,/obj/effect/floor_decal/corner/lime/border{icon_state = "bordercolor"; dir = 4},/turf/simulated/floor/tiled,/area/submap/Rockybase)
+"dj" = (/obj/item/mecha_parts/part/gygax_right_leg,/obj/effect/floor_decal/corner/lime/border{dir = 4; icon_state = "bordercolor"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
"dk" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/item/mecha_parts/part/gygax_left_arm,/turf/simulated/floor/tiled/hydro,/area/submap/Rockybase)
"dl" = (/obj/machinery/vending,/turf/simulated/floor/tiled,/area/submap/Rockybase)
"dm" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
"dn" = (/obj/machinery/power/smes/buildable/point_of_interest,/obj/structure/cable/green,/turf/simulated/floor,/area/submap/Rockybase)
"do" = (/obj/machinery/light{dir = 8},/obj/structure/closet/secure_closet/medical3,/turf/simulated/floor/tiled,/area/submap/Rockybase)
"dp" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/mob/living/simple_mob/mechanical/combat_drone/lesser,/turf/simulated/floor/tiled,/area/submap/Rockybase)
-"dq" = (/obj/structure/closet/secure_closet/hydroponics,/obj/effect/floor_decal/corner/lime/border{icon_state = "bordercolor"; dir = 4},/turf/simulated/floor/tiled,/area/submap/Rockybase)
+"dq" = (/obj/structure/closet/secure_closet/hydroponics,/obj/effect/floor_decal/corner/lime/border{dir = 4; icon_state = "bordercolor"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
"dr" = (/obj/effect/decal/cleanable/blood/oil,/turf/template_noop,/area/template_noop)
"ds" = (/obj/machinery/light,/turf/simulated/floor/tiled,/area/submap/Rockybase)
"dt" = (/obj/machinery/mech_recharger,/turf/simulated/floor/tiled,/area/submap/Rockybase)
@@ -181,8 +181,8 @@
"dz" = (/obj/item/weapon/surgical/surgicaldrill,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled,/area/submap/Rockybase)
"dA" = (/obj/structure/loot_pile/maint/technical,/turf/simulated/floor/tiled,/area/submap/Rockybase)
"dB" = (/obj/effect/decal/cleanable/dirt,/mob/living/bot/medbot{faction = "malf_drone"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
-"dC" = (/obj/machinery/vending/hydroseeds,/obj/effect/floor_decal/corner/lime/border{icon_state = "bordercolor"; dir = 10},/turf/simulated/floor/tiled,/area/submap/Rockybase)
-"dD" = (/obj/structure/closet/crate/secure/hydrosec,/obj/effect/floor_decal/corner/lime/border{icon_state = "bordercolor"; dir = 6},/turf/simulated/floor/tiled,/area/submap/Rockybase)
+"dC" = (/obj/machinery/vending/hydroseeds,/obj/effect/floor_decal/corner/lime/border{dir = 10; icon_state = "bordercolor"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
+"dD" = (/obj/structure/closet/crate/secure/hydrosec,/obj/effect/floor_decal/corner/lime/border{dir = 6; icon_state = "bordercolor"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
"dE" = (/obj/machinery/portable_atmospherics/hydroponics/soil,/obj/structure/gravemarker{dir = 1},/turf/template_noop,/area/template_noop)
"dF" = (/obj/effect/gibspawner/robot,/turf/template_noop,/area/template_noop)
"dG" = (/obj/effect/gibspawner/human,/turf/template_noop,/area/template_noop)
diff --git a/maps/submaps/surface_submaps/wilderness/deathden.dmm b/maps/submaps/surface_submaps/wilderness/deathden.dmm
index bf2542946f5..d0bbccc747e 100644
--- a/maps/submaps/surface_submaps/wilderness/deathden.dmm
+++ b/maps/submaps/surface_submaps/wilderness/deathden.dmm
@@ -67,7 +67,7 @@
"wK" = (/obj/structure/window/reinforced/tinted/frosted{dir = 1},/obj/structure/table/wooden_reinforced,/obj/random/soap,/obj/item/weapon/flame/candle/everburn,/turf/simulated/floor/tiled/freezer,/area/submap/DeathDen)
"xN" = (/obj/structure/loot_pile/maint/technical,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/DeathDen)
"xS" = (/mob/living/simple_mob/animal/sif/savik{health = 200; melee_damage_lower = 20; melee_damage_upper = 40; name = "alpha savik"},/turf/simulated/floor/carpet/turcarpet,/area/submap/DeathDen)
-"xZ" = (/obj/item/weapon/storage/box/shotgunammo/large,/turf/simulated/floor/wood/sif,/area/submap/DeathDen)
+"xZ" = (/obj/item/ammo_magazine/ammo_box/b12g/pellet,/obj/item/ammo_magazine/ammo_box/b12g/pellet,/turf/simulated/floor/wood/sif,/area/submap/DeathDen)
"yn" = (/turf/simulated/floor/outdoors/dirt,/area/template_noop)
"yL" = (/obj/structure/table/wooden_reinforced,/obj/item/weapon/flame/candle/everburn,/obj/item/weapon/material/shard{pixel_x = -3; pixel_y = -6},/obj/item/weapon/material/shard{pixel_x = 6; pixel_y = -6},/turf/simulated/floor/wood/sif,/area/submap/DeathDen)
"yS" = (/obj/item/weapon/reagent_containers/food/snacks/candy_corn{pixel_x = 6; pixel_y = 4},/obj/effect/floor_decal/carpet{dir = 8},/obj/random/maintenance/engineering,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/carpet/turcarpet,/area/submap/DeathDen)
diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm
index a92c25c0643..cdba4f64c5e 100644
--- a/maps/tether/tether-01-surface1.dmm
+++ b/maps/tether/tether-01-surface1.dmm
@@ -35167,14 +35167,6 @@
/area/tether/surfacebase/surface_one_hall)
"lSW" = (
/obj/structure/table/reinforced,
-/obj/item/weapon/storage/box/blanks{
- pixel_x = 2;
- pixel_y = -2
- },
-/obj/item/weapon/storage/box/blanks{
- pixel_x = 2;
- pixel_y = -2
- },
/obj/item/ammo_magazine/clip/c762/practice,
/obj/item/ammo_magazine/clip/c762/practice,
/obj/machinery/recharger/wallcharger{
@@ -35189,6 +35181,8 @@
/obj/item/ammo_magazine/m45/practice,
/obj/item/ammo_magazine/m9mmt/practice,
/obj/item/ammo_magazine/m9mmt/practice,
+/obj/item/ammo_magazine/ammo_box/b12g/blank,
+/obj/item/ammo_magazine/ammo_box/b12g/blank,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/weaponsrange)
"lTn" = (
diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm
index f9fd05e2ab0..cbc8186c5fd 100644
--- a/maps/tether/tether-02-surface2.dmm
+++ b/maps/tether/tether-02-surface2.dmm
@@ -4826,19 +4826,19 @@
/area/tether/surfacebase/security/armory)
"ahA" = (
/obj/structure/table/steel,
-/obj/item/weapon/storage/box/shotgunshells{
- pixel_x = -2;
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/item/ammo_magazine/ammo_box/b12g/pellet{
+ pixel_x = 3;
+ pixel_y = -3
+ },
+/obj/item/ammo_magazine/ammo_box/b12g/pellet{
+ pixel_x = -1;
+ pixel_y = 2
+ },
+/obj/item/ammo_magazine/ammo_box/b12g/pellet{
+ pixel_x = -5;
pixel_y = 7
},
-/obj/item/weapon/storage/box/shotgunshells{
- pixel_x = 2;
- pixel_y = 3
- },
-/obj/item/weapon/storage/box/shotgunshells{
- pixel_x = 6;
- pixel_y = -1
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/tiled/dark,
/area/tether/surfacebase/security/armory)
"ahB" = (
@@ -6064,20 +6064,21 @@
/area/tether/surfacebase/security/outfitting/storage)
"ajs" = (
/obj/structure/table/steel,
-/obj/item/weapon/storage/box/stunshells{
- pixel_x = 3;
- pixel_y = 3
- },
-/obj/item/weapon/storage/box/flashshells{
- pixel_x = 1
- },
-/obj/item/weapon/storage/box/beanbags{
- pixel_x = 4;
- pixel_y = -5
- },
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
+/obj/item/ammo_magazine/ammo_box/b12g/beanbag{
+ pixel_x = 3;
+ pixel_y = -3
+ },
+/obj/item/ammo_magazine/ammo_box/b12g/flash{
+ pixel_x = -1;
+ pixel_y = 2
+ },
+/obj/item/ammo_magazine/ammo_box/b12g/stunshell{
+ pixel_x = -5;
+ pixel_y = 7
+ },
/turf/simulated/floor/tiled/dark,
/area/tether/surfacebase/security/armory)
"ajt" = (
diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm
index 3a8133e1c91..8334e042a59 100644
--- a/maps/tether/tether-03-surface3.dmm
+++ b/maps/tether/tether-03-surface3.dmm
@@ -31914,12 +31914,12 @@
/area/hallway/lower/third_south)
"bcu" = (
/obj/structure/table/woodentable,
-/obj/item/weapon/storage/box/beanbags,
/obj/item/weapon/gun/projectile/shotgun/doublebarrel,
/obj/item/weapon/paper{
info = "This permit signifies that the Bartender is permitted to posess this firearm in the bar, and ONLY the bar. Failure to adhere to this permit will result in confiscation of the weapon and possibly arrest.";
name = "Shotgun permit"
},
+/obj/item/ammo_magazine/ammo_box/b12g/beanbag,
/turf/simulated/floor/wood,
/area/tether/surfacebase/bar_backroom)
"bcv" = (