From 3af5b0b12706553b0f6fe2d8da8eff4cff55f043 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Sun, 5 Sep 2021 05:48:34 +0200 Subject: [PATCH] [MIRROR] Fixes a regression about skeleton pirates not having milk bottles. (#7977) * Fixes a regression about skeleton pirates not having milk bottles. (#61217) * Fixes a regression about skeleton pirates not having milk bottles. * aaaa * Fixes a regression about skeleton pirates not having milk bottles. Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com> --- _maps/shuttles/pirate_default.dmm | 110 ++++++++++++----------- _maps/shuttles/pirate_dutchman.dmm | 134 +++++++++++++---------------- code/modules/mining/money_bag.dm | 8 ++ code/modules/mining/ores_coins.dm | 11 +++ 4 files changed, 131 insertions(+), 132 deletions(-) diff --git a/_maps/shuttles/pirate_default.dmm b/_maps/shuttles/pirate_default.dmm index 3a9695a20d6..0d87689c548 100644 --- a/_maps/shuttles/pirate_default.dmm +++ b/_maps/shuttles/pirate_default.dmm @@ -88,38 +88,6 @@ "aj" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/shuttle/pirate) -"ak" = ( -/obj/machinery/airalarm/all_access{ - dir = 4; - pixel_x = -24 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small/directional/west, -/obj/structure/closet/secure_closet/freezer{ - locked = 0; - name = "fridge" - }, -/obj/item/storage/box/donkpockets{ - pixel_x = 2; - pixel_y = 3 - }, -/obj/item/storage/box/donkpockets, -/obj/item/storage/fancy/donut_box, -/obj/item/food/cookie, -/obj/item/food/cookie{ - pixel_x = -6; - pixel_y = -6 - }, -/obj/item/food/chocolatebar, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/obj/item/reagent_containers/food/condiment/milk, -/obj/item/reagent_containers/food/condiment/milk, -/turf/open/floor/iron, -/area/shuttle/pirate) "al" = ( /obj/machinery/loot_locator, /obj/effect/decal/cleanable/dirt, @@ -589,28 +557,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/wood, /area/shuttle/pirate) -"bt" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/machinery/light/small/directional/north, -/obj/machinery/firealarm/directional/north, -/obj/effect/decal/cleanable/dirt, -/obj/structure/table, -/obj/item/melee/transforming/energy/sword/pirate{ - pixel_x = -1; - pixel_y = 6 - }, -/obj/item/melee/transforming/energy/sword/pirate{ - pixel_x = 6; - pixel_y = 6 - }, -/obj/item/melee/transforming/energy/sword/pirate{ - pixel_x = 13; - pixel_y = 6 - }, -/turf/open/floor/pod/light, -/area/shuttle/pirate) "bu" = ( /obj/machinery/firealarm/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ @@ -1032,6 +978,28 @@ }, /turf/closed/wall/mineral/plastitanium, /area/shuttle/pirate) +"xu" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/machinery/light/small/directional/north, +/obj/machinery/firealarm/directional/north, +/obj/effect/decal/cleanable/dirt, +/obj/structure/table, +/obj/item/melee/transforming/energy/sword/pirate{ + pixel_x = -1; + pixel_y = 6 + }, +/obj/item/melee/transforming/energy/sword/pirate{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/melee/transforming/energy/sword/pirate{ + pixel_x = 13; + pixel_y = 6 + }, +/turf/open/floor/pod/light, +/area/shuttle/pirate) "yi" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ dir = 4 @@ -1158,6 +1126,36 @@ }, /turf/open/floor/iron, /area/shuttle/pirate) +"Ve" = ( +/obj/machinery/airalarm/all_access{ + dir = 4; + pixel_x = -24 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/west, +/obj/structure/closet/secure_closet/freezer{ + locked = 0; + name = "fridge" + }, +/obj/item/storage/box/donkpockets{ + pixel_x = 2; + pixel_y = 3 + }, +/obj/item/storage/box/donkpockets, +/obj/item/storage/fancy/donut_box, +/obj/item/food/cookie, +/obj/item/food/cookie{ + pixel_x = -6; + pixel_y = -6 + }, +/obj/item/food/chocolatebar, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/turf/open/floor/iron, +/area/shuttle/pirate) (1,1,1) = {" af @@ -1186,7 +1184,7 @@ eA aa ap aw -ak +Ve bF aj aj @@ -1329,7 +1327,7 @@ ad ah an aj -bt +xu gY bI aj diff --git a/_maps/shuttles/pirate_dutchman.dmm b/_maps/shuttles/pirate_dutchman.dmm index cacb8fa08ff..aac308fcc7a 100644 --- a/_maps/shuttles/pirate_dutchman.dmm +++ b/_maps/shuttles/pirate_dutchman.dmm @@ -56,24 +56,6 @@ /obj/effect/mob_spawn/human/pirate/skeleton/gunner, /turf/open/floor/wood/airless, /area/shuttle/pirate/flying_dutchman) -"am" = ( -/obj/structure/railing{ - color = "#4C3117"; - dir = 5; - name = "wooden railing" - }, -/obj/effect/turf_decal/siding/wood{ - dir = 5 - }, -/obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/beer{ - pixel_x = -5; - pixel_y = 8 - }, -/obj/item/stack/cannonball/fourteen, -/obj/item/reagent_containers/glass/bucket/wooden, -/turf/open/floor/wood/airless, -/area/shuttle/pirate/flying_dutchman) "an" = ( /obj/structure/railing{ color = "#4C3117"; @@ -149,25 +131,6 @@ /obj/machinery/light/floor, /turf/open/floor/wood/airless, /area/shuttle/pirate/flying_dutchman) -"aZ" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 5 - }, -/obj/structure/closet/cabinet, -/obj/item/storage/bag/money/vault, -/obj/item/stack/sheet/mineral/gold{ - amount = 3; - pixel_x = -2; - pixel_y = 2 - }, -/obj/item/stack/sheet/mineral/silver{ - amount = 8; - pixel_x = 2; - pixel_y = -1 - }, -/obj/machinery/light/small/directional/east, -/turf/open/floor/wood/airless, -/area/shuttle/pirate/flying_dutchman) "be" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -215,6 +178,24 @@ }, /turf/open/floor/wood/airless, /area/shuttle/pirate/flying_dutchman) +"cI" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, +/obj/machinery/light/floor, +/obj/structure/rack{ + icon = 'icons/obj/stationobjs.dmi'; + icon_state = "minibar"; + name = "skeletal minibar" + }, +/obj/item/reagent_containers/food/condiment/milk{ + pixel_x = -5 + }, +/obj/item/reagent_containers/food/condiment/milk{ + pixel_x = 5 + }, +/turf/open/floor/wood/airless, +/area/shuttle/pirate/flying_dutchman) "da" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -358,6 +339,24 @@ }, /turf/open/floor/carpet/blue/airless, /area/shuttle/pirate/flying_dutchman) +"jS" = ( +/obj/structure/railing{ + color = "#4C3117"; + dir = 5; + name = "wooden railing" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, +/obj/structure/table/wood, +/obj/item/reagent_containers/food/drinks/beer{ + pixel_x = -5; + pixel_y = 8 + }, +/obj/item/stack/cannonball/fourteen, +/obj/item/reagent_containers/glass/bucket/wooden, +/turf/open/floor/wood/airless, +/area/shuttle/pirate/flying_dutchman) "km" = ( /obj/effect/turf_decal/siding/wood{ dir = 5 @@ -581,42 +580,6 @@ /obj/item/reagent_containers/glass/bucket/wooden, /turf/open/floor/wood/airless, /area/shuttle/pirate/flying_dutchman) -"BK" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 10 - }, -/obj/machinery/light/floor, -/obj/structure/rack{ - icon = 'icons/obj/stationobjs.dmi'; - icon_state = "minibar"; - name = "skeletal minibar" - }, -/obj/item/coin/silver{ - name = "doubloon" - }, -/obj/item/coin/silver{ - name = "doubloon" - }, -/obj/item/coin/silver{ - name = "doubloon" - }, -/obj/item/coin/silver{ - name = "doubloon" - }, -/obj/item/coin/silver{ - name = "doubloon" - }, -/obj/item/coin/gold{ - name = "doubloon" - }, -/obj/item/coin/gold{ - name = "doubloon" - }, -/obj/item/coin/gold{ - name = "doubloon" - }, -/turf/open/floor/wood/airless, -/area/shuttle/pirate/flying_dutchman) "Cv" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -673,6 +636,25 @@ }, /turf/open/floor/wood/airless, /area/shuttle/pirate/flying_dutchman) +"Fd" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, +/obj/structure/closet/cabinet, +/obj/item/storage/bag/money/dutchmen, +/obj/item/stack/sheet/mineral/gold{ + amount = 3; + pixel_x = -2; + pixel_y = 2 + }, +/obj/item/stack/sheet/mineral/silver{ + amount = 8; + pixel_x = 2; + pixel_y = -1 + }, +/obj/machinery/light/small/directional/east, +/turf/open/floor/wood/airless, +/area/shuttle/pirate/flying_dutchman) "Fv" = ( /obj/effect/turf_decal/siding/wood{ dir = 9 @@ -1211,7 +1193,7 @@ Le be Uk dZ -BK +cI pG gQ fY @@ -1283,7 +1265,7 @@ WR (12,1,1) = {" af af -am +jS aB WB km @@ -1321,7 +1303,7 @@ sc vT zE pG -aZ +Fd yy WB WB diff --git a/code/modules/mining/money_bag.dm b/code/modules/mining/money_bag.dm index 536677599b7..92ab438d7bf 100644 --- a/code/modules/mining/money_bag.dm +++ b/code/modules/mining/money_bag.dm @@ -28,3 +28,11 @@ new /obj/item/coin/gold(src) new /obj/item/coin/gold(src) new /obj/item/coin/adamantine(src) + +///Used in the dutchmen pirate shuttle. +/obj/item/storage/bag/money/dutchmen/PopulateContents() + for(var/iteration in 1 to 9) + new /obj/item/coin/silver/doubloon(src) + for(var/iteration in 1 to 9) + new /obj/item/coin/gold/doubloon(src) + new /obj/item/coin/adamantine/doubloon(src) diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm index 34fb1021883..be1da65c2b7 100644 --- a/code/modules/mining/ores_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -517,4 +517,15 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ to_chat(user,"[SSeconomy.inflation_value()] is the inflation value.") return TRUE//did the coin flip? useful for suicide_act + +///Coins used in the dutchmen money bag. +/obj/item/coin/silver/doubloon + name = "doubloon" + +/obj/item/coin/gold/doubloon + name = "doubloon" + +/obj/item/coin/adamantine/doubloon + name = "doubloon" + #undef ORESTACK_OVERLAYS_MAX