Merge pull request #5506 from Citadel-Station-13/upstream-merge-35431

[MIRROR] html_interface removal and crew monitoring console refactor.
2018-02-16 14:27:26 +00:00
parent f76cc84107 18bc99c252
commit a3180b0173
42 changed files with 285 additions and 2433 deletions
@@ -196,7 +196,7 @@
 "aL" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/table,
-/obj/item/deck,
+/obj/item/toy/cards/deck,
 /obj/item/folder/blue,
 /obj/item/pen,
 /turf/open/floor/plasteel/floorgrime,