From cf958211de01f7e9b728cbde536d7ac00fe86a83 Mon Sep 17 00:00:00 2001 From: WJohn Date: Sat, 21 Jul 2018 00:29:48 -0400 Subject: [PATCH] Rebalances the deep space storage bunker space ruin. (#39186) * Rebalances the deep space storage bunker space ruin. * Re-adds the food and supply canisters that were taken out, but keeps them neatly stacked. * Whoops extra crates --- _maps/RandomRuins/SpaceRuins/deepstorage.dmm | 188 ++++++++++++++----- 1 file changed, 140 insertions(+), 48 deletions(-) diff --git a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm index e3317ad64e9..fd7d3a40cf7 100644 --- a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm +++ b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm @@ -346,13 +346,16 @@ /area/ruin/space/has_grav/deepstorage/storage) "aW" = ( /obj/structure/closet/cardboard, -/obj/item/ammo_box/c9mm, -/obj/item/ammo_box/c9mm, -/obj/item/ammo_box/c9mm, -/obj/item/ammo_box/c9mm, -/obj/item/ammo_box/c9mm, -/obj/item/ammo_box/c9mm, /obj/effect/turf_decal/delivery, +/obj/item/ammo_box/magazine/pistolm9mm{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/ammo_box/magazine/pistolm9mm, +/obj/item/ammo_box/magazine/pistolm9mm{ + pixel_x = 3; + pixel_y = -3 + }, /turf/open/floor/plasteel/floorgrime, /area/ruin/space/has_grav/deepstorage/storage) "aX" = ( @@ -701,15 +704,31 @@ /area/ruin/space/has_grav/deepstorage/hydroponics) "bT" = ( /obj/effect/turf_decal/delivery, +/obj/item/reagent_containers/food/snacks/beans{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/reagent_containers/food/snacks/beans{ + pixel_x = 2; + pixel_y = 3 + }, +/obj/item/reagent_containers/food/snacks/beans{ + pixel_x = -2 + }, +/obj/item/reagent_containers/food/snacks/beans{ + pixel_x = 5 + }, +/obj/item/reagent_containers/food/snacks/beans{ + pixel_x = 1; + pixel_y = -3 + }, +/obj/item/reagent_containers/food/snacks/beans{ + pixel_x = 8; + pixel_y = -3 + }, /obj/structure/closet/crate{ name = "food crate" }, -/obj/item/reagent_containers/food/snacks/beans, -/obj/item/reagent_containers/food/snacks/beans, -/obj/item/reagent_containers/food/snacks/beans, -/obj/item/reagent_containers/food/snacks/beans, -/obj/item/reagent_containers/food/snacks/beans, -/obj/item/reagent_containers/food/snacks/beans, /obj/machinery/light{ dir = 8 }, @@ -717,15 +736,31 @@ /area/ruin/space/has_grav/deepstorage/storage) "bU" = ( /obj/effect/turf_decal/delivery, +/obj/item/reagent_containers/food/snacks/beans{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/reagent_containers/food/snacks/beans{ + pixel_x = 2; + pixel_y = 3 + }, +/obj/item/reagent_containers/food/snacks/beans{ + pixel_x = -2 + }, +/obj/item/reagent_containers/food/snacks/beans{ + pixel_x = 5 + }, +/obj/item/reagent_containers/food/snacks/beans{ + pixel_x = 1; + pixel_y = -3 + }, +/obj/item/reagent_containers/food/snacks/beans{ + pixel_x = 8; + pixel_y = -3 + }, /obj/structure/closet/crate{ name = "food crate" }, -/obj/item/reagent_containers/food/snacks/beans, -/obj/item/reagent_containers/food/snacks/beans, -/obj/item/reagent_containers/food/snacks/beans, -/obj/item/reagent_containers/food/snacks/beans, -/obj/item/reagent_containers/food/snacks/beans, -/obj/item/reagent_containers/food/snacks/beans, /turf/open/floor/plasteel/floorgrime, /area/ruin/space/has_grav/deepstorage/storage) "bV" = ( @@ -981,12 +1016,28 @@ /obj/structure/closet/crate{ name = "food crate" }, -/obj/item/reagent_containers/glass/beaker/waterbottle/large, -/obj/item/reagent_containers/glass/beaker/waterbottle/large, -/obj/item/reagent_containers/glass/beaker/waterbottle/large, -/obj/item/reagent_containers/glass/beaker/waterbottle/large, -/obj/item/reagent_containers/glass/beaker/waterbottle/large, -/obj/item/reagent_containers/glass/beaker/waterbottle/large, +/obj/item/reagent_containers/glass/beaker/waterbottle/large{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/reagent_containers/glass/beaker/waterbottle/large{ + pixel_x = 2; + pixel_y = 3 + }, +/obj/item/reagent_containers/glass/beaker/waterbottle/large{ + pixel_x = -2 + }, +/obj/item/reagent_containers/glass/beaker/waterbottle/large{ + pixel_x = 5 + }, +/obj/item/reagent_containers/glass/beaker/waterbottle/large{ + pixel_x = 1; + pixel_y = -3 + }, +/obj/item/reagent_containers/glass/beaker/waterbottle/large{ + pixel_x = 8; + pixel_y = -3 + }, /turf/open/floor/plasteel/floorgrime, /area/ruin/space/has_grav/deepstorage/storage) "cC" = ( @@ -1328,18 +1379,40 @@ /obj/structure/closet/crate{ name = "food crate" }, -/obj/item/storage/box/donkpockets, -/obj/item/storage/box/donkpockets, -/obj/item/storage/box/donkpockets, -/obj/item/storage/box/donkpockets, -/obj/item/storage/box/donkpockets, -/obj/item/storage/box/donkpockets, +/obj/item/storage/box/donkpockets{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/storage/box/donkpockets{ + pixel_x = 2; + pixel_y = 3 + }, +/obj/item/storage/box/donkpockets{ + pixel_x = -2 + }, +/obj/item/storage/box/donkpockets{ + pixel_x = 5 + }, +/obj/item/storage/box/donkpockets{ + pixel_x = 1; + pixel_y = -3 + }, +/obj/item/storage/box/donkpockets{ + pixel_x = 8; + pixel_y = -3 + }, /obj/machinery/light{ dir = 8 }, -/obj/item/vending_refill/coffee, -/obj/item/vending_refill/cigarette, +/obj/item/vending_refill/cigarette{ + pixel_x = -3; + pixel_y = 3 + }, /obj/item/vending_refill/cigarette, +/obj/item/vending_refill/coffee{ + pixel_x = 3; + pixel_y = -3 + }, /turf/open/floor/plasteel/floorgrime, /area/ruin/space/has_grav/deepstorage/storage) "dx" = ( @@ -1347,15 +1420,37 @@ /obj/structure/closet/crate{ name = "food crate" }, -/obj/item/storage/box/donkpockets, -/obj/item/storage/box/donkpockets, -/obj/item/storage/box/donkpockets, -/obj/item/storage/box/donkpockets, -/obj/item/storage/box/donkpockets, -/obj/item/storage/box/donkpockets, -/obj/item/vending_refill/coffee, -/obj/item/vending_refill/cigarette, +/obj/item/storage/box/donkpockets{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/storage/box/donkpockets{ + pixel_x = 2; + pixel_y = 3 + }, +/obj/item/storage/box/donkpockets{ + pixel_x = -2 + }, +/obj/item/storage/box/donkpockets{ + pixel_x = 5 + }, +/obj/item/storage/box/donkpockets{ + pixel_x = 1; + pixel_y = -3 + }, +/obj/item/storage/box/donkpockets{ + pixel_x = 8; + pixel_y = -3 + }, +/obj/item/vending_refill/cigarette{ + pixel_x = -3; + pixel_y = 3 + }, /obj/item/vending_refill/cigarette, +/obj/item/vending_refill/coffee{ + pixel_x = 3; + pixel_y = -3 + }, /turf/open/floor/plasteel/floorgrime, /area/ruin/space/has_grav/deepstorage/storage) "dy" = ( @@ -1773,16 +1868,13 @@ /area/ruin/space/has_grav/deepstorage/armory) "ex" = ( /obj/structure/table, -/obj/item/gun/ballistic/automatic/wt550{ - pixel_x = -3; - pixel_y = 6 - }, -/obj/item/gun/ballistic/automatic/wt550{ - pixel_x = 2 - }, /obj/structure/reagent_dispensers/peppertank{ pixel_x = 32 }, +/obj/item/gun/ballistic/automatic/wt550, +/obj/item/ammo_box/magazine/wt550m9{ + pixel_y = 12 + }, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/deepstorage/armory) "ey" = ( @@ -2165,7 +2257,7 @@ /turf/open/floor/plasteel/floorgrime, /area/ruin/space/has_grav/deepstorage/power) "fo" = ( -/obj/machinery/suit_storage_unit/syndicate, +/obj/machinery/suit_storage_unit/standard_unit, /turf/open/floor/plasteel/floorgrime, /area/ruin/space/has_grav/deepstorage/power) "fp" = (