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/BoxStation/BoxStation.dmm
+10 -10
View File
@@ -22985,7 +22985,7 @@
/obj/machinery/light{
dir = 1
},
/obj/machinery/rnd/circuit_imprinter,
/obj/machinery/rnd/production/circuit_imprinter,
/turf/open/floor/plasteel/white,
/area/science/robotics/lab)
"bhy" = (
@@ -24779,7 +24779,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)
"blK" = (
@@ -25418,7 +25418,7 @@
/area/science/lab)
"bno" = (
/obj/item/reagent_containers/glass/beaker/sulphuric,
/obj/machinery/rnd/circuit_imprinter/department/science,
/obj/machinery/rnd/production/circuit_imprinter/department/science,
/turf/open/floor/plasteel,
/area/science/lab)
"bnp" = (
@@ -34427,8 +34427,8 @@
/turf/open/floor/plasteel/white,
/area/medical/sleeper)
"bIm" = (
/obj/machinery/rnd/protolathe/department/medical,
/obj/machinery/light,
/obj/machinery/rnd/production/techfab/department/medical,
/turf/open/floor/plasteel/white,
/area/medical/sleeper)
"bIn" = (
@@ -46159,7 +46159,7 @@
/area/engine/engineering)
"clS" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/machinery/rnd/protolathe/department/security,
/obj/machinery/rnd/production/techfab/department/security,
/turf/open/floor/plasteel/red/side,
/area/security/main)
"clT" = (
@@ -47474,7 +47474,7 @@
c_tag = "Engineering Storage";
dir = 4
},
/obj/machinery/rnd/protolathe/department/engineering,
/obj/machinery/rnd/production/protolathe/department/engineering,
/turf/open/floor/plasteel,
/area/engine/engineering)
"cpW" = (
@@ -47630,7 +47630,7 @@
/obj/machinery/light{
dir = 8
},
/obj/machinery/rnd/circuit_imprinter,
/obj/machinery/rnd/production/circuit_imprinter,
/turf/open/floor/plasteel,
/area/engine/engineering)
"cqx" = (
@@ -53016,11 +53016,11 @@
/turf/open/floor/plasteel,
/area/science/circuit)
"jlm" = (
/obj/machinery/rnd/protolathe/department/cargo,
/obj/machinery/rnd/production/techfab/department/cargo,
/turf/open/floor/plasteel,
/area/quartermaster/office)
"jrE" = (
/obj/machinery/rnd/protolathe/department/science,
/obj/machinery/rnd/production/protolathe/department/science,
/obj/structure/sign/poster/official/random{
pixel_x = 32
},
@@ -54387,7 +54387,7 @@
/turf/open/floor/plating,
/area/maintenance/bar)
"vCb" = (
/obj/machinery/rnd/protolathe/department/service,
/obj/machinery/rnd/production/techfab/department/service,
/turf/open/floor/plasteel/hydrofloor,
/area/hallway/secondary/service)
"vCt" = (