Merge branch 'master' into e40

Signed-off-by: generalthrax <[email protected]>
shiptest-ss13 · Oct 13, 2024 · 801353a · 801353a
2 parents a7d7c81 + 7ebffef
commit 801353a
Show file tree

Hide file tree

Showing 158 changed files with 2,162 additions and 1,246 deletions.
diff --git a/_maps/RandomRuins/BeachRuins/beach_ancient_ruin.dmm b/_maps/RandomRuins/BeachRuins/beach_ancient_ruin.dmm
@@ -373,7 +373,7 @@
 	name = "charge rifle"
 	},
 /obj/item/gun/energy/lasercannon{
-	pixel_y = 5;
+	pixel_y = 5
 	},
 /obj/item/gun/energy/lasercannon,
 /obj/effect/turf_decal/industrial/hatch,

diff --git a/_maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm b/_maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm
@@ -67,6 +67,11 @@
 	},
 /turf/open/water/beach/deep,
 /area/overmap_encounter/planetoid/beachplanet/explored)
+"eB" = (
+/obj/item/storage/box/ammo/c38,
+/obj/structure/closet/crate/wooden,
+/turf/open/floor/wood,
+/area/ruin/beach)
 "eJ" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 5
@@ -200,12 +205,6 @@
 /obj/structure/railing/corner,
 /turf/open/water/beach/deep,
 /area/overmap_encounter/planetoid/beachplanet/explored)
-"kj" = (
-/obj/structure/closet/cabinet,
-/obj/item/pneumatic_cannon/speargun,
-/obj/item/melee/knife/hunting,
-/turf/open/floor/wood,
-/area/ruin/beach)
 "kr" = (
 /obj/effect/turf_decal/weather/sand/corner{
 	dir = 1
@@ -280,11 +279,6 @@
 	},
 /turf/open/floor/plating/asteroid/sand,
 /area/overmap_encounter/planetoid/cave/explored)
-"mq" = (
-/obj/item/ammo_box/c38_box,
-/obj/structure/closet/crate/wooden,
-/turf/open/floor/wood,
-/area/ruin/beach)
 "my" = (
 /obj/effect/turf_decal/weather/sand{
 	dir = 5
@@ -745,12 +739,27 @@
 	},
 /turf/open/floor/wood/ebony,
 /area/overmap_encounter/planetoid/beachplanet/explored)
+"CJ" = (
+/obj/structure/closet/cabinet,
+/obj/item/pneumatic_cannon/speargun,
+/obj/item/melee/knife/hunting,
+/obj/machinery/light/small/directional/east{
+	light_color = "#d8b1b1"
+	},
+/turf/open/floor/wood,
+/area/ruin/beach)
 "CV" = (
 /obj/machinery/grill,
 /obj/effect/turf_decal/corner/opaque/pink/diagonal,
 /obj/effect/decal/cleanable/cobweb,
 /turf/open/floor/plastic,
 /area/ruin/beach)
+"DG" = (
+/obj/structure/closet/cabinet,
+/obj/item/pneumatic_cannon/speargun,
+/obj/item/melee/knife/hunting,
+/turf/open/floor/wood,
+/area/ruin/beach)
 "DL" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 4
@@ -1047,15 +1056,6 @@
 /obj/effect/turf_decal/siding/white/corner,
 /turf/open/water/beach,
 /area/overmap_encounter/planetoid/beachplanet/explored)
