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/OmegaStation/OmegaStation.dmm
+8 -8
View File
@@ -4464,7 +4464,7 @@
/turf/open/floor/plating,
/area/security/brig)
"aiV" = (
/obj/machinery/rnd/protolathe/department/security,
/obj/machinery/rnd/production/techfab/department/security,
/turf/open/floor/plasteel/red/side{
dir = 8
},
@@ -6004,7 +6004,7 @@
/obj/structure/cable/white{
icon_state = "0-8"
},
/obj/machinery/rnd/protolathe/department/cargo,
/obj/machinery/rnd/production/techfab/department/cargo,
/turf/open/floor/plasteel/brown{
dir = 4
},
@@ -8288,8 +8288,8 @@
"apX" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/effect/turf_decal/delivery,
/obj/machinery/rnd/protolathe/department/service,
/obj/effect/turf_decal/stripes/box,
/obj/machinery/rnd/production/techfab/department/service,
/turf/open/floor/plasteel,
/area/crew_quarters/bar/atrium)
"apY" = (
@@ -18864,7 +18864,7 @@
/obj/structure/cable/white{
icon_state = "1-4"
},
/obj/machinery/rnd/circuit_imprinter,
/obj/machinery/rnd/production/circuit_imprinter,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel/yellow/side{
dir = 4
@@ -19261,7 +19261,7 @@
network = list("engine");
pixel_y = -32
},
/obj/machinery/rnd/protolathe/department/engineering,
/obj/machinery/rnd/production/protolathe/department/engineering,
/obj/effect/turf_decal/stripes/box,
/turf/open/floor/plasteel,
/area/engine/engineering)
@@ -22628,7 +22628,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 5
},
/obj/machinery/rnd/protolathe/department/science,
/obj/machinery/rnd/production/protolathe/department/science,
/turf/open/floor/plasteel/vault/side{
dir = 4
},
@@ -23035,7 +23035,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 6
},
/obj/machinery/rnd/circuit_imprinter/department/science,
/obj/machinery/rnd/production/circuit_imprinter/department/science,
/turf/open/floor/plasteel/vault/side{
dir = 4
},
@@ -25492,8 +25492,8 @@
dir = 5
},
/obj/effect/turf_decal/bot,
/obj/machinery/rnd/protolathe/department/medical,
/obj/effect/turf_decal/stripes/box,
/obj/machinery/rnd/production/techfab/department/medical,
/turf/open/floor/plasteel,
/area/medical/medbay/zone3)
"bav" = (