From 1cc3e865bf7af514b311b75e7c5ab23fd392ca1a Mon Sep 17 00:00:00 2001 From: coiax Date: Tue, 5 Dec 2017 23:19:36 +0000 Subject: [PATCH 1/2] Good Clean Fun: A vending machine for games! --- _maps/map_files/BoxStation/BoxStation.dmm | 7 ++-- .../map_files/Deltastation/DeltaStation2.dmm | 35 +++++++---------- _maps/map_files/MetaStation/MetaStation.dmm | 17 +-------- _maps/map_files/OmegaStation/OmegaStation.dmm | 17 +-------- _maps/map_files/PubbyStation/PubbyStation.dmm | 38 ++++++++++++++----- code/game/machinery/vending.dm | 12 ++++++ 6 files changed, 59 insertions(+), 67 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 9b5e5bf265..0aa5f26a1a 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -13533,8 +13533,7 @@ /turf/open/floor/wood, /area/library) "aHc" = ( -/obj/structure/table/wood, -/obj/item/storage/pill_bottle/dice, +/obj/machinery/vending/games, /turf/open/floor/wood, /area/library) "aHd" = ( @@ -100607,7 +100606,7 @@ bZQ caP cbO ccJ -cdM +bLS bLS cfp cge @@ -103891,7 +103890,7 @@ aFu aHc aIw aJS -cAM +aJS aMJ aNP aOS diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index a05ca17d4b..63d3d4939f 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -64521,20 +64521,11 @@ /area/library) "cBc" = ( /obj/structure/table/wood, -/obj/item/storage/pill_bottle/dice, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/carpet, /area/library) "cBd" = ( /obj/structure/table/wood, -/obj/item/toy/cards/deck/cas{ - pixel_x = -5; - pixel_y = 5 - }, -/obj/item/toy/cards/deck/cas/black{ - pixel_x = 5; - pixel_y = 5 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/carpet, /area/library) @@ -66183,20 +66174,10 @@ /turf/open/floor/plasteel/dark, /area/library) "cEt" = ( -/obj/structure/table/wood, -/obj/item/dice/d20{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/dice/d10{ - pixel_x = -3 - }, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = -32 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/machinery/vending/games, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -104816,11 +104797,23 @@ /turf/open/floor/plasteel/red/side{ dir = 8 }, +<<<<<<< HEAD /area/security/brig) "ehv" = ( /obj/machinery/vending/kink, /turf/open/floor/plating, /area/crew_quarters/abandoned_gambling_den) +======= +/obj/effect/turf_decal/caution/stand_clear, +/turf/open/floor/plasteel, +/area/hallway/secondary/exit/departure_lounge) +"ehP" = ( +/obj/machinery/computer/security/telescreen/entertainment{ + pixel_y = -32 + }, +/turf/open/floor/plasteel/dark, +/area/library) +>>>>>>> dd67e1e... Good Clean Fun: A vending machine for games! (#33265) (1,1,1) = {" aaa @@ -135552,7 +135545,7 @@ cxW czE cBc cCI -cwq +ehP caG cHA ceb diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index d2d6386ef9..40cf659c7a 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -45185,10 +45185,8 @@ /turf/open/floor/wood, /area/library) "bPU" = ( -/obj/structure/table/wood, -/obj/item/dice/d20, -/obj/item/dice, /obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/machinery/vending/games, /turf/open/floor/wood, /area/library) "bPV" = ( @@ -46916,25 +46914,12 @@ dir = 1; network = list("SS13") }, -/obj/item/storage/pill_bottle/dice, /obj/structure/table/wood, /turf/open/floor/wood, /area/library) "bTz" = ( /obj/structure/table/wood, /obj/machinery/light, -/obj/item/toy/cards/deck/cas/black{ - pixel_x = -2; - pixel_y = 6 - }, -/obj/item/toy/cards/deck{ - pixel_x = 2; - pixel_y = 7 - }, -/obj/item/toy/cards/deck/cas{ - pixel_x = -1; - pixel_y = 2 - }, /turf/open/floor/wood, /area/library) "bTA" = ( diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index 49d03878bb..e41dea7f55 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -23151,6 +23151,7 @@ /obj/structure/sign/nosmoking_2{ pixel_y = 32 }, +/obj/machinery/vending/games, /turf/open/floor/plasteel/dark, /area/library) "aRW" = ( @@ -23175,13 +23176,6 @@ /area/library) "aRY" = ( /obj/structure/table/wood, -/obj/item/dice/d20{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/dice/d10{ - pixel_x = -3 - }, /obj/machinery/firealarm{ pixel_y = 24 }, @@ -23665,21 +23659,12 @@ /area/library) "aTf" = ( /obj/structure/table/wood, -/obj/item/storage/pill_bottle/dice, /turf/open/floor/plasteel/vault{ dir = 5 }, /area/library) "aTg" = ( /obj/structure/table/wood, -/obj/item/toy/cards/deck/cas{ - pixel_x = -5; - pixel_y = 5 - }, -/obj/item/toy/cards/deck/cas/black{ - pixel_x = 5; - pixel_y = 5 - }, /turf/open/floor/plasteel/dark, /area/library) "aTh" = ( diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 67a8b2ec47..dd129b86e3 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -50614,11 +50614,6 @@ /area/library) "czr" = ( /obj/structure/table/wood/fancy, -/obj/item/toy/cards/deck/cas/black{ - pixel_x = -2; - pixel_y = 6 - }, -/obj/item/toy/cards/deck/cas, /turf/open/floor/carpet, /area/library) "czs" = ( @@ -51326,6 +51321,29 @@ }, /turf/open/floor/plating/airless, /area/maintenance/department/chapel/monastery) +<<<<<<< HEAD +======= +"cCS" = ( +/obj/machinery/rnd/protolathe/department/security, +/turf/open/floor/plasteel/dark, +/area/security/main) +"cCT" = ( +/obj/machinery/rnd/protolathe/department/cargo, +/turf/open/floor/plasteel, +/area/quartermaster/storage) +"cCU" = ( +/obj/machinery/rnd/circuit_imprinter, +/turf/open/floor/plasteel, +/area/engine/engineering) +"cCV" = ( +/obj/machinery/rnd/protolathe/department/engineering, +/turf/open/floor/plasteel, +/area/engine/engineering) +"cCW" = ( +/obj/machinery/vending/games, +/turf/open/floor/plasteel/dark, +/area/library) +>>>>>>> dd67e1e... Good Clean Fun: A vending machine for games! (#33265) (1,1,1) = {" aaa @@ -67341,7 +67359,7 @@ aaa aiu aiu aiu -apA +aoK aqf ajD aiu @@ -67977,13 +67995,13 @@ aaa aaa aaa cjp -ckW +cCW ckH cyZ ckH czl czr -czA +czr czI ckH ckH @@ -68239,7 +68257,7 @@ ckH ckH ckH czl -czs +czr czB czI czV @@ -91543,7 +91561,7 @@ bdI bbI bhr bbI -biA +aTx bjw bkB blS diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index ec6a53f308..00b8c1ba2e 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -1172,6 +1172,18 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C resistance_flags = FIRE_PROOF refill_canister = /obj/item/vending_refill/donksoft +/obj/machinery/vending/games + name = "\improper Good Clean Fun" + desc = "Vends things that the Captain and Head of Personnel are probably not going to appreciate you fiddling with instead of your job..." + product_ads = "Escape to a fantasy world!;Fuel your gambling addiction!;Ruin your friendships!;Roll for initative!;Elves and dwarves!;Paranoid computers!;Totally not satanic!;Fun times forever!" + icon_state = "games" + products = list( + /obj/item/toy/cards/deck = 5, + /obj/item/storage/pill_bottle/dice = 10, + /obj/item/toy/cards/deck/cas = 2, + /obj/item/toy/cards/deck/cas/black = 2) + contraband = list(/obj/item/dice/fudge = 10) + #undef STANDARD_CHARGE #undef CONTRABAND_CHARGE #undef COIN_CHARGE \ No newline at end of file From 4b8c3f808e2de8bb7c51e4f0e94bc181ee166a78 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Sun, 10 Dec 2017 18:12:33 -0500 Subject: [PATCH 2/2] fixes map conflicts --- .../map_files/Deltastation/DeltaStation2.dmm | 6 ------ _maps/map_files/PubbyStation/PubbyStation.dmm | 19 ------------------- 2 files changed, 25 deletions(-) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 63d3d4939f..f3d3ff0f1a 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -104797,23 +104797,17 @@ /turf/open/floor/plasteel/red/side{ dir = 8 }, -<<<<<<< HEAD /area/security/brig) "ehv" = ( /obj/machinery/vending/kink, /turf/open/floor/plating, /area/crew_quarters/abandoned_gambling_den) -======= -/obj/effect/turf_decal/caution/stand_clear, -/turf/open/floor/plasteel, -/area/hallway/secondary/exit/departure_lounge) "ehP" = ( /obj/machinery/computer/security/telescreen/entertainment{ pixel_y = -32 }, /turf/open/floor/plasteel/dark, /area/library) ->>>>>>> dd67e1e... Good Clean Fun: A vending machine for games! (#33265) (1,1,1) = {" aaa diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index dd129b86e3..3e983b59e2 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -51321,29 +51321,10 @@ }, /turf/open/floor/plating/airless, /area/maintenance/department/chapel/monastery) -<<<<<<< HEAD -======= -"cCS" = ( -/obj/machinery/rnd/protolathe/department/security, -/turf/open/floor/plasteel/dark, -/area/security/main) -"cCT" = ( -/obj/machinery/rnd/protolathe/department/cargo, -/turf/open/floor/plasteel, -/area/quartermaster/storage) -"cCU" = ( -/obj/machinery/rnd/circuit_imprinter, -/turf/open/floor/plasteel, -/area/engine/engineering) -"cCV" = ( -/obj/machinery/rnd/protolathe/department/engineering, -/turf/open/floor/plasteel, -/area/engine/engineering) "cCW" = ( /obj/machinery/vending/games, /turf/open/floor/plasteel/dark, /area/library) ->>>>>>> dd67e1e... Good Clean Fun: A vending machine for games! (#33265) (1,1,1) = {" aaa