-"PB" = (
-/obj/structure/closet/cabinet,
-/obj/item/pneumatic_cannon/speargun,
-/obj/item/melee/knife/hunting,
-/obj/machinery/light/small/directional/east{
-	light_color = "#d8b1b1"
-	},
-/turf/open/floor/wood,
-/area/ruin/beach)
 "PC" = (
 /obj/effect/turf_decal/weather/sand{
 	dir = 10
@@ -2186,9 +2186,9 @@ sz
 ut
 Ty
 oS
-mq
-kj
-PB
+eB
+DG
+CJ
 ut
 BW
 BN

diff --git a/_maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm b/_maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm
@@ -666,13 +666,8 @@
 /obj/structure/table/reinforced{
 	color = "#c1b6a5"
 	},
-/obj/item/ammo_box/c38_box{
-	pixel_x = 10;
-	pixel_y = 8
-	},
-/obj/item/ammo_box/c38_box{
-	pixel_x = 10
-	},
+/obj/item/storage/box/ammo/c38,
+/obj/item/storage/box/ammo/c38,
 /obj/structure/sign/poster/contraband/energy_swords{
 	pixel_x = -32
 	},

diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm
@@ -383,7 +383,7 @@
 "EF" = (
 /obj/effect/decal/cleanable/blood/gibs/torso,
 /obj/structure/safe,
-/obj/item/ammo_box/a12g/slug,
+/obj/item/storage/box/ammo/a12g_slug,
 /obj/item/melee/knife/combat,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,

diff --git a/_maps/RandomRuins/JungleRuins/jungle_interceptor.dmm b/_maps/RandomRuins/JungleRuins/jungle_interceptor.dmm
@@ -3050,7 +3050,7 @@
 /obj/item/clothing/under/rank/security/officer/blueshirt,
 /obj/item/clothing/gloves/combat,
 /obj/item/clothing/shoes/jackboots,
-/obj/item/ammo_box/c9mm,
+/obj/item/storage/box/ammo/c9mm,
 /obj/machinery/light/small/broken/directional/north,
 /obj/effect/turf_decal/corner/transparent/bar/three_quarters{
 	dir = 4

diff --git a/_maps/RandomRuins/LavaRuins/lavaland_crashed_starwalker.dmm b/_maps/RandomRuins/LavaRuins/lavaland_crashed_starwalker.dmm
@@ -92,7 +92,7 @@
 	name = "armory locker";
 	req_one_access_txt = "1"
 	},
-/obj/item/ammo_box/a12g,
+/obj/item/storage/box/ammo/a12g_buckshot,
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/unpowered/crashed_starwalker)
 "bL" = (
@@ -942,7 +942,7 @@
 /obj/effect/turf_decal/industrial/outline/yellow,
 /obj/effect/decal/cleanable/cobweb/cobweb2,
 /obj/structure/closet/crate/secure/gear,
-/obj/item/ammo_box/c10mm/surplus,
+/obj/item/storage/box/ammo/c10mm_surplus,
 /obj/item/weaponcrafting/stock,
 /obj/item/weaponcrafting/stock{
 	pixel_x = -6

diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_lava_canyon.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_lava_canyon.dmm
@@ -883,7 +883,7 @@
 /area/overmap_encounter/planetoid/lava/explored)
 "zb" = (
 /mob/living/simple_animal/hostile/megafauna/blood_drunk_miner{
-	loot = list(/obj/item/melee/transforming/cleaving_saw,/obj/item/gun/energy/kinetic_accelerator,/obj/item/keycard/gatedrop/lavacanyon);
+	loot = list(/obj/item/melee/transforming/cleaving_saw,/obj/item/gun/energy/kinetic_accelerator,/obj/item/keycard/gatedrop/lavacanyon)
 	},
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/overmap_encounter/planetoid/cave/explored)

diff --git a/_maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm b/_maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm
@@ -2745,7 +2745,7 @@
 /area/ruin/rockplanet/nanotrasen)
 "WY" = (
 /obj/structure/frame/computer{
-	dir = 1;
+	dir = 1
 	},
 /obj/effect/turf_decal/corner/opaque/red/diagonal,
 /turf/open/floor/plasteel/tech/techmaint,

diff --git a/_maps/RandomRuins/RockRuins/rockplanet_distillery.dmm b/_maps/RandomRuins/RockRuins/rockplanet_distillery.dmm
@@ -3086,7 +3086,7 @@
 	pixel_x = -3
 	},
 /obj/item/ammo_box/magazine/illestren_a850r,
-/obj/item/ammo_box/c9mm/ap,
+/obj/item/storage/box/ammo/c9mm/ap,
 /obj/item/ammo_box/magazine/illestren_a850r,
 /obj/item/ammo_box/magazine/co9mm{
 	start_empty = 1

diff --git a/_maps/RandomRuins/RockRuins/rockplanet_harmfactory.dmm b/_maps/RandomRuins/RockRuins/rockplanet_harmfactory.dmm
@@ -1862,10 +1862,7 @@
 	pixel_x = 5;
 	pixel_y = 7
 	},
-/obj/item/ammo_box/foambox/riot{
-	pixel_x = -3;
-	pixel_y = -3
-	},
+/obj/item/storage/box/ammo/foam_darts/riot,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},

diff --git a/_maps/RandomRuins/SandRuins/whitesands_surface_camp_combination.dmm b/_maps/RandomRuins/SandRuins/whitesands_surface_camp_combination.dmm
@@ -1301,7 +1301,7 @@
 "XP" = (
 /obj/structure/table,
 /obj/item/trash/can,
-/obj/item/ammo_box/c45/surplus,
+/obj/item/storage/box/ammo/c45_surplus,
 /turf/open/floor/concrete,
 /area/ruin)
 "XS" = (

diff --git a/_maps/RandomRuins/SpaceRuins/power_puzzle.dmm b/_maps/RandomRuins/SpaceRuins/power_puzzle.dmm
@@ -2694,8 +2694,8 @@
 /obj/structure/closet/crate/secure/weapon{
 	name = "Ammo Crate"
 	},
-/obj/item/ammo_box/c9mm/surplus,
-/obj/item/ammo_box/c9mm/surplus,
+/obj/item/storage/box/ammo/c9mm_surplus,
+/obj/item/storage/box/ammo/c9mm_surplus,
 /obj/item/ammo_box/magazine/co9mm,
 /obj/item/ammo_box/magazine/co9mm,
 /turf/open/floor/plasteel,

diff --git a/_maps/RandomRuins/SpaceRuins/spacemall.dmm b/_maps/RandomRuins/SpaceRuins/spacemall.dmm
@@ -320,7 +320,7 @@
 /obj/item/toy/talking/AI{
 	pixel_x = 20
 	},
-/obj/item/ammo_box/foambox/riot,
+/obj/item/storage/box/ammo/foam_darts/riot,
 /obj/item/gun/ballistic/shotgun/toy,
 /turf/open/floor/light,
 /area/ruin/space/has_grav/spacemall/shop2)
@@ -2434,7 +2434,7 @@
 /area/ruin/space/has_grav/spacemall)
 "jm" = (
 /obj/structure/rack,
-/obj/item/ammo_box/c9mm,
+/obj/item/storage/box/ammo/c9mm,
 /obj/item/ammo_box/magazine/co9mm{
 	pixel_x = 5
 	},

diff --git a/_maps/RandomRuins/WasteRuins/wasteplanet_lab.dmm b/_maps/RandomRuins/WasteRuins/wasteplanet_lab.dmm
@@ -118,13 +118,13 @@
 /area/ruin/powered)
 "gw" = (
 /obj/structure/table,
-/obj/item/ammo_box/c45,
+/obj/item/storage/box/ammo/c45,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/mono/white,
 /area/ruin/powered)
 "gx" = (
 /obj/structure/table,
-/obj/item/ammo_box/c9mm/rubbershot,
+/obj/item/storage/box/ammo/c9mm_rubber,
 /turf/open/floor/plasteel/mono/white,
 /area/ruin/powered)
 "gz" = (

diff --git a/_maps/RandomRuins/WasteRuins/wasteplanet_pandora.dmm b/_maps/RandomRuins/WasteRuins/wasteplanet_pandora.dmm
@@ -23,7 +23,7 @@
 /area/ruin/wasteplanet)
 "bc" = (
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/item/ammo_box/c9mm,
+/obj/item/storage/box/ammo/c9mm,
 /turf/open/floor/plating/wasteplanet,
 /area/ruin/wasteplanet)
 "bd" = (

diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm
@@ -272,9 +272,9 @@
 	dir = 9
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/item/ammo_box/c38_box,
-/obj/item/ammo_box/c38_box,
-/obj/item/ammo_box/c38_box,
+/obj/item/storage/box/ammo/c38,
+/obj/item/storage/box/ammo/c38,
+/obj/item/storage/box/ammo/c38,
 /obj/structure/closet/crate/secure/plasma{
 	name = "ammo crate";
 	desc = "A secure ammo crate."

diff --git a/_maps/shuttles/independent/independent_kilo.dmm b/_maps/shuttles/independent/independent_kilo.dmm
@@ -661,7 +661,7 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 8
 	},
-/obj/item/ammo_box/a12g/rubbershot,
+/obj/item/storage/box/ammo/a12g_rubbershot,
 /obj/item/gun/ballistic/shotgun/doublebarrel/presawn{
 	spawnwithmagazine = 0
 	},
@@ -1875,7 +1875,7 @@
 	icon_state = "9-10"
 	},
 /obj/effect/decal/cleanable/oil,
