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

Merge remote-tracking branch 'origin/master' into perlin-genny

Browse Source
This commit is contained in:
LetterN
2021-03-20 20:36:56 +08:00
parent 2fe6125955 cd20cb85dc
commit 292f67e098
267 changed files with 109865 additions and 107683 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/debug/multiz.dmm
+30 -30
View File
@@ -435,8 +435,8 @@
/area/engineering/atmos)
"bm" = (
/obj/machinery/atmospherics/components/binary/valve/on{
icon_state = "mvalve_map-2";
dir = 4
dir = 4;
icon_state = "mvalve_map-2"
},
/turf/open/floor/plating,
/area/engineering/atmos)
@@ -1502,8 +1502,8 @@
/area/engineering/storage)
"gK" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
icon_state = "connector_map-2";
dir = 8
dir = 8;
icon_state = "connector_map-2"
},
/obj/machinery/portable_atmospherics/canister/toxins,
/turf/open/floor/plating,
@@ -1514,8 +1514,8 @@
/area/hallway/secondary/service)
"hi" = (
/obj/machinery/atmospherics/components/unary/outlet_injector/on{
icon_state = "inje_map-2";
dir = 4
dir = 4;
icon_state = "inje_map-2"
},
/turf/open/floor/plating,
/area/construction)
@@ -1555,8 +1555,8 @@
/area/hallway/secondary/service)
"jA" = (
/obj/effect/turf_decal/stripes/white/line{
icon_state = "warningline_white";
dir = 8
dir = 8;
icon_state = "warningline_white"
},
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -1567,8 +1567,8 @@
/area/construction)
"jV" = (
/obj/effect/turf_decal/stripes/white/line{
icon_state = "warningline_white";
dir = 6
dir = 6;
icon_state = "warningline_white"
},
/turf/open/floor/plating,
/area/engineering/storage)
@@ -1637,8 +1637,8 @@
/area/engineering/storage)
"qR" = (
/obj/effect/turf_decal/stripes/white/line{
icon_state = "warningline_white";
dir = 9
dir = 9;
icon_state = "warningline_white"
},
/turf/open/floor/plating,
/area/engineering/storage)
@@ -1659,15 +1659,15 @@
/area/construction)
"sE" = (
/obj/effect/turf_decal/stripes/white/line{
icon_state = "warningline_white";
dir = 4
dir = 4;
icon_state = "warningline_white"
},
/turf/open/floor/plating,
/area/engineering/storage)
"td" = (
/obj/effect/turf_decal/stripes/white/line{
icon_state = "warningline_white";
dir = 8
dir = 8;
icon_state = "warningline_white"
},
/turf/open/floor/plating,
/area/engineering/storage)
@@ -1704,8 +1704,8 @@
/area/construction)
"xB" = (
/obj/effect/turf_decal/stripes/white/line{
icon_state = "warningline_white";
dir = 1
dir = 1;
icon_state = "warningline_white"
},
/turf/open/floor/plating,
/area/engineering/storage)
@@ -1720,8 +1720,8 @@
/area/construction)
"zZ" = (
/obj/structure/disposalpipe/trunk{
icon_state = "pipe-t";
dir = 1
dir = 1;
icon_state = "pipe-t"
},
/obj/machinery/disposal/bin,
/turf/open/floor/plating,
@@ -1788,12 +1788,12 @@
/area/construction)
"EH" = (
/obj/effect/turf_decal/stripes/white/line{
icon_state = "warningline_white";
dir = 1
dir = 1;
icon_state = "warningline_white"
},
/obj/effect/turf_decal/stripes/white/line{
icon_state = "warningline_white";
dir = 4
dir = 4;
icon_state = "warningline_white"
},
/turf/open/floor/plating,
/area/engineering/storage)
@@ -1804,8 +1804,8 @@
"FL" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/green/hidden{
icon_state = "pipe11-2";
dir = 4
dir = 4;
icon_state = "pipe11-2"
},
/turf/open/floor/plating,
/area/construction)
@@ -1896,8 +1896,8 @@
/area/engineering/storage)
"Qo" = (
/obj/structure/disposalpipe/trunk/multiz/down{
icon_state = "pipe-down";
dir = 1
dir = 1;
icon_state = "pipe-down"
},
/turf/open/floor/plating,
/area/hallway/secondary/service)
@@ -1966,8 +1966,8 @@
/area/construction)
"ZQ" = (
/obj/effect/turf_decal/stripes/white/line{
icon_state = "warningline_white";
dir = 5
dir = 5;
icon_state = "warningline_white"
},
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
_maps/map_files/debug/runtimestation.dmm
+6 -6
View File
@@ -1407,8 +1407,8 @@
height = 5;
id = "laborcamp_home";
name = "fore bay 1";
width = 9;
roundstart_template = /datum/map_template/shuttle/labour/box
roundstart_template = /datum/map_template/shuttle/labour/box;
width = 9
},
/turf/open/space/basic,
/area/space)
@@ -1419,8 +1419,8 @@
height = 15;
id = "arrivals_stationary";
name = "arrivals";
width = 7;
roundstart_template = /datum/map_template/shuttle/arrival/box
roundstart_template = /datum/map_template/shuttle/arrival/box;
width = 7
},
/turf/open/space/basic,
/area/space)
@@ -2325,8 +2325,8 @@
height = 5;
id = "mining_home";
name = "mining shuttle bay";
width = 7;
roundstart_template = /datum/map_template/shuttle/mining/box
roundstart_template = /datum/map_template/shuttle/mining/box;
width = 7
},
/turf/open/space/basic,
/area/space)