shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
[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
parent 9d6e9a0397 31d7baf516
commit a62aa577f1
31 changed files with 654 additions and 799 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/MetaStation/MetaStation.dmm
+10 -10
View File
@@ -9091,7 +9091,7 @@
/turf/open/floor/plasteel/red/side,
/area/security/main)
"asL" = (
/obj/machinery/rnd/protolathe/department/security,
/obj/machinery/rnd/production/techfab/department/security,
/turf/open/floor/plasteel/red/side{
dir = 6
},
@@ -13366,7 +13366,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 9
},
/obj/machinery/rnd/circuit_imprinter,
/obj/machinery/rnd/production/circuit_imprinter,
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/engine/engineering)
@@ -13375,7 +13375,7 @@
/obj/structure/cable/yellow{
icon_state = "1-8"
},
/obj/machinery/rnd/protolathe/department/engineering,
/obj/machinery/rnd/production/protolathe/department/engineering,
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/engine/engineering)
@@ -21708,7 +21708,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/machinery/rnd/protolathe/department/cargo,
/obj/machinery/rnd/production/techfab/department/cargo,
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"aUj" = (
@@ -51130,7 +51130,7 @@
},
/area/medical/storage)
"cdv" = (
/obj/machinery/rnd/protolathe/department/medical,
/obj/machinery/rnd/production/techfab/department/medical,
/turf/open/floor/plasteel/whiteblue/side{
dir = 5
},
@@ -53613,7 +53613,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/machinery/rnd/protolathe/department/science,
/obj/machinery/rnd/production/protolathe/department/science,
/turf/open/floor/plasteel,
/area/science/lab)
"ciE" = (
@@ -54249,7 +54249,7 @@
"cjZ" = (
/obj/item/reagent_containers/glass/beaker/sulphuric,
/obj/effect/turf_decal/stripes/line,
/obj/machinery/rnd/circuit_imprinter/department/science,
/obj/machinery/rnd/production/circuit_imprinter/department/science,
/turf/open/floor/plasteel,
/area/science/lab)
"cka" = (
@@ -56384,7 +56384,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/machinery/rnd/protolathe/department/service,
/obj/machinery/rnd/production/techfab/department/service,
/turf/open/floor/plasteel,
/area/hallway/secondary/service)
"cox" = (
@@ -65712,7 +65712,7 @@
/obj/machinery/light{
dir = 8
},
/obj/machinery/rnd/circuit_imprinter,
/obj/machinery/rnd/production/circuit_imprinter,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/science/robotics/lab)
@@ -77251,7 +77251,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/machinery/rnd/protolathe/department/science,
/obj/machinery/rnd/production/protolathe/department/science,
/turf/open/floor/plasteel/white,
/area/science/circuit)
"uYk" = (