-/obj/item/ammo_box/a12g,
+/obj/item/storage/box/ammo/a12g_buckshot,
 /obj/item/gun/ballistic/shotgun/doublebarrel/no_mag,
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)

diff --git a/_maps/shuttles/independent/independent_rigger.dmm b/_maps/shuttles/independent/independent_rigger.dmm
@@ -4132,7 +4132,7 @@
 	name = "ammunition locker";
 	req_access_txt = "1"
 	},
-/obj/item/ammo_box/c38_box,
+/obj/item/storage/box/ammo/c38,
 /obj/item/ammo_box/magazine/m45/rubber,
 /obj/item/ammo_box/magazine/m45/rubber,
 /obj/item/ammo_box/magazine/m45,

diff --git a/_maps/shuttles/independent/independent_shetland.dmm b/_maps/shuttles/independent/independent_shetland.dmm
@@ -3475,7 +3475,7 @@
 	req_access_txt = "1";
 	req_ship_access = 1
 	},
-/obj/item/ammo_box/c38_box,
+/obj/item/storage/box/ammo/c38,
 /obj/effect/turf_decal/box,
 /obj/item/ammo_box/c38,
 /obj/item/ammo_box/c38,

diff --git a/_maps/shuttles/inteq/inteq_hound.dmm b/_maps/shuttles/inteq/inteq_hound.dmm
@@ -50,10 +50,7 @@
 	pixel_x = -11;
 	pixel_y = 5
 	},
