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

[MIRROR] Good Clean Fun: A vending machine for games!
2017-12-10 23:50:05 +00:00
parent 684ceb2aa8 4b8c3f808e
commit cdc23ad79e
6 changed files with 34 additions and 67 deletions
@@ -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" = (