Merge pull request #5854 from Citadel-Station-13/upstream-merge-36055

[MIRROR] Techwebs update: Protolathe/Circuit imprinters combined into techfabs!
This commit is contained in:
deathride58
2018-03-09 19:25:12 +00:00
committed by GitHub
31 changed files with 654 additions and 799 deletions
+1 -1
View File
@@ -17,7 +17,7 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list(
/obj/effect/clockwork/spatial_gateway,
/obj/structure/destructible/clockwork/powered/clockwork_obelisk,
/obj/item/device/warp_cube,
/obj/machinery/rnd/protolathe, //print tracking beacons, send shuttle
/obj/machinery/rnd/production/protolathe, //print tracking beacons, send shuttle
/obj/machinery/autolathe, //same
/obj/item/projectile/beam/wormhole,
/obj/effect/portal,