-/obj/item/ammo_box/a762_40/inteq{
-	pixel_x = 5;
-	pixel_y = 12
-	},
+/obj/item/storage/box/ammo/a762_40/inteq,
 /obj/item/reagent_containers/food/drinks/bottle/whiskey{
 	pixel_x = -7;
 	pixel_y = 6

diff --git a/_maps/shuttles/inteq/inteq_valor.dmm b/_maps/shuttles/inteq/inteq_valor.dmm
@@ -5074,14 +5074,8 @@
 /obj/effect/turf_decal/corner/opaque/yellow,
 /obj/structure/rack,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/obj/item/ammo_box/c9mm/rubbershot{
-	pixel_x = 5;
-	pixel_y = 10
-	},
-/obj/item/ammo_box/c9mm{
-	pixel_x = -2;
-	pixel_y = 2
-	},
+/obj/item/storage/box/ammo/c9mm_rubber,
+/obj/item/storage/box/ammo/c9mm,
 /obj/machinery/light/small/directional/north,
 /obj/structure/sign/poster/official/safety_report{
 	pixel_x = 32

diff --git a/_maps/shuttles/nanotrasen/nanotrasen_harrier.dmm b/_maps/shuttles/nanotrasen/nanotrasen_harrier.dmm
@@ -5189,9 +5189,9 @@
 /obj/item/reagent_containers/spray/pepper,
 /obj/item/ammo_box/magazine/co9mm,
 /obj/item/ammo_box/magazine/co9mm,
-/obj/item/ammo_box/c9mm,
-/obj/item/ammo_box/c9mm,
-/obj/item/ammo_box/c9mm/rubbershot,
+/obj/item/storage/box/ammo/c9mm,
+/obj/item/storage/box/ammo/c9mm,
+/obj/item/storage/box/ammo/c9mm_rubber,
 /obj/effect/turf_decal/trimline/opaque/vired/line,
 /obj/item/storage/belt/security,
 /obj/item/melee/knife/survival,

diff --git a/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm b/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm
@@ -13072,22 +13072,10 @@
 	pixel_x = 5;
 	pixel_y = 4
 	},
-/obj/item/ammo_box/c9mm{
-	pixel_x = 4;
-	pixel_y = -6
-	},
-/obj/item/ammo_box/c9mm{
-	pixel_x = 4;
-	pixel_y = 1
-	},
-/obj/item/ammo_box/c9mm{
-	pixel_x = 4;
-	pixel_y = 9
-	},
-/obj/item/ammo_box/c9mm/ap{
-	pixel_y = 17;
-	pixel_x = 4
-	},
+/obj/item/storage/box/ammo/c9mm,
+/obj/item/storage/box/ammo/c9mm,
+/obj/item/storage/box/ammo/c9mm,
+/obj/item/storage/box/ammo/c9mm/ap,
 /obj/item/stock_parts/cell/gun{
 	pixel_x = -3;
 	pixel_y = -5

diff --git a/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm b/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm
@@ -1750,11 +1750,11 @@
 /obj/structure/chair/handrail{
 	dir = 4
 	},
-/obj/item/ammo_box/c9mm,
-/obj/item/ammo_box/c9mm,
-/obj/item/ammo_box/c9mm/rubbershot,
-/obj/item/ammo_box/c9mm,
-/obj/item/ammo_box/c9mm,
+/obj/item/storage/box/ammo/c9mm,
+/obj/item/storage/box/ammo/c9mm,
+/obj/item/storage/box/ammo/c9mm_rubber,
+/obj/item/storage/box/ammo/c9mm,
+/obj/item/storage/box/ammo/c9mm,
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 10
 	},