shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4240 from Citadel-Station-13/upstream-merge-33265

Browse Source 
[MIRROR]  Good Clean Fun: A vending machine for games!
This commit is contained in:
deathride58
2017-12-10 23:50:05 +00:00
committed by GitHub
parent 684ceb2aa8 4b8c3f808e
commit cdc23ad79e
6 changed files with 34 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
_maps/map_files/BoxStation/BoxStation.dmm
View File

@@ -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

29
_maps/map_files/Deltastation/DeltaStation2.dmm
View File

@@ -64517,20 +64517,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)
@@ -66179,20 +66170,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
},
@@ -104817,6 +104798,12 @@
/obj/machinery/vending/kink,
/turf/open/floor/plating,
/area/crew_quarters/abandoned_gambling_den)
"ehP" = (
/obj/machinery/computer/security/telescreen/entertainment{
pixel_y = -32
},
/turf/open/floor/plasteel/dark,
/area/library)
(1,1,1) = {"
aaa
@@ -135548,7 +135535,7 @@ cxW
czE
cBc
cCI
cwq
ehP
caG
cHA
ceb

17
_maps/map_files/MetaStation/MetaStation.dmm
View File

@@ -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" = (

17
_maps/map_files/OmegaStation/OmegaStation.dmm
View File

@@ -23569,6 +23569,7 @@
/obj/structure/sign/nosmoking_2{
pixel_y = 32
},
/obj/machinery/vending/games,
/turf/open/floor/plasteel/dark,
/area/library)
"aRW" = (
@@ -23593,13 +23594,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
},
@@ -24089,21 +24083,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" = (

19
_maps/map_files/PubbyStation/PubbyStation.dmm
View File

@@ -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,10 @@
},
/turf/open/floor/plating/airless,
/area/maintenance/department/chapel/monastery)
"cCW" = (
/obj/machinery/vending/games,
/turf/open/floor/plasteel/dark,
/area/library)
(1,1,1) = {"
aaa
@@ -67341,7 +67340,7 @@ aaa
aiu
aiu
aiu
apA
aoK
aqf
ajD
aiu
@@ -67977,13 +67976,13 @@ aaa
aaa
aaa
cjp
ckW
cCW
ckH
cyZ
ckH
czl
czr
czA
czr
czI
ckH
ckH
@@ -68239,7 +68238,7 @@ ckH
ckH
ckH
czl
czs
czr
czB
czI
czV
@@ -91543,7 +91542,7 @@ bdI
bbI
bhr
bbI
biA
aTx
bjw
bkB
blS

12
code/game/machinery/vending.dm
View File

@@ -1175,6 +1175,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