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
+3 -4
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