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

[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
6 changed files with 34 additions and 67 deletions
+1 -16
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" = (