Fully working + Updatepaths

shiptest-ss13 · Oct 5, 2024 · 8922a42 · 8922a42
1 parent 98f0c9a
commit 8922a42
Show file tree

Hide file tree

Showing 49 changed files with 1,017 additions and 621 deletions.
diff --git a/_maps/RandomRuins/BeachRuins/beach_ancient_ruin.dmm b/_maps/RandomRuins/BeachRuins/beach_ancient_ruin.dmm
@@ -374,6 +374,7 @@
 	},
 /obj/item/gun/energy/lasercannon{
 	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
@@ -282,7 +282,7 @@
 /turf/open/floor/plating/asteroid/sand,
 /area/overmap_encounter/planetoid/cave/explored)
 "mq" = (
-/obj/item/ammo_box/c38_box,
+/obj/item/storage/box/ammo/c38,
 /obj/structure/closet/crate/wooden,
 /turf/open/floor/wood,
 /area/ruin/beach)

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/kitchen/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
@@ -888,6 +888,7 @@
 "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);
+
 	},
 /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
@@ -2746,6 +2746,7 @@
 "WY" = (
 /obj/structure/frame/computer{
 	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
@@ -256,10 +256,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
@@ -1302,7 +1302,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/corporate_mining.dmm b/_maps/RandomRuins/SpaceRuins/corporate_mining.dmm
@@ -2035,10 +2035,6 @@
 /obj/effect/decal/cleanable/blood/drip,
 /turf/open/floor/plating/asteroid/airless,
 /area/ruin/space)
-"TO" = (
-/obj/structure/spawner/burrow/asteroid,
-/turf/open/floor/plating/asteroid/airless,
-/area/ruin/space)
 "TR" = (
 /obj/effect/decal/cleanable/blood/tracks{
 	dir = 8
@@ -2803,7 +2799,7 @@ Al
 Al
 Al
 VM
-TO
+Iv
 Al
 Al
 Al

diff --git a/_maps/RandomRuins/SpaceRuins/onehalf.dmm b/_maps/RandomRuins/SpaceRuins/onehalf.dmm
@@ -2034,12 +2034,6 @@
 	},
 /turf/open/space,
 /area/space/nearstation)
-"Ra" = (
-/obj/structure/frame/computer{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/ruin/space/has_grav/onehalf)
 "Rv" = (
 /obj/effect/turf_decal/siding/wood,
 /turf/open/floor/wood/airless{
@@ -3328,7 +3322,7 @@ UM
 cp
 ZX
 Gv
-Ra
+Gv
 cU
 YE
 bU

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)
@@ -2437,7 +2437,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/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
@@ -3043,10 +3043,6 @@
 /obj/structure/table/wood,
 /turf/open/floor/plasteel,
 /area/wizard_station)
-"aEX" = (
-/obj/structure/table/wood,
-/turf/open/floor/plasteel,
-/area/wizard_station)
 "aEY" = (
 /obj/structure/table/wood,
 /obj/item/bikehorn/golden{
@@ -23766,7 +23762,7 @@ auE
 aEc
 auE
 aAx
-aEX
+aEW
 aqZ
 aqZ
 aGr

diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm
@@ -1640,9 +1640,9 @@
 /obj/item/kinetic_crusher,
 /obj/effect/turf_decal/box,
 /obj/item/vending_refill/mining_equipment,
-/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/machinery/atmospherics/components/unary/vent_pump/on/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 9

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
@@ -3390,7 +3390,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,7 +50,7 @@
 	pixel_x = -11;
 	pixel_y = 5
 	},
-/obj/item/ammo_box/a762_40/inteq{
+/obj/item/storage/box/ammo/a762_40/inteq{
 	pixel_x = 5;
 	pixel_y = 12
 	},

diff --git a/_maps/shuttles/inteq/inteq_valor.dmm b/_maps/shuttles/inteq/inteq_valor.dmm
@@ -4887,14 +4887,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/inteq/inteq_vaquero.dmm b/_maps/shuttles/inteq/inteq_vaquero.dmm
@@ -266,6 +266,7 @@
 /obj/item/gun/ballistic/shotgun/bulldog/inteq/no_mag{
 	pixel_x = -4;
 	pixel_y = 5;
+
 	},
 /obj/item/gun/ballistic/automatic/pistol/commander/inteq,
 /obj/item/gun/ballistic/automatic/pistol/commander/inteq{

diff --git a/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm b/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm
@@ -13071,22 +13071,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
@@ -187,8 +187,8 @@
 /obj/structure/railing{
 	dir = 4
 	},
-/obj/item/ammo_box/c9mm,
-/obj/item/ammo_box/c9mm,
+/obj/item/storage/box/ammo/c9mm,
+/obj/item/storage/box/ammo/c9mm,
 /obj/item/ammo_box/magazine/co9mm,
 /obj/item/storage/belt/security/webbing,
 /obj/item/storage/pistolcase/commander,
@@ -3127,9 +3127,9 @@
 	pixel_x = 7;
 	pixel_y = -20
 	},
-/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/item/ammo_box/magazine/co9mm,
 /obj/item/storage/pistolcase/commander,
 /obj/item/storage/pistolcase/egun,

diff --git a/_maps/shuttles/pirate/pirate_tortuga.dmm b/_maps/shuttles/pirate/pirate_tortuga.dmm
@@ -667,10 +667,7 @@
 /area/ship/security/armory)
 "hU" = (
 /obj/structure/rack,
-/obj/item/ammo_box/c45{
-	pixel_x = -9;
-	pixel_y = 8
-	},
+/obj/item/storage/box/ammo/c45,
 /obj/item/storage/toolbox/ammo/a762_40{
 	pixel_x = 5;
 	pixel_y = 6
@@ -3141,7 +3138,7 @@
 /obj/item/clothing/shoes/jackboots{
 	pixel_y = -13
 	},
-/obj/item/ammo_box/c38_box/surplus,
+/obj/item/storage/box/ammo/c38_surplus,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/carpet/nanoweave,
 /area/ship/crew/crewtwo)