diff --git a/_maps/shuttles/pirate_default.dmm b/_maps/shuttles/pirate_default.dmm index 7b0728ecbb3..a82abf586fe 100644 --- a/_maps/shuttles/pirate_default.dmm +++ b/_maps/shuttles/pirate_default.dmm @@ -116,8 +116,6 @@ /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" = ( diff --git a/_maps/shuttles/pirate_dutchman.dmm b/_maps/shuttles/pirate_dutchman.dmm index d13aa2c3ab6..b4e362b4142 100644 --- a/_maps/shuttles/pirate_dutchman.dmm +++ b/_maps/shuttles/pirate_dutchman.dmm @@ -154,7 +154,7 @@ dir = 5 }, /obj/structure/closet/cabinet, -/obj/item/storage/bag/money/vault, +/obj/item/storage/bag/money/dutchmen, /obj/item/stack/sheet/mineral/gold{ amount = 3; pixel_x = -2; @@ -591,29 +591,11 @@ icon_state = "minibar"; name = "skeletal minibar" }, -/obj/item/coin/silver{ - name = "doubloon" +/obj/item/reagent_containers/food/condiment/milk{ + pixel_x = -5 }, -/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" +/obj/item/reagent_containers/food/condiment/milk{ + pixel_x = 5 }, /turf/open/floor/wood/airless, /area/shuttle/pirate/flying_dutchman) 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 2abca494e9b..cd121aa9316 100644 --- a/code/modules/mining/ores_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -518,4 +518,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