[MIRROR] removes all dirty map var edits from the codebase and reverts pixel_x/y grep (#2294)

* removes all dirty map var edits from the codebase and reverts pixel_x/y grep (#55256)

* Revert "grep for pixelx/y = 0 varedits (#54845)"

This reverts commit 311b9da86b.

* part1

* part2

* part3

* Delete PubbyStation.dmm

* removes all dirty map var edits from the codebase and reverts pixel_x/y grep

Co-authored-by: Fikou <piotrbryla@onet.pl>
This commit is contained in:
SkyratBot
2020-12-24 00:40:41 +00:00
committed by GitHub
co-authored by Fikou
parent e9b0bf9b92
commit 286dbbc937
22 changed files with 202 additions and 428 deletions
@@ -46,7 +46,6 @@
/obj/machinery/power/emitter,
/obj/structure/cable,
/obj/effect/turf_decal/stripes/end{
icon_state = "warn_end";
dir = 1
},
/turf/open/floor/plating/icemoon,
@@ -60,7 +59,6 @@
/area/icemoon/surface/outdoors)
"ap" = (
/obj/effect/turf_decal/stripes/line{
icon_state = "warningline";
dir = 1
},
/turf/open/floor/plating/icemoon,
@@ -68,7 +66,6 @@
"aq" = (
/obj/machinery/field/generator,
/obj/effect/turf_decal/stripes/line{
icon_state = "warningline";
dir = 1
},
/turf/open/floor/plating/icemoon,
@@ -76,7 +73,6 @@
"ar" = (
/obj/structure/cable,
/obj/effect/turf_decal/stripes/line{
icon_state = "warningline";
dir = 5
},
/turf/open/floor/plating/icemoon,
@@ -88,7 +84,6 @@
"at" = (
/obj/structure/cable,
/obj/effect/turf_decal/stripes/line{
icon_state = "warningline";
dir = 4
},
/turf/open/floor/plating/icemoon,
@@ -127,7 +122,6 @@
/area/icemoon/surface/outdoors)
"aC" = (
/obj/effect/turf_decal/trimline/yellow/filled/line{
icon_state = "trimline_fill";
dir = 4
},
/turf/open/floor/plasteel/icemoon,
@@ -150,7 +144,6 @@
/area/icemoon/surface/outdoors)
"aH" = (
/obj/effect/turf_decal/stripes/line{
icon_state = "warningline";
dir = 8
},
/turf/open/floor/plating/snowed/icemoon,
@@ -167,22 +160,18 @@
/area/icemoon/surface/outdoors)
"aK" = (
/obj/effect/turf_decal/trimline/yellow/filled/line{
icon_state = "trimline_fill";
dir = 8
},
/obj/machinery/light/small/broken{
icon_state = "bulb-broken";
dir = 8
},
/turf/open/floor/plasteel/icemoon,
/area/icemoon/surface/outdoors)
"aL" = (
/obj/effect/turf_decal/trimline/yellow/filled/line{
icon_state = "trimline_fill";
dir = 4
},
/obj/machinery/light/small{
icon_state = "bulb";
dir = 4
},
/turf/open/floor/plasteel/icemoon,
@@ -202,15 +191,12 @@
/area/icemoon/surface/outdoors)
"aP" = (
/obj/effect/turf_decal/tile/yellow{
icon_state = "tile_corner";
dir = 1
},
/obj/effect/turf_decal/tile/yellow{
icon_state = "tile_corner";
dir = 8
},
/obj/effect/turf_decal/stripes/line{
icon_state = "warningline";
dir = 8
},
/turf/open/floor/plasteel/icemoon,
@@ -221,15 +207,14 @@
/area/icemoon/surface/outdoors)
"aR" = (
/obj/effect/turf_decal/trimline/yellow/filled/line{
icon_state = "trimline_fill";
dir = 8
},
/turf/open/floor/plasteel/icemoon,
/area/icemoon/surface/outdoors)
"aS" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
icon_state = "pipe11-2";
dir = 6
dir = 6;
icon_state = "pipe11-2"
},
/turf/open/floor/plasteel/icemoon,
/area/icemoon/surface/outdoors)
@@ -242,18 +227,17 @@
/area/icemoon/surface/outdoors)
"aU" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
icon_state = "pipe11-2";
dir = 10
dir = 10;
icon_state = "pipe11-2"
},
/turf/open/floor/plasteel/icemoon,
/area/icemoon/surface/outdoors)
"aV" = (
/obj/machinery/atmospherics/pipe/simple/cyan/visible{
icon_state = "pipe11-2";
dir = 5
dir = 5;
icon_state = "pipe11-2"
},
/obj/effect/turf_decal/stripes/line{
icon_state = "warningline";
dir = 1
},
/turf/open/floor/plasteel/icemoon,
@@ -261,41 +245,36 @@
"aW" = (
/obj/machinery/atmospherics/pipe/simple/general/visible,
/obj/machinery/atmospherics/pipe/simple/cyan/visible{
icon_state = "pipe11-2";
dir = 4
dir = 4;
icon_state = "pipe11-2"
},
/obj/effect/turf_decal/stripes/line{
icon_state = "warningline";
dir = 1
},
/turf/open/floor/plasteel/icemoon,
/area/icemoon/surface/outdoors)
"aX" = (
/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
icon_state = "manifold-2";
dir = 1
dir = 1;
icon_state = "manifold-2"
},
/obj/effect/turf_decal/stripes/corner{
icon_state = "warninglinecorner";
dir = 4
},
/obj/effect/turf_decal/stripes/corner{
icon_state = "warninglinecorner";
dir = 1
},
/obj/machinery/light/small{
icon_state = "bulb";
dir = 1
},
/turf/open/floor/plasteel/icemoon,
/area/icemoon/surface/outdoors)
"aY" = (
/obj/machinery/atmospherics/components/trinary/mixer/flipped{
icon_state = "mixer_off_f";
dir = 8
dir = 8;
icon_state = "mixer_off_f"
},
/obj/effect/turf_decal/stripes/line{
icon_state = "warningline";
dir = 1
},
/turf/open/floor/plasteel/icemoon,
@@ -303,37 +282,34 @@
"aZ" = (
/obj/machinery/atmospherics/pipe/simple/general/visible,
/obj/machinery/atmospherics/pipe/simple/green/visible{
icon_state = "pipe11-2";
dir = 4
dir = 4;
icon_state = "pipe11-2"
},
/obj/effect/turf_decal/stripes/line{
icon_state = "warningline";
dir = 1
},
/turf/open/floor/plasteel/icemoon,
/area/icemoon/surface/outdoors)
"ba" = (
/obj/machinery/atmospherics/pipe/manifold/green/visible{
icon_state = "manifold-2";
dir = 1
dir = 1;
icon_state = "manifold-2"
},
/obj/effect/turf_decal/stripes/corner{
icon_state = "warninglinecorner";
dir = 1
},
/turf/open/floor/plasteel/icemoon,
/area/icemoon/surface/outdoors)
"bb" = (
/obj/machinery/atmospherics/pipe/simple/green/visible{
icon_state = "pipe11-2";
dir = 10
dir = 10;
icon_state = "pipe11-2"
},
/turf/open/floor/plasteel/icemoon,
/area/icemoon/surface/outdoors)
"bc" = (
/obj/structure/cable,
/obj/effect/turf_decal/stripes/line{
icon_state = "warningline";
dir = 8
},
/turf/open/floor/plating/icemoon,
@@ -362,20 +338,20 @@
"bg" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
icon_state = "pipe11-2";
dir = 8
dir = 8;
icon_state = "pipe11-2"
},
/turf/open/floor/plating/icemoon,
/area/icemoon/surface/outdoors)
"bh" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
icon_state = "pipe11-2";
dir = 8
dir = 8;
icon_state = "pipe11-2"
},
/obj/machinery/atmospherics/pipe/simple/supply/visible{
icon_state = "pipe11-2";
dir = 6
dir = 6;
icon_state = "pipe11-2"
},
/turf/open/floor/plating/icemoon,
/area/icemoon/surface/outdoors)
@@ -385,27 +361,24 @@
},
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
icon_state = "pipe11-2";
dir = 8
dir = 8;
icon_state = "pipe11-2"
},
/obj/machinery/atmospherics/pipe/simple/supply/visible{
icon_state = "pipe11-2";
dir = 8
dir = 8;
icon_state = "pipe11-2"
},
/turf/open/floor/plating/icemoon,
/area/icemoon/surface/outdoors)
"bj" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/yellow{
icon_state = "tile_corner";
dir = 1
},
/obj/effect/turf_decal/tile/yellow{
icon_state = "tile_corner";
dir = 8
},
/obj/effect/turf_decal/stripes/line{
icon_state = "warningline";
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -434,7 +407,6 @@
"bm" = (
/obj/structure/cable,
/obj/effect/turf_decal/trimline/yellow/filled/warning{
icon_state = "trimline_warn_fill";
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -444,16 +416,16 @@
/area/icemoon/surface/outdoors)
"bn" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
icon_state = "pipe11-2";
dir = 9
dir = 9;
icon_state = "pipe11-2"
},
/obj/structure/cable,
/turf/open/floor/plasteel/icemoon,
/area/icemoon/surface/outdoors)
"bo" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
icon_state = "vent_map_on-2";
dir = 4
dir = 4;
icon_state = "vent_map_on-2"
},
/obj/structure/cable,
/turf/open/floor/plasteel/icemoon,
@@ -472,7 +444,6 @@
/area/icemoon/surface/outdoors)
"br" = (
/obj/effect/turf_decal/trimline/yellow/filled/warning{
icon_state = "trimline_warn_fill";
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -483,7 +454,6 @@
/area/icemoon/surface/outdoors)
"bs" = (
/obj/effect/turf_decal/trimline/yellow/filled/warning{
icon_state = "trimline_warn_fill";
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -494,16 +464,16 @@
/area/icemoon/surface/outdoors)
"bt" = (
/obj/machinery/atmospherics/pipe/simple/supply/visible{
icon_state = "pipe11-2";
dir = 8
dir = 8;
icon_state = "pipe11-2"
},
/obj/structure/cable,
/turf/open/floor/plasteel/icemoon,
/area/icemoon/surface/outdoors)
"bu" = (
/obj/machinery/atmospherics/pipe/simple/supply/visible{
icon_state = "pipe11-2";
dir = 10
dir = 10;
icon_state = "pipe11-2"
},
/obj/structure/cable,
/turf/open/floor/plasteel/icemoon,
@@ -515,16 +485,16 @@
/area/icemoon/surface/outdoors)
"bw" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
icon_state = "connector_map-2";
dir = 1
dir = 1;
icon_state = "connector_map-2"
},
/obj/structure/cable,
/turf/open/floor/plasteel/icemoon,
/area/icemoon/surface/outdoors)
"bx" = (
/obj/machinery/atmospherics/pipe/simple/green/visible{
icon_state = "pipe11-2";
dir = 1
dir = 1;
icon_state = "pipe11-2"
},
/obj/machinery/power/apc/unlocked{
dir = 4;
@@ -551,7 +521,6 @@
"bB" = (
/obj/structure/cable,
/obj/effect/turf_decal/stripes/line{
icon_state = "warningline";
dir = 4
},
/turf/open/floor/plating/snowed/icemoon,
@@ -563,15 +532,12 @@
"bD" = (
/obj/effect/decal/cleanable/robot_debris,
/obj/effect/turf_decal/tile/yellow{
icon_state = "tile_corner";
dir = 1
},
/obj/effect/turf_decal/tile/yellow{
icon_state = "tile_corner";
dir = 8
},
/obj/effect/turf_decal/stripes/line{
icon_state = "warningline";
dir = 8
},
/obj/item/book/manual/wiki/engineering_singulo_tesla,
@@ -579,7 +545,6 @@
/area/icemoon/surface/outdoors)
"bE" = (
/obj/effect/turf_decal/trimline/yellow/filled/line{
icon_state = "trimline_fill";
dir = 8
},
/obj/structure/cable,
@@ -592,23 +557,21 @@
/area/icemoon/surface/outdoors)
"bG" = (
/obj/effect/turf_decal/trimline/yellow/filled/warning{
icon_state = "trimline_warn_fill";
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
icon_state = "pipe11-2";
dir = 6
dir = 6;
icon_state = "pipe11-2"
},
/turf/open/floor/plasteel/icemoon,
/area/icemoon/surface/outdoors)
"bH" = (
/obj/effect/turf_decal/trimline/yellow/filled/warning{
icon_state = "trimline_warn_fill";
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
icon_state = "pipe11-2";
dir = 8
dir = 8;
icon_state = "pipe11-2"
},
/turf/open/floor/plasteel/icemoon,
/area/icemoon/surface/outdoors)
@@ -617,58 +580,58 @@
note = "Chief's asked me to check on the machinery inside PDA. He's also worried about Build, but i'm sure Harry'll handle the construction. I just need to work on Internals. Fuck i'm hungry"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
icon_state = "pipe11-2";
dir = 8
dir = 8;
icon_state = "pipe11-2"
},
/turf/open/floor/plasteel/icemoon,
/area/icemoon/surface/outdoors)
"bJ" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
icon_state = "pipe11-2";
dir = 8
dir = 8;
icon_state = "pipe11-2"
},
/turf/open/floor/plasteel/icemoon,
/area/icemoon/surface/outdoors)
"bK" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
icon_state = "pipe11-2";
dir = 8
dir = 8;
icon_state = "pipe11-2"
},
/turf/open/floor/plasteel/icemoon,
/area/icemoon/surface/outdoors)
"bL" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{
icon_state = "manifold-2";
dir = 1
dir = 1;
icon_state = "manifold-2"
},
/turf/open/floor/plasteel/icemoon,
/area/icemoon/surface/outdoors)
"bM" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
icon_state = "pipe11-2";
dir = 8
dir = 8;
icon_state = "pipe11-2"
},
/obj/machinery/atmospherics/pipe/simple/supply/visible,
/turf/open/floor/plasteel/icemoon,
/area/icemoon/surface/outdoors)
"bN" = (
/obj/machinery/atmospherics/components/trinary/filter/flipped{
icon_state = "filter_off_f";
dir = 8
dir = 8;
icon_state = "filter_off_f"
},
/turf/open/floor/plasteel/icemoon,
/area/icemoon/surface/outdoors)
"bO" = (
/obj/machinery/atmospherics/pipe/simple/dark/visible{
icon_state = "pipe11-2";
dir = 8
dir = 8;
icon_state = "pipe11-2"
},
/turf/open/floor/plasteel/icemoon,
/area/icemoon/surface/outdoors)
"bP" = (
/obj/machinery/atmospherics/pipe/simple/dark/visible{
icon_state = "pipe11-2";
dir = 10
dir = 10;
icon_state = "pipe11-2"
},
/turf/open/floor/plasteel/icemoon,
/area/icemoon/surface/outdoors)
@@ -693,7 +656,6 @@
pixel_x = -32
},
/obj/effect/turf_decal/trimline/yellow/filled/line{
icon_state = "trimline_fill";
dir = 8
},
/obj/structure/cable,
@@ -705,23 +667,23 @@
/area/icemoon/surface/outdoors)
"bW" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
icon_state = "scrub_map_on-2";
dir = 4
dir = 4;
icon_state = "scrub_map_on-2"
},
/turf/open/floor/plasteel/icemoon,
/area/icemoon/surface/outdoors)
"bX" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
icon_state = "manifold-2";
dir = 1
dir = 1;
icon_state = "manifold-2"
},
/turf/open/floor/plasteel/icemoon,
/area/icemoon/surface/outdoors)
"bY" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
icon_state = "pipe11-2";
dir = 8
dir = 8;
icon_state = "pipe11-2"
},
/obj/structure/cable,
/turf/open/floor/plasteel/icemoon,
@@ -731,19 +693,18 @@
pixel_x = 32
},
/obj/effect/turf_decal/trimline/yellow/filled/line{
icon_state = "trimline_fill";
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
icon_state = "pipe11-2";
dir = 9
dir = 9;
icon_state = "pipe11-2"
},
/turf/open/floor/plasteel/icemoon,
/area/icemoon/surface/outdoors)
"ca" = (
/obj/machinery/atmospherics/components/binary/pump{
icon_state = "pump_map-2";
dir = 1
dir = 1;
icon_state = "pump_map-2"
},
/turf/open/floor/plasteel/icemoon,
/area/icemoon/surface/outdoors)
@@ -757,22 +718,22 @@
/area/icemoon/surface/outdoors)
"cd" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
icon_state = "connector_map-2";
dir = 4
dir = 4;
icon_state = "connector_map-2"
},
/turf/open/floor/plasteel/icemoon,
/area/icemoon/surface/outdoors)
"ce" = (
/obj/machinery/atmospherics/pipe/manifold/dark/visible{
icon_state = "manifold-2";
dir = 4
dir = 4;
icon_state = "manifold-2"
},
/turf/open/floor/plasteel/icemoon,
/area/icemoon/surface/outdoors)
"cf" = (
/obj/machinery/atmospherics/pipe/simple/green/visible{
icon_state = "pipe11-2";
dir = 1
dir = 1;
icon_state = "pipe11-2"
},
/obj/machinery/airalarm/directional/east,
/turf/open/floor/plasteel/icemoon,
@@ -783,7 +744,6 @@
/area/icemoon/surface/outdoors)
"ch" = (
/obj/effect/turf_decal/trimline/yellow/filled/line{
icon_state = "trimline_fill";
dir = 10
},
/obj/structure/cable,
@@ -805,19 +765,17 @@
/area/icemoon/surface/outdoors)
"cl" = (
/obj/effect/turf_decal/trimline/yellow/filled/line{
icon_state = "trimline_fill";
dir = 4
},
/obj/machinery/light/dim{
icon_state = "tube";
dir = 4
},
/turf/open/floor/plasteel/icemoon,
/area/icemoon/surface/outdoors)
"cm" = (
/obj/machinery/atmospherics/pipe/simple/supply/visible{
icon_state = "pipe11-2";
dir = 5
dir = 5;
icon_state = "pipe11-2"
},
/obj/structure/sign/poster/contraband/atmosia_independence{
pixel_x = -32
@@ -830,8 +788,8 @@
/area/icemoon/surface/outdoors)
"co" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
icon_state = "connector_map-2";
dir = 8
dir = 8;
icon_state = "connector_map-2"
},
/turf/open/floor/plasteel/icemoon,
/area/icemoon/surface/outdoors)
@@ -841,25 +799,24 @@
/area/icemoon/surface/outdoors)
"cq" = (
/obj/machinery/atmospherics/pipe/simple/green/visible{
icon_state = "pipe11-2";
dir = 6
dir = 6;
icon_state = "pipe11-2"
},
/turf/open/floor/plasteel/icemoon,
/area/icemoon/surface/outdoors)
"cr" = (
/obj/machinery/atmospherics/components/binary/pump{
icon_state = "pump_map-2";
dir = 8
dir = 8;
icon_state = "pump_map-2"
},
/turf/open/floor/plasteel/icemoon,
/area/icemoon/surface/outdoors)
"cs" = (
/obj/machinery/atmospherics/pipe/simple/green/visible{
icon_state = "pipe11-2";
dir = 1
dir = 1;
icon_state = "pipe11-2"
},
/obj/machinery/light/dim{
icon_state = "tube";
dir = 4
},
/turf/open/floor/plasteel/icemoon,
@@ -870,7 +827,6 @@
req_access_txt = "204"
},
/obj/effect/turf_decal/trimline/yellow/filled/line{
icon_state = "trimline_fill";
dir = 1
},
/obj/effect/turf_decal/trimline/yellow/filled/line,
@@ -889,8 +845,8 @@
/area/icemoon/surface/outdoors)
"cw" = (
/obj/machinery/atmospherics/pipe/manifold/supply/visible{
icon_state = "manifold-2";
dir = 4
dir = 4;
icon_state = "manifold-2"
},
/turf/open/floor/plasteel/icemoon,
/area/icemoon/surface/outdoors)
@@ -904,23 +860,23 @@
/area/icemoon/surface/outdoors)
"cz" = (
/obj/machinery/atmospherics/pipe/simple/green/visible{
icon_state = "pipe11-2";
dir = 4
dir = 4;
icon_state = "pipe11-2"
},
/turf/open/floor/plasteel/icemoon,
/area/icemoon/surface/outdoors)
"cA" = (
/obj/machinery/atmospherics/pipe/simple/green/visible{
icon_state = "pipe11-2";
dir = 4
dir = 4;
icon_state = "pipe11-2"
},
/obj/machinery/atmospherics/components/binary/pump,
/turf/open/floor/plasteel/icemoon,
/area/icemoon/surface/outdoors)
"cB" = (
/obj/machinery/atmospherics/pipe/simple/green/visible{
icon_state = "pipe11-2";
dir = 9
dir = 9;
icon_state = "pipe11-2"
},
/turf/open/floor/plasteel/icemoon,
/area/icemoon/surface/outdoors)
@@ -928,7 +884,6 @@
/obj/structure/cable,
/obj/effect/decal/cleanable/oil,
/obj/effect/turf_decal/stripes/line{
icon_state = "warningline";
dir = 10
},
/turf/open/floor/plating/icemoon,
@@ -951,14 +906,12 @@
/obj/structure/cable,
/obj/machinery/field/generator,
/obj/effect/turf_decal/stripes/line{
icon_state = "warningline";
dir = 6
},
/turf/open/floor/plating/icemoon,
/area/icemoon/surface/outdoors)
"cH" = (
/obj/effect/turf_decal/trimline/yellow/filled/line{
icon_state = "trimline_fill";
dir = 1
},
/obj/structure/cable,
@@ -982,19 +935,18 @@
/area/icemoon/surface/outdoors)
"cL" = (
/obj/machinery/atmospherics/pipe/manifold/supply/visible{
icon_state = "manifold-2";
dir = 8
dir = 8;
icon_state = "manifold-2"
},
/obj/structure/cable,
/turf/open/floor/plasteel/icemoon,
/area/icemoon/surface/outdoors)
"cM" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
icon_state = "vent_map_on-2";
dir = 8
dir = 8;
icon_state = "vent_map_on-2"
},
/obj/effect/turf_decal/trimline/yellow/filled/line{
icon_state = "trimline_fill";
dir = 4
},
/turf/open/floor/plasteel/icemoon,
@@ -1006,8 +958,8 @@
/area/icemoon/surface/outdoors)
"cO" = (
/obj/machinery/atmospherics/components/binary/pump{
icon_state = "pump_map-2";
dir = 1
dir = 1;
icon_state = "pump_map-2"
},
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel/icemoon,
@@ -1020,7 +972,6 @@
"cQ" = (
/obj/effect/turf_decal/stripes/corner,
/obj/effect/turf_decal/stripes/corner{
icon_state = "warninglinecorner";
dir = 8
},
/obj/machinery/light/small,
@@ -1028,26 +979,24 @@
/area/icemoon/surface/outdoors)
"cR" = (
/obj/machinery/atmospherics/pipe/simple/dark/visible{
icon_state = "pipe11-2";
dir = 6
dir = 6;
icon_state = "pipe11-2"
},
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel/icemoon,
/area/icemoon/surface/outdoors)
"cS" = (
/obj/machinery/atmospherics/pipe/simple/dark/visible{
icon_state = "pipe11-2";
dir = 9
dir = 9;
icon_state = "pipe11-2"
},
/obj/effect/turf_decal/stripes/corner{
icon_state = "warninglinecorner";
dir = 8
},
/turf/open/floor/plasteel/icemoon,
/area/icemoon/surface/outdoors)
"cT" = (
/obj/machinery/power/emitter{
icon_state = "emitter";
dir = 1
},
/obj/structure/cable,
@@ -1078,7 +1027,6 @@
"cY" = (
/obj/effect/turf_decal/trimline/neutral/filled/line,
/obj/effect/turf_decal/trimline/yellow/filled/corner{
icon_state = "trimline_corner_fill";
dir = 4
},
/turf/open/floor/plasteel/icemoon,
@@ -1175,7 +1123,6 @@
/area/icemoon/surface/outdoors)
"dt" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
icon_state = "trimline_fill";
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -1184,7 +1131,6 @@
/area/icemoon/surface/outdoors)
"du" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
icon_state = "trimline_fill";
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -1193,7 +1139,6 @@
/area/icemoon/surface/outdoors)
"dv" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
icon_state = "trimline_fill";
dir = 1
},
/obj/machinery/airalarm/directional/north,
@@ -1201,40 +1146,39 @@
/area/icemoon/surface/outdoors)
"dw" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber{
icon_state = "scrub_map-2";
dir = 1
dir = 1;
icon_state = "scrub_map-2"
},
/turf/open/floor/engine/air,
/area/icemoon/surface/outdoors)
"dx" = (
/obj/machinery/atmospherics/components/unary/vent_pump/high_volume{
icon_state = "vent_map-2";
dir = 1
dir = 1;
icon_state = "vent_map-2"
},
/turf/open/floor/engine/air,
/area/icemoon/surface/outdoors)
"dy" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber{
icon_state = "scrub_map-2";
dir = 1
dir = 1;
icon_state = "scrub_map-2"
},
/turf/open/floor/engine/vacuum,
/area/icemoon/surface/outdoors)
"dz" = (
/obj/machinery/atmospherics/components/unary/vent_pump/high_volume{
icon_state = "vent_map-2";
dir = 1
dir = 1;
icon_state = "vent_map-2"
},
/turf/open/floor/engine/vacuum,
/area/icemoon/surface/outdoors)
"dA" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
icon_state = "scrub_map_on-2";
dir = 1
dir = 1;
icon_state = "scrub_map_on-2"
},
/obj/effect/turf_decal/trimline/neutral/filled/line,
/obj/effect/turf_decal/weather/snow/corner{
icon_state = "snow_corner";
dir = 10
},
/turf/open/floor/plasteel/icemoon,
@@ -1242,16 +1186,16 @@
"dB" = (
/obj/effect/turf_decal/trimline/neutral/filled/line,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
icon_state = "pipe11-2";
dir = 5
dir = 5;
icon_state = "pipe11-2"
},
/obj/effect/turf_decal/weather/snow/corner,
/turf/open/floor/plasteel/icemoon,
/area/icemoon/surface/outdoors)
"dC" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
icon_state = "vent_map_on-2";
dir = 8
dir = 8;
icon_state = "vent_map_on-2"
},
/obj/effect/turf_decal/trimline/neutral/filled/line,
/obj/effect/turf_decal/weather/snow/corner,
@@ -39,7 +39,6 @@
"h" = (
/obj/structure/table/wood,
/obj/machinery/light/small{
icon_state = "bulb";
dir = 1
},
/obj/item/food/spaghetti/pastatomato{
@@ -265,7 +265,6 @@
/obj/item/feather,
/obj/structure/fluff/paper,
/obj/structure/fluff/paper{
icon_state = "paper";
dir = 1
},
/turf/open/floor/wood{
@@ -275,7 +274,6 @@
"bd" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/fluff/paper{
icon_state = "paper";
dir = 1
},
/turf/open/floor/wood{
@@ -285,7 +283,6 @@
/area/ruin/unpowered/buried_library)
"be" = (
/obj/structure/fluff/paper{
icon_state = "paper";
dir = 5
},
/turf/open/floor/wood{
@@ -295,7 +292,6 @@
"bf" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/fluff/paper{
icon_state = "paper";
dir = 4
},
/turf/open/floor/wood{
@@ -413,7 +409,6 @@
"bC" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/fluff/paper{
icon_state = "paper";
dir = 1
},
/mob/living/simple_animal/pet/fox,
@@ -479,7 +474,6 @@
/area/ruin/unpowered/buried_library)
"bL" = (
/obj/structure/fluff/paper{
icon_state = "paper";
dir = 10
},
/turf/open/floor/wood{
@@ -489,7 +483,6 @@
/area/ruin/unpowered/buried_library)
"bM" = (
/obj/structure/fluff/paper{
icon_state = "paper";
dir = 1
},
/turf/open/floor/wood{
@@ -27,8 +27,8 @@
/area/ruin/powered)
"g" = (
/obj/machinery/smartfridge/survival_pod{
name = "dusty survival pod storage";
desc = "A heated storage unit. This one's seen better days."
desc = "A heated storage unit. This one's seen better days.";
name = "dusty survival pod storage"
},
/turf/open/floor/pod/dark,
/area/ruin/powered)
@@ -82,7 +82,6 @@
/obj/machinery/camera/xray{
c_tag = "Medbay";
dir = 9;
name = "security camera";
network = list("fsci");
screen_loc = ""
},
@@ -1092,7 +1091,6 @@
/obj/machinery/camera/xray{
c_tag = "Conference room";
dir = 8;
name = "security camera";
network = list("fsc");
screen_loc = ""
},
@@ -1181,7 +1179,6 @@
/obj/machinery/camera/xray{
c_tag = "Cargo pod";
dir = 6;
name = "security camera";
network = list("fsci");
screen_loc = ""
},
@@ -699,7 +699,6 @@
"cd" = (
/obj/machinery/plumbing/synthesizer{
desc = "Produces a single chemical at a given volume. This one appears to have been hotwired to generate universal enzyme.";
dir = 2;
dispensable_reagents = list(/datum/reagent/consumable/enzyme);
reagent_id = /datum/reagent/consumable/enzyme
},
@@ -708,7 +707,6 @@
"ce" = (
/obj/machinery/plumbing/synthesizer{
desc = "Produces a single chemical at a given volume. This one appears to have been hotwired to generate honey.";
dir = 2;
dispensable_reagents = list(/datum/reagent/consumable/honey);
reagent_id = /datum/reagent/consumable/honey
},
@@ -717,7 +715,6 @@
"cf" = (
/obj/machinery/plumbing/synthesizer{
desc = "Produces a single chemical at a given volume. This one seems to have been hotwired to produce... blood?";
dir = 2;
dispensable_reagents = list(/datum/reagent/blood);
reagent_id = /datum/reagent/blood
},
+6 -19
View File
@@ -437,9 +437,7 @@
/turf/open/floor/plasteel/freezer,
/area/awaymission/cabin)
"bl" = (
/obj/machinery/vending/autodrobe{
req_access_txt = "0"
},
/obj/machinery/vending/autodrobe,
/turf/open/floor/wood,
/area/awaymission/cabin)
"bm" = (
@@ -593,9 +591,7 @@
/turf/open/floor/wood,
/area/awaymission/cabin)
"bN" = (
/obj/machinery/vending/boozeomat{
req_access_txt = "0"
},
/obj/machinery/vending/boozeomat,
/turf/open/floor/wood,
/area/awaymission/cabin)
"bO" = (
@@ -1102,7 +1098,6 @@
anchored = 1;
density = 1;
desc = "Generates power from lava!";
dir = 2;
icon = 'icons/obj/atmospherics/pipes/simple.dmi';
icon_state = "turbine";
name = "geothermal generator"
@@ -1119,8 +1114,7 @@
melee_damage_lower = 10;
melee_damage_upper = 20;
name = "fat space polar bear";
speed = 3;
wander = 1
speed = 3
},
/turf/open/floor/plating/snowed/temperatre,
/area/awaymission/cabin/snowforest/sovietsurface)
@@ -1283,8 +1277,7 @@
melee_damage_lower = 10;
melee_damage_upper = 20;
name = "fat space polar bear";
speed = 3;
wander = 1
speed = 3
},
/turf/open/floor/plating/snowed/temperatre,
/area/awaymission/cabin/snowforest/sovietsurface)
@@ -1958,7 +1951,6 @@
/obj/structure/ladder/unbreakable{
desc = "Who left the grate open?";
height = 1;
icon = 'icons/obj/structures.dmi';
icon_state = "ladder01";
id = "dealwentoffwithoutahitchBRO";
name = "Grate";
@@ -2383,7 +2375,6 @@
"gv" = (
/obj/structure/ladder/unbreakable{
desc = "Finally.";
height = 0;
icon_state = "ladder10";
id = "whyisitcalledladder10andnotladder1";
name = "Freedom"
@@ -2414,7 +2405,6 @@
/obj/effect/decal/cleanable/dirt,
/obj/structure/ladder/unbreakable{
desc = "Yeah, I'll just go back to jail instead of this. It's not like there is an escape out of here, right?";
height = 0;
icon_state = "ladder10";
id = "dealwentoffwithoutahitchBRO";
name = "Sewer Ladder"
@@ -2537,7 +2527,6 @@
},
/obj/effect/turf_decal/tile/blue,
/obj/item/food/egg/rainbow{
anchored = 0;
desc = "Was an egg really worth this much effort?";
name = "easter egg"
},
@@ -3145,7 +3134,7 @@
/area/awaymission/cabin)
"io" = (
/obj/structure/extinguisher_cabinet{
pixel_x = -24;
pixel_x = -24
},
/turf/open/floor/wood,
/area/awaymission/cabin)
@@ -5262,9 +5251,7 @@
/turf/open/floor/plasteel/white,
/area/awaymission/cabin)
"nN" = (
/obj/machinery/light/small{
dir = 2
},
/obj/machinery/light/small,
/turf/open/floor/wood,
/area/awaymission/cabin)
"nO" = (
@@ -168,9 +168,7 @@
/obj/effect/turf_decal/tile/brown{
dir = 8
},
/obj/machinery/computer/security/qm{
dir = 2
},
/obj/machinery/computer/security/qm,
/turf/open/floor/plasteel,
/area/quartermaster/qm)
"aaw" = (
@@ -223,9 +221,7 @@
/obj/effect/turf_decal/tile/brown{
dir = 4
},
/obj/machinery/computer/cargo{
dir = 2
},
/obj/machinery/computer/cargo,
/turf/open/floor/plasteel,
/area/quartermaster/qm)
"aaE" = (
-33
View File
@@ -61,7 +61,6 @@
"n" = (
/obj/effect/landmark/mafia,
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 9
},
/obj/effect/turf_decal/trimline/brown/filled/corner,
@@ -69,7 +68,6 @@
/area/mafia)
"o" = (
/obj/effect/turf_decal/trimline/brown/filled/end{
icon_state = "trimline_end_fill";
dir = 4
},
/obj/structure/closet{
@@ -94,7 +92,6 @@
/area/mafia)
"r" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 9
},
/obj/structure/closet{
@@ -107,7 +104,6 @@
/area/mafia)
"s" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 9
},
/turf/open/floor/plasteel,
@@ -134,7 +130,6 @@
/area/mafia)
"w" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 1
},
/obj/effect/turf_decal/trimline/brown/filled/corner,
@@ -142,7 +137,6 @@
/area/mafia)
"x" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 1
},
/obj/effect/turf_decal/trimline/brown/filled/line,
@@ -150,14 +144,12 @@
/area/mafia)
"y" = (
/obj/effect/turf_decal/trimline/brown/filled/end{
icon_state = "trimline_end_fill";
dir = 4
},
/turf/open/floor/plasteel,
/area/mafia)
"z" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 5
},
/obj/structure/closet{
@@ -171,54 +163,45 @@
"A" = (
/obj/effect/landmark/mafia,
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 6
},
/turf/open/floor/plasteel,
/area/mafia)
"B" = (
/obj/effect/turf_decal/trimline/brown/filled/end{
icon_state = "trimline_end_fill";
dir = 1
},
/turf/open/floor/plasteel,
/area/mafia)
"C" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 4
},
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 8
},
/turf/open/floor/plasteel,
/area/mafia)
"D" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 10
},
/obj/effect/turf_decal/trimline/brown/filled/corner{
icon_state = "trimline_corner_fill";
dir = 4
},
/turf/open/floor/plasteel,
/area/mafia)
"E" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 1
},
/obj/effect/turf_decal/trimline/brown/filled/corner{
icon_state = "trimline_corner_fill";
dir = 8
},
/turf/open/floor/plasteel,
/area/mafia)
"F" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 5
},
/turf/open/floor/plasteel,
@@ -226,14 +209,12 @@
"G" = (
/obj/effect/landmark/mafia,
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 10
},
/turf/open/floor/plasteel,
/area/mafia)
"H" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 10
},
/obj/structure/closet{
@@ -246,7 +227,6 @@
/area/mafia)
"I" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 6
},
/obj/structure/closet{
@@ -260,18 +240,15 @@
"J" = (
/obj/effect/landmark/mafia,
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 6
},
/obj/effect/turf_decal/trimline/brown/filled/corner{
icon_state = "trimline_corner_fill";
dir = 1
},
/turf/open/floor/plasteel,
/area/mafia)
"K" = (
/obj/effect/turf_decal/trimline/brown/filled/end{
icon_state = "trimline_end_fill";
dir = 8
},
/obj/structure/closet{
@@ -285,14 +262,12 @@
"L" = (
/obj/effect/landmark/mafia,
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 5
},
/turf/open/floor/plasteel,
/area/mafia)
"M" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 10
},
/turf/open/floor/plasteel,
@@ -300,18 +275,15 @@
"N" = (
/obj/effect/turf_decal/trimline/brown/filled/line,
/obj/effect/turf_decal/trimline/brown/filled/corner{
icon_state = "trimline_corner_fill";
dir = 4
},
/turf/open/floor/plasteel,
/area/mafia)
"O" = (
/obj/effect/turf_decal/trimline/brown/filled/corner{
icon_state = "trimline_corner_fill";
dir = 8
},
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 5
},
/turf/open/floor/plasteel,
@@ -323,7 +295,6 @@
"Q" = (
/obj/effect/landmark/mafia,
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 9
},
/turf/open/floor/plasteel,
@@ -345,7 +316,6 @@
/area/mafia)
"S" = (
/obj/effect/turf_decal/trimline/brown/filled/end{
icon_state = "trimline_end_fill";
dir = 8
},
/turf/open/floor/plasteel,
@@ -353,7 +323,6 @@
"T" = (
/obj/effect/turf_decal/trimline/brown/filled/line,
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 1
},
/turf/open/floor/plasteel,
@@ -361,14 +330,12 @@
"U" = (
/obj/effect/turf_decal/trimline/brown/filled/line,
/obj/effect/turf_decal/trimline/brown/filled/corner{
icon_state = "trimline_corner_fill";
dir = 1
},
/turf/open/floor/plasteel,
/area/mafia)
"V" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 6
},
/turf/open/floor/plasteel,
-2
View File
@@ -178,7 +178,6 @@
/area/mafia)
"y" = (
/obj/structure/chair/office{
dir = 2;
name = "tactical swivel chair"
},
/turf/open/floor/mineral/plastitanium,
@@ -195,7 +194,6 @@
dir = 1
},
/obj/structure/chair/office{
dir = 2;
name = "tactical swivel chair"
},
/turf/open/floor/plasteel/dark,
+1 -1
View File
@@ -76155,7 +76155,7 @@
"tgQ" = (
/obj/structure/water_source/puddle,
/obj/structure/flora/junglebush/large{
pixel_y = 1
pixel_y = 0
},
/obj/structure/cable,
/turf/open/floor/grass,
+29 -72
View File
@@ -40,7 +40,6 @@
/area/engine/gravity_generator)
"al" = (
/obj/machinery/airalarm{
frequency = 1439;
locked = 0;
pixel_y = 23
},
@@ -62,7 +61,6 @@
/area/space/nearstation)
"ap" = (
/obj/machinery/airalarm{
frequency = 1439;
locked = 0;
pixel_y = 23
},
@@ -83,7 +81,6 @@
charge = 5e+006
},
/obj/machinery/airalarm{
frequency = 1439;
locked = 0;
pixel_y = 23
},
@@ -172,12 +169,8 @@
dir = 4
},
/obj/machinery/portable_atmospherics/canister/nitrous_oxide,
/obj/effect/turf_decal/bot{
dir = 2
},
/turf/open/floor/plasteel{
dir = 2
},
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/engine/atmos)
"aO" = (
/obj/machinery/atmospherics/components/binary/pump{
@@ -239,12 +232,8 @@
dir = 4
},
/obj/machinery/portable_atmospherics/canister,
/obj/effect/turf_decal/bot{
dir = 2
},
/turf/open/floor/plasteel{
dir = 2
},
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/engine/atmos)
"bc" = (
/obj/machinery/atmospherics/components/binary/pump{
@@ -397,7 +386,6 @@
pixel_x = -25
},
/obj/machinery/airalarm{
frequency = 1439;
locked = 0;
pixel_y = 23
},
@@ -427,7 +415,6 @@
/area/hallway/primary/central)
"bG" = (
/obj/machinery/airalarm{
frequency = 1439;
locked = 0;
pixel_y = 23
},
@@ -491,7 +478,6 @@
/area/hallway/primary/central)
"bU" = (
/obj/machinery/airalarm{
frequency = 1439;
locked = 0;
pixel_y = 23
},
@@ -752,7 +738,6 @@
/area/construction)
"da" = (
/obj/machinery/airalarm{
frequency = 1439;
locked = 0;
pixel_y = 23
},
@@ -947,11 +932,6 @@
"dW" = (
/turf/open/floor/plasteel,
/area/engine/engineering)
"dX" = (
/turf/open/floor/plasteel{
dir = 2
},
/area/hallway/secondary/service)
"dY" = (
/turf/open/floor/plasteel,
/area/hallway/secondary/service)
@@ -1098,8 +1078,7 @@
/area/hallway/secondary/service)
"eQ" = (
/obj/structure/railing{
dir = 4;
icon_state = "railing"
dir = 4
},
/turf/open/floor/plating,
/area/engine/storage)
@@ -1109,8 +1088,7 @@
/area/engine/storage)
"eX" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 4;
icon_state = "warningline_white"
dir = 4
},
/turf/open/floor/plating,
/area/engine/storage)
@@ -1203,8 +1181,7 @@
"iH" = (
/obj/effect/turf_decal/stripes/white/line,
/obj/structure/railing/corner{
dir = 4;
icon_state = "railing_corner"
dir = 4
},
/turf/open/floor/plating,
/area/engine/storage)
@@ -1219,8 +1196,7 @@
/area/hallway/secondary/service)
"jA" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 8;
icon_state = "warningline_white"
dir = 8
},
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -1243,8 +1219,7 @@
/area/construction)
"jV" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 6;
icon_state = "warningline_white"
dir = 6
},
/turf/open/floor/plating,
/area/engine/storage)
@@ -1359,12 +1334,10 @@
/area/construction)
"qR" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 9;
icon_state = "warningline_white"
dir = 9
},
/obj/structure/railing/corner{
dir = 1;
icon_state = "railing_corner"
dir = 1
},
/turf/open/floor/plating,
/area/engine/storage)
@@ -1392,26 +1365,22 @@
/area/construction)
"su" = (
/obj/structure/railing{
dir = 8;
icon_state = "railing"
dir = 8
},
/turf/open/floor/plating,
/area/hallway/secondary/service)
"sE" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 4;
icon_state = "warningline_white"
dir = 4
},
/obj/structure/railing{
dir = 8;
icon_state = "railing"
dir = 8
},
/turf/open/floor/plating,
/area/engine/storage)
"td" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 8;
icon_state = "warningline_white"
dir = 8
},
/turf/open/floor/plating,
/area/engine/storage)
@@ -1467,8 +1436,7 @@
/area/construction)
"xB" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 1;
icon_state = "warningline_white"
dir = 1
},
/turf/open/floor/plating,
/area/engine/storage)
@@ -1509,12 +1477,10 @@
/area/storage/primary)
"zd" = (
/obj/structure/railing{
dir = 4;
icon_state = "railing"
dir = 4
},
/obj/structure/railing{
dir = 8;
icon_state = "railing"
dir = 8
},
/turf/open/floor/plating,
/area/hallway/secondary/service)
@@ -1525,8 +1491,7 @@
/area/construction)
"zZ" = (
/obj/structure/disposalpipe/trunk{
dir = 1;
icon_state = "pipe-t"
dir = 1
},
/obj/machinery/disposal/bin,
/turf/open/floor/plating,
@@ -1537,8 +1502,7 @@
/area/engine/storage)
"Ai" = (
/obj/structure/railing/corner{
dir = 8;
icon_state = "railing_corner"
dir = 8
},
/turf/open/floor/plating,
/area/hallway/secondary/service)
@@ -1617,8 +1581,7 @@
"Eb" = (
/obj/effect/turf_decal/stripes/white/line,
/obj/structure/railing{
dir = 1;
icon_state = "railing"
dir = 1
},
/turf/open/floor/plating,
/area/engine/storage)
@@ -1628,12 +1591,10 @@
/area/construction)
"EH" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 1;
icon_state = "warningline_white"
dir = 1
},
/obj/effect/turf_decal/stripes/white/line{
dir = 4;
icon_state = "warningline_white"
dir = 4
},
/turf/open/floor/plating,
/area/engine/storage)
@@ -1683,8 +1644,7 @@
"IL" = (
/obj/structure/railing/corner,
/obj/structure/railing/corner{
dir = 8;
icon_state = "railing_corner"
dir = 8
},
/turf/open/floor/plating,
/area/hallway/secondary/service)
@@ -1731,8 +1691,7 @@
/area/maintenance/department/bridge)
"Lu" = (
/obj/structure/railing{
dir = 4;
icon_state = "railing"
dir = 4
},
/turf/open/floor/plating,
/area/hallway/secondary/service)
@@ -1780,8 +1739,7 @@
/area/engine/storage)
"Qo" = (
/obj/structure/disposalpipe/trunk/multiz/down{
dir = 1;
icon_state = "pipe-down"
dir = 1
},
/turf/open/floor/plating,
/area/hallway/secondary/service)
@@ -1891,8 +1849,7 @@
/area/construction)
"ZQ" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 5;
icon_state = "warningline_white"
dir = 5
},
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -5533,8 +5490,8 @@ af
TY
Gb
Gb
dX
dX
dY
dY
dY
dY
dY
-2
View File
@@ -73,7 +73,6 @@
/obj/effect/turf_decal/bot,
/obj/structure/chair/comfy/shuttle,
/obj/machinery/light{
icon_state = "tube";
dir = 1
},
/turf/open/floor/mineral/plastitanium,
@@ -90,7 +89,6 @@
pixel_y = 32
},
/obj/machinery/light{
icon_state = "tube";
dir = 1
},
/turf/open/floor/mineral/plastitanium,
@@ -45,7 +45,6 @@
name = "Emergency Shuttle Airlock"
},
/obj/docking_port/mobile/emergency/shuttle_build{
dwidth = 9;
height = 15;
name = "Shuttle Under Construction";
port_direction = 4;
+6 -12
View File
@@ -78,8 +78,7 @@
/area/shuttle/escape/luxury)
"ap" = (
/obj/structure/chair/comfy/teal{
dir = 4;
icon_state = "comfychair"
dir = 4
},
/turf/open/floor/mineral/diamond,
/area/shuttle/escape)
@@ -146,8 +145,7 @@
id = "ohnopoors";
name = "window shutters";
pixel_x = -5;
pixel_y = 26;
req_access_txt = "0"
pixel_y = 26
},
/turf/open/floor/carpet/blue,
/area/shuttle/escape/luxury)
@@ -226,8 +224,7 @@
/area/shuttle/escape/luxury)
"aM" = (
/obj/structure/chair/comfy/teal{
dir = 4;
icon_state = "comfychair"
dir = 4
},
/turf/open/floor/mineral/diamond,
/area/shuttle/escape/luxury)
@@ -454,8 +451,7 @@
layer = 2.9
},
/turf/open/floor/holofloor/beach/coast_t{
dir = 8;
icon_state = "sandwater_t"
dir = 8
},
/area/shuttle/escape/luxury)
"bx" = (
@@ -522,8 +518,7 @@
"bG" = (
/obj/machinery/door/window/eastleft,
/turf/open/floor/holofloor/beach/coast_t{
dir = 8;
icon_state = "sandwater_t"
dir = 8
},
/area/shuttle/escape/luxury)
"bH" = (
@@ -562,8 +557,7 @@
/obj/structure/window/reinforced,
/obj/machinery/door/window/eastright,
/turf/open/floor/holofloor/beach/coast_t{
dir = 8;
icon_state = "sandwater_t"
dir = 8
},
/area/shuttle/escape/luxury)
"bN" = (
+12 -12
View File
@@ -33,8 +33,8 @@
"bg" = (
/obj/structure/table/reinforced,
/obj/item/storage/toolbox/mechanical{
pixel_y = 8;
pixel_x = -2
pixel_x = -2;
pixel_y = 8
},
/obj/item/storage/toolbox/electrical,
/obj/effect/turf_decal/stripes/line,
@@ -43,8 +43,8 @@
"bS" = (
/obj/structure/table/reinforced,
/obj/item/storage/box/lights/mixed{
pixel_y = 9;
pixel_x = -5
pixel_x = -5;
pixel_y = 9
},
/obj/item/storage/box/matches{
pixel_y = 5
@@ -413,8 +413,8 @@
pixel_y = 4
},
/obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy{
pixel_y = 5;
pixel_x = 6
pixel_x = 6;
pixel_y = 5
},
/turf/open/floor/plasteel/white,
/area/shuttle/escape)
@@ -494,8 +494,8 @@
/area/shuttle/escape)
"rg" = (
/obj/item/clothing/glasses/welding{
pixel_y = 8;
pixel_x = 3
pixel_x = 3;
pixel_y = 8
},
/obj/item/weldingtool/largetank{
pixel_x = -3
@@ -882,8 +882,8 @@
},
/obj/structure/table/glass,
/obj/item/storage/box/monkeycubes{
pixel_y = 10;
pixel_x = 5
pixel_x = 5;
pixel_y = 10
},
/obj/item/food/monkeycube{
pixel_x = 5
@@ -1156,8 +1156,8 @@
},
/obj/structure/table/glass,
/obj/item/clothing/suit/monkeysuit{
pixel_y = 4;
pixel_x = -2
pixel_x = -2;
pixel_y = 4
},
/obj/item/clothing/mask/gas/monkeymask{
pixel_x = 5;
-5
View File
@@ -77,7 +77,6 @@
/area/shuttle/hunter)
"q" = (
/obj/structure/shuttle/engine/heater{
icon_state = "heater";
dir = 8
},
/obj/structure/window/reinforced{
@@ -133,7 +132,6 @@
/area/shuttle/hunter)
"A" = (
/obj/machinery/computer/shuttle/hunter{
icon_state = "computer";
dir = 8
},
/turf/open/floor/pod/dark,
@@ -173,7 +171,6 @@
/area/shuttle/hunter)
"I" = (
/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/hunter{
icon_state = "computer";
dir = 8
},
/turf/open/floor/pod/dark,
@@ -216,14 +213,12 @@
/area/shuttle/hunter)
"M" = (
/obj/effect/mob_spawn/human/fugitive/bounty/armor{
icon_state = "sleeper";
dir = 1
},
/turf/open/floor/pod/light,
/area/shuttle/hunter)
"P" = (
/obj/structure/fluff/empty_sleeper{
icon_state = "sleeper-open";
dir = 1
},
/turf/open/floor/pod/light,
+1 -3
View File
@@ -216,9 +216,7 @@
/area/shuttle/hunter)
"N" = (
/obj/machinery/suit_storage_unit/standard_unit,
/obj/effect/turf_decal/stripes/line{
dir = 2
},
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/mineral/plastitanium,
/area/shuttle/hunter)
"Q" = (
-10
View File
@@ -98,7 +98,6 @@
dir = 4
},
/obj/effect/turf_decal/stripes/corner{
icon_state = "warninglinecorner";
dir = 8
},
/turf/open/floor/mineral/titanium/yellow,
@@ -112,7 +111,6 @@
/obj/structure/table,
/obj/machinery/airalarm{
dir = 8;
icon_state = "alarm0";
pixel_x = 22
},
/turf/open/floor/mineral/plastitanium,
@@ -175,7 +173,6 @@
},
/obj/structure/closet/crate/internals,
/obj/effect/turf_decal/box/corners{
icon_state = "box_corners";
dir = 1
},
/obj/machinery/airalarm{
@@ -186,11 +183,9 @@
/area/shuttle/mining/large)
"u" = (
/obj/effect/turf_decal/box/corners{
icon_state = "box_corners";
dir = 4
},
/obj/machinery/light/small{
icon_state = "bulb";
dir = 1
},
/turf/open/floor/mineral/plastitanium,
@@ -207,18 +202,15 @@
/area/shuttle/mining/large)
"w" = (
/obj/effect/turf_decal/box/corners{
icon_state = "box_corners";
dir = 1
},
/obj/machinery/light/small{
icon_state = "bulb";
dir = 1
},
/turf/open/floor/mineral/plastitanium,
/area/shuttle/mining/large)
"x" = (
/obj/effect/turf_decal/box/corners{
icon_state = "box_corners";
dir = 8
},
/turf/open/floor/mineral/plastitanium,
@@ -227,7 +219,6 @@
/obj/effect/decal/cleanable/dirt,
/obj/structure/ore_box,
/obj/effect/turf_decal/box/corners{
icon_state = "box_corners";
dir = 4
},
/obj/structure/extinguisher_cabinet{
@@ -257,7 +248,6 @@
/area/shuttle/mining/large)
"B" = (
/obj/effect/turf_decal/box/corners{
icon_state = "box_corners";
dir = 8
},
/obj/structure/cable,
+8 -18
View File
@@ -43,8 +43,7 @@
"ah" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/light/broken{
dir = 4;
icon_state = "tube-broken"
dir = 4
},
/obj/structure/closet/emcloset,
/turf/open/floor/plasteel/airless,
@@ -70,15 +69,13 @@
/area/shuttle/abandoned)
"am" = (
/obj/structure/shuttle/engine/propulsion/right{
dir = 1;
icon_state = "propulsion_r"
dir = 1
},
/turf/open/floor/plating/airless,
/area/shuttle/abandoned)
"an" = (
/obj/structure/shuttle/engine/propulsion/left{
dir = 1;
icon_state = "propulsion_l"
dir = 1
},
/turf/open/floor/plating/airless,
/area/shuttle/abandoned)
@@ -155,8 +152,7 @@
/obj/structure/frame/machine,
/obj/item/stack/cable_coil,
/obj/machinery/light/broken{
dir = 4;
icon_state = "tube-broken"
dir = 4
},
/turf/open/floor/plasteel/airless,
/area/shuttle/abandoned)
@@ -225,7 +221,6 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/urinal{
dir = 8;
icon_state = "urinal";
pixel_x = 32
},
/obj/structure/window/reinforced/tinted,
@@ -269,7 +264,6 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/urinal{
dir = 8;
icon_state = "urinal";
pixel_x = 32
},
/obj/structure/window/reinforced/tinted{
@@ -335,8 +329,7 @@
"ba" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/fluff/paper/stack{
dir = 4;
icon_state = "paperstack"
dir = 4
},
/obj/item/folder/yellow,
/turf/open/floor/plasteel/airless,
@@ -417,8 +410,7 @@
"bk" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/fluff/paper/stack{
dir = 1;
icon_state = "paperstack"
dir = 1
},
/turf/open/floor/plating/airless,
/area/shuttle/abandoned)
@@ -440,8 +432,7 @@
"bm" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/fluff/paper/stack{
dir = 8;
icon_state = "paperstack"
dir = 8
},
/obj/effect/turf_decal/tile/blue{
dir = 8
@@ -484,8 +475,7 @@
/area/shuttle/abandoned)
"br" = (
/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship{
dir = 1;
icon_state = "computer"
dir = 1
},
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/disk/holodisk/donutstation/whiteship,
+17 -38
View File
@@ -34,7 +34,6 @@
dir = 8;
dwidth = 11;
height = 17;
icon_state = "pinonclose";
id = "whiteship";
launch_status = 0;
movement_force = list("KNOCKDOWN" = 0, "THROW" = 0);
@@ -227,7 +226,6 @@
name = "NTMS-037 Bay Blast door"
},
/obj/machinery/conveyor{
dir = 2;
id = "NTMSLoad2";
name = "on ramp"
},
@@ -453,9 +451,7 @@
"aN" = (
/obj/machinery/light/small/built,
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/atmospherics/components/unary/tank/air{
dir = 2
},
/obj/machinery/atmospherics/components/unary/tank/air,
/obj/effect/turf_decal/bot,
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -485,8 +481,7 @@
/area/shuttle/abandoned/engine)
"aP" = (
/obj/structure/shuttle/engine/heater{
dir = 4;
icon_state = "heater"
dir = 4
},
/obj/structure/window/reinforced{
dir = 8
@@ -498,8 +493,7 @@
/area/shuttle/abandoned/engine)
"aQ" = (
/obj/structure/shuttle/engine/propulsion/left{
dir = 4;
icon_state = "propulsion_l"
dir = 4
},
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -615,8 +609,7 @@
"bb" = (
/obj/structure/ore_box,
/obj/effect/turf_decal/box/corners{
dir = 1;
icon_state = "box_corners"
dir = 1
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
@@ -942,8 +935,7 @@
/area/shuttle/abandoned/engine)
"bC" = (
/obj/structure/shuttle/engine/large{
dir = 4;
icon_state = "large_engine"
dir = 4
},
/turf/open/floor/plating,
/area/shuttle/abandoned/engine)
@@ -1159,8 +1151,7 @@
/area/shuttle/abandoned/crew)
"cc" = (
/obj/structure/shuttle/engine/heater{
dir = 4;
icon_state = "heater"
dir = 4
},
/obj/structure/window/reinforced{
dir = 8
@@ -1237,8 +1228,7 @@
"ck" = (
/obj/structure/chair/sofa/corner{
color = "#c45c57";
dir = 1;
icon_state = "sofacorner"
dir = 1
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/cobweb,
@@ -1348,8 +1338,7 @@
/area/shuttle/abandoned/crew)
"ct" = (
/obj/structure/shuttle/engine/large{
dir = 4;
icon_state = "large_engine"
dir = 4
},
/obj/effect/turf_decal/stripes/corner,
/turf/open/floor/plating,
@@ -1363,7 +1352,6 @@
"cv" = (
/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship{
dir = 4;
icon_state = "computer";
view_range = 14
},
/obj/effect/turf_decal/bot,
@@ -1551,8 +1539,7 @@
/area/shuttle/abandoned/crew)
"cL" = (
/obj/structure/shuttle/engine/propulsion/left{
dir = 4;
icon_state = "propulsion_l"
dir = 4
},
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -1682,8 +1669,7 @@
"cV" = (
/obj/structure/closet/secure_closet/personal,
/obj/effect/turf_decal/trimline/white/filled/line{
dir = 1;
icon_state = "trimline_fill"
dir = 1
},
/obj/effect/turf_decal/stripes/corner{
dir = 1
@@ -1700,8 +1686,7 @@
"cW" = (
/obj/structure/closet/secure_closet/personal,
/obj/effect/turf_decal/trimline/white/filled/line{
dir = 1;
icon_state = "trimline_fill"
dir = 1
},
/obj/machinery/airalarm/all_access{
dir = 1;
@@ -1716,8 +1701,7 @@
"cX" = (
/obj/machinery/washing_machine,
/obj/effect/turf_decal/trimline/white/filled/line{
dir = 1;
icon_state = "trimline_fill"
dir = 1
},
/obj/effect/turf_decal/stripes/corner{
dir = 4
@@ -1730,8 +1714,7 @@
"cY" = (
/obj/structure/frame/computer{
anchored = 1;
dir = 1;
icon_state = "0"
dir = 1
},
/obj/effect/turf_decal/bot,
/obj/effect/decal/cleanable/dirt,
@@ -1741,8 +1724,7 @@
"cZ" = (
/obj/structure/frame/computer{
anchored = 1;
dir = 1;
icon_state = "0"
dir = 1
},
/obj/machinery/light,
/obj/machinery/computer/security/telescreen{
@@ -1767,8 +1749,7 @@
"db" = (
/obj/structure/table,
/obj/effect/turf_decal/trimline/white/filled/line{
dir = 1;
icon_state = "trimline_fill"
dir = 1
},
/obj/effect/turf_decal/stripes/corner{
dir = 1
@@ -1787,8 +1768,7 @@
"dc" = (
/obj/structure/table,
/obj/effect/turf_decal/trimline/white/filled/line{
dir = 1;
icon_state = "trimline_fill"
dir = 1
},
/obj/effect/decal/cleanable/dirt,
/obj/item/storage/box/donkpockets{
@@ -1823,8 +1803,7 @@
/obj/item/reagent_containers/food/drinks/beer,
/obj/item/food/sandwich,
/obj/effect/turf_decal/trimline/white/filled/line{
dir = 1;
icon_state = "trimline_fill"
dir = 1
},
/turf/open/floor/mineral/plastitanium,
/area/shuttle/abandoned/bar)
-4
View File
@@ -31,10 +31,6 @@ if grep -P '\td[1-2] =' _maps/**/*.dmm; then
echo "ERROR: d1/d2 cable variables detected in maps, please remove them."
st=1
fi;
echo "Checking for pixel_[xy]"
if grep -P 'pixel_[xy] = 0' _maps/**/*.dmm; then
echo "pixel_x/pixel_y = 0 variables detected in maps, please review to ensure they are not dirty varedits."
fi;
echo "Checking for stacked cables"
if grep -P '"\w+" = \(\n([^)]+\n)*/obj/structure/cable,\n([^)]+\n)*/obj/structure/cable,\n([^)]+\n)*/area/.+\)' _maps/**/*.dmm; then
echo "found multiple cables on the same tile, please remove them."