Merge branch 'master' into bad-karma

This commit is contained in:
Citinited
2017-06-10 19:16:13 +01:00
committed by GitHub
37 changed files with 670 additions and 80 deletions
+1
View File
@@ -245,6 +245,7 @@
/obj/machinery/teleport/station,
/obj/machinery/teleport/hub,
/obj/machinery/telepad,
/obj/machinery/telepad_cargo,
/obj/machinery/clonepod,
/obj/effect/hierophant,
/obj/item/device/warp_cube,