Merge remote-tracking branch 'citadel/master' into lettern-git-updates
This commit is contained in:
silicons
File diff suppressed because it is too large
Load Diff
@@ -428,7 +428,7 @@
|
||||
/area/awaymission/cabin)
|
||||
"bm" = (
|
||||
/obj/machinery/door/airlock/wood{
|
||||
id_tag = "snowdinbutworse5";
|
||||
id_tag = "snowdorm5";
|
||||
name = "Cabin 5"
|
||||
},
|
||||
/obj/effect/mapping_helpers/network_builder/power_cable/yellow/auto,
|
||||
@@ -3318,7 +3318,7 @@
|
||||
/area/awaymission/cabin)
|
||||
"iV" = (
|
||||
/obj/machinery/door/airlock/wood{
|
||||
id_tag = "snowdinbutworse1";
|
||||
id_tag = "snowdorm1";
|
||||
name = "Cabin 1"
|
||||
},
|
||||
/obj/effect/mapping_helpers/network_builder/power_cable/yellow/auto,
|
||||
@@ -3326,7 +3326,7 @@
|
||||
/area/awaymission/cabin)
|
||||
"iW" = (
|
||||
/obj/machinery/door/airlock/wood{
|
||||
id_tag = "snowdinbutworse2";
|
||||
id_tag = "snowdorm2";
|
||||
name = "Cabin 2"
|
||||
},
|
||||
/obj/effect/mapping_helpers/network_builder/power_cable/yellow/auto,
|
||||
@@ -3334,7 +3334,7 @@
|
||||
/area/awaymission/cabin)
|
||||
"iX" = (
|
||||
/obj/machinery/door/airlock/wood{
|
||||
id_tag = "snowdinbutworse3";
|
||||
id_tag = "snowdorm3";
|
||||
name = "Cabin 3"
|
||||
},
|
||||
/obj/effect/mapping_helpers/network_builder/power_cable/yellow/auto,
|
||||
@@ -3342,7 +3342,7 @@
|
||||
/area/awaymission/cabin)
|
||||
"iY" = (
|
||||
/obj/machinery/door/airlock/wood{
|
||||
id_tag = "snowdinbutworse4";
|
||||
id_tag = "snowdorm4";
|
||||
name = "Cabin 4"
|
||||
},
|
||||
/obj/effect/mapping_helpers/network_builder/power_cable/yellow/auto,
|
||||
@@ -3419,31 +3419,37 @@
|
||||
/area/awaymission/cabin)
|
||||
"jg" = (
|
||||
/obj/machinery/button/door{
|
||||
id = "snowdinbutworse2";
|
||||
name = "airlock button";
|
||||
pixel_y = -27
|
||||
id = "snowdorm2";
|
||||
name = "Dorm Bolt Control";
|
||||
normaldoorcontrol = 1;
|
||||
pixel_y = -25;
|
||||
specialfunctions = 4
|
||||
},
|
||||
/turf/open/floor/wood,
|
||||
/area/awaymission/cabin)
|
||||
"jh" = (
|
||||
/obj/machinery/button/door{
|
||||
id = "snowdinbutworse1";
|
||||
name = "airlock button";
|
||||
pixel_y = -27
|
||||
id = "snowdorm1";
|
||||
name = "Dorm Bolt Control";
|
||||
normaldoorcontrol = 1;
|
||||
pixel_y = -25;
|
||||
specialfunctions = 4
|
||||
},
|
||||
/turf/open/floor/wood,
|
||||
/area/awaymission/cabin)
|
||||
"ji" = (
|
||||
/obj/machinery/button/door{
|
||||
id = "snowdinbutworse3";
|
||||
name = "airlock button";
|
||||
pixel_y = -27
|
||||
id = "snowdorm3";
|
||||
name = "Dorm Bolt Control";
|
||||
normaldoorcontrol = 1;
|
||||
pixel_y = -25;
|
||||
specialfunctions = 4
|
||||
},
|
||||
/turf/open/floor/wood,
|
||||
/area/awaymission/cabin)
|
||||
"jj" = (
|
||||
/obj/machinery/button/door{
|
||||
id = "snowdinbutworse4";
|
||||
id = "snowdorm4";
|
||||
name = "airlock button";
|
||||
pixel_y = -27
|
||||
},
|
||||
@@ -3451,7 +3457,7 @@
|
||||
/area/awaymission/cabin)
|
||||
"jk" = (
|
||||
/obj/machinery/button/door{
|
||||
id = "snowdinbutworse5";
|
||||
id = "snowdorm5";
|
||||
name = "airlock button";
|
||||
pixel_y = -27
|
||||
},
|
||||
@@ -4024,8 +4030,8 @@
|
||||
pixel_y = -2
|
||||
},
|
||||
/obj/item/clothing/head/christmashatg{
|
||||
pixel_y = 12;
|
||||
pixel_x = 3
|
||||
pixel_x = 3;
|
||||
pixel_y = 12
|
||||
},
|
||||
/turf/open/floor/plating/asteroid/snow,
|
||||
/area/awaymission/cabin/caves)
|
||||
|
||||
@@ -1,11 +1,22 @@
|
||||
{
|
||||
"map_name": "Lambda Station",
|
||||
"map_path": "map_files/LambdaStation",
|
||||
"map_file": "lambda.dmm",
|
||||
"map_file":[
|
||||
"lambda.dmm",
|
||||
"dorms.dmm"
|
||||
],
|
||||
"shuttles": {
|
||||
"cargo": "cargo_box",
|
||||
"ferry": "ferry_fancy",
|
||||
"whiteship": "whiteship_meta",
|
||||
"emergency": "emergency_meta"
|
||||
}
|
||||
"cargo": "cargo_box",
|
||||
"ferry": "ferry_fancy",
|
||||
"whiteship": "whiteship_meta",
|
||||
"emergency": "emergency_meta"
|
||||
},
|
||||
"traits":[
|
||||
{
|
||||
"Up":1
|
||||
},
|
||||
{
|
||||
"Down":-1
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
@@ -1128,8 +1128,7 @@
|
||||
/area/security/prison)
|
||||
"acI" = (
|
||||
/obj/machinery/door/poddoor/preopen{
|
||||
id = "executionfireblast";
|
||||
name = "blast door"
|
||||
id = "executionfireblast"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/general/hidden,
|
||||
/obj/machinery/door/firedoor,
|
||||
@@ -1280,8 +1279,7 @@
|
||||
/obj/effect/spawner/structure/window/reinforced,
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
|
||||
/obj/machinery/door/poddoor/preopen{
|
||||
id = "executionfireblast";
|
||||
name = "blast door"
|
||||
id = "executionfireblast"
|
||||
},
|
||||
/obj/machinery/door/firedoor,
|
||||
/turf/open/floor/plating,
|
||||
@@ -1296,8 +1294,7 @@
|
||||
"acZ" = (
|
||||
/obj/effect/spawner/structure/window/reinforced,
|
||||
/obj/machinery/door/poddoor/preopen{
|
||||
id = "executionfireblast";
|
||||
name = "blast door"
|
||||
id = "executionfireblast"
|
||||
},
|
||||
/obj/machinery/door/firedoor,
|
||||
/turf/open/floor/plating,
|
||||
@@ -21317,8 +21314,7 @@
|
||||
name = "Privacy Shutters";
|
||||
pixel_y = 24
|
||||
},
|
||||
/obj/structure/rack,
|
||||
/obj/item/storage/briefcase,
|
||||
/obj/machinery/vending/wardrobe/det_wardrobe,
|
||||
/turf/open/floor/plasteel/grimy,
|
||||
/area/security/detectives_office)
|
||||
"aYk" = (
|
||||
@@ -46725,12 +46721,6 @@
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/engine/engineering)
|
||||
"cjb" = (
|
||||
/obj/effect/turf_decal/delivery,
|
||||
/turf/open/floor/plasteel{
|
||||
name = "floor"
|
||||
},
|
||||
/area/engine/engineering)
|
||||
"cjc" = (
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 4
|
||||
@@ -56119,7 +56109,6 @@
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/door/airlock/maintenance/abandoned{
|
||||
name = "maintenance access";
|
||||
req_access_txt = "12"
|
||||
},
|
||||
/obj/structure/barricade/wooden,
|
||||
@@ -58287,7 +58276,6 @@
|
||||
},
|
||||
/obj/machinery/computer/security/telescreen/toxins{
|
||||
dir = 1;
|
||||
network = list("toxins");
|
||||
pixel_y = -28
|
||||
},
|
||||
/obj/structure/chair{
|
||||
@@ -87415,8 +87403,8 @@ bVJ
|
||||
cay
|
||||
ccw
|
||||
cig
|
||||
cjb
|
||||
cjb
|
||||
cSV
|
||||
cSV
|
||||
cig
|
||||
cig
|
||||
cmG
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -501,16 +501,14 @@
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plasteel/yellowsiding/corner{
|
||||
dir = 8;
|
||||
icon_state = "yellowcornersiding"
|
||||
dir = 8
|
||||
},
|
||||
/area/crew_quarters/fitness/pool)
|
||||
"aba" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
|
||||
/obj/machinery/firealarm{
|
||||
dir = 4;
|
||||
pixel_x = -24;
|
||||
pixel_y = 0
|
||||
pixel_x = -24
|
||||
},
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 1
|
||||
@@ -519,8 +517,7 @@
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plasteel/yellowsiding{
|
||||
dir = 4;
|
||||
icon_state = "yellowsiding"
|
||||
dir = 4
|
||||
},
|
||||
/area/crew_quarters/fitness/pool)
|
||||
"abb" = (
|
||||
@@ -613,8 +610,7 @@
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plasteel/yellowsiding{
|
||||
dir = 8;
|
||||
icon_state = "yellowsiding"
|
||||
dir = 8
|
||||
},
|
||||
/area/crew_quarters/fitness/pool)
|
||||
"abn" = (
|
||||
@@ -628,8 +624,7 @@
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plasteel/yellowsiding{
|
||||
dir = 4;
|
||||
icon_state = "yellowsiding"
|
||||
dir = 4
|
||||
},
|
||||
/area/crew_quarters/fitness/pool)
|
||||
"abo" = (
|
||||
@@ -713,8 +708,7 @@
|
||||
name = "pool camera"
|
||||
},
|
||||
/turf/open/floor/plasteel/yellowsiding{
|
||||
dir = 4;
|
||||
icon_state = "yellowsiding"
|
||||
dir = 4
|
||||
},
|
||||
/area/crew_quarters/fitness/pool)
|
||||
"abv" = (
|
||||
@@ -733,8 +727,7 @@
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plasteel/yellowsiding{
|
||||
dir = 8;
|
||||
icon_state = "yellowsiding"
|
||||
dir = 8
|
||||
},
|
||||
/area/crew_quarters/fitness/pool)
|
||||
"aby" = (
|
||||
@@ -774,8 +767,7 @@
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plasteel/yellowsiding{
|
||||
dir = 4;
|
||||
icon_state = "yellowsiding"
|
||||
dir = 4
|
||||
},
|
||||
/area/crew_quarters/fitness/pool)
|
||||
"abC" = (
|
||||
@@ -913,8 +905,7 @@
|
||||
pixel_x = -23
|
||||
},
|
||||
/turf/open/floor/plasteel/yellowsiding{
|
||||
dir = 4;
|
||||
icon_state = "yellowsiding"
|
||||
dir = 4
|
||||
},
|
||||
/area/crew_quarters/fitness/pool)
|
||||
"abP" = (
|
||||
@@ -981,8 +972,7 @@
|
||||
pixel_x = -26
|
||||
},
|
||||
/turf/open/floor/plasteel/yellowsiding/corner{
|
||||
dir = 4;
|
||||
icon_state = "yellowcornersiding"
|
||||
dir = 4
|
||||
},
|
||||
/area/crew_quarters/fitness/pool)
|
||||
"abW" = (
|
||||
@@ -991,8 +981,7 @@
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plasteel/yellowsiding{
|
||||
dir = 1;
|
||||
icon_state = "yellowsiding"
|
||||
dir = 1
|
||||
},
|
||||
/area/crew_quarters/fitness/pool)
|
||||
"abX" = (
|
||||
@@ -1004,8 +993,7 @@
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plasteel/yellowsiding/corner{
|
||||
dir = 1;
|
||||
icon_state = "yellowcornersiding"
|
||||
dir = 1
|
||||
},
|
||||
/area/crew_quarters/fitness/pool)
|
||||
"abY" = (
|
||||
@@ -9916,8 +9904,7 @@
|
||||
/area/engine/atmospherics_engine)
|
||||
"avi" = (
|
||||
/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{
|
||||
dir = 8;
|
||||
name = "scrubbers pipe"
|
||||
dir = 8
|
||||
},
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
@@ -50438,12 +50425,6 @@
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/security/detectives_office)
|
||||
"bJn" = (
|
||||
/obj/structure/rack,
|
||||
/obj/item/storage/briefcase{
|
||||
pixel_x = -3;
|
||||
pixel_y = 3
|
||||
},
|
||||
/obj/item/storage/secure/briefcase,
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 1
|
||||
},
|
||||
@@ -50454,6 +50435,7 @@
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/vending/wardrobe/det_wardrobe,
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/security/detectives_office)
|
||||
"bJo" = (
|
||||
@@ -63134,7 +63116,6 @@
|
||||
},
|
||||
/obj/machinery/camera{
|
||||
c_tag = "Library - Aft";
|
||||
dir = 2;
|
||||
name = "library camera"
|
||||
},
|
||||
/turf/open/floor/wood,
|
||||
@@ -64300,8 +64281,7 @@
|
||||
/area/library)
|
||||
"cel" = (
|
||||
/obj/structure/chair/sofa/right{
|
||||
dir = 8;
|
||||
icon_state = "sofaend_right"
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/sign/painting/library{
|
||||
pixel_x = 32
|
||||
@@ -125633,7 +125613,6 @@
|
||||
},
|
||||
/obj/machinery/camera{
|
||||
c_tag = "Library - Aft";
|
||||
dir = 2;
|
||||
name = "library camera"
|
||||
},
|
||||
/turf/open/floor/plasteel/grimy,
|
||||
@@ -127784,8 +127763,7 @@
|
||||
/area/science/mixing)
|
||||
"xER" = (
|
||||
/obj/structure/chair/sofa/left{
|
||||
dir = 8;
|
||||
icon_state = "sofaend_left"
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/wood,
|
||||
/area/library)
|
||||
|
||||
@@ -10384,9 +10384,7 @@
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/table,
|
||||
/obj/item/paper_bin,
|
||||
/obj/item/pen,
|
||||
/obj/machinery/vending/wardrobe/det_wardrobe,
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/security/detectives_office)
|
||||
"ars" = (
|
||||
@@ -70077,8 +70075,7 @@
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{
|
||||
dir = 8;
|
||||
name = "scrubbers pipe"
|
||||
dir = 8
|
||||
},
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/effect/turf_decal/stripes/white/line,
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
+75093
-83768
File diff suppressed because it is too large
Load Diff
@@ -1136,8 +1136,7 @@
|
||||
/obj/effect/spawner/structure/window/reinforced,
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
|
||||
/obj/machinery/door/poddoor/preopen{
|
||||
id = "executionfireblast";
|
||||
name = "blast door"
|
||||
id = "executionfireblast"
|
||||
},
|
||||
/obj/machinery/door/firedoor,
|
||||
/obj/effect/turf_decal/tile/red{
|
||||
@@ -1155,8 +1154,7 @@
|
||||
"acB" = (
|
||||
/obj/effect/spawner/structure/window/reinforced,
|
||||
/obj/machinery/door/poddoor/preopen{
|
||||
id = "executionfireblast";
|
||||
name = "blast door"
|
||||
id = "executionfireblast"
|
||||
},
|
||||
/obj/machinery/door/firedoor,
|
||||
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
|
||||
@@ -1196,8 +1194,7 @@
|
||||
},
|
||||
/obj/machinery/door/firedoor,
|
||||
/obj/machinery/door/poddoor/preopen{
|
||||
id = "executionfireblast";
|
||||
name = "blast door"
|
||||
id = "executionfireblast"
|
||||
},
|
||||
/obj/effect/turf_decal/tile/red{
|
||||
dir = 1
|
||||
@@ -9534,7 +9531,6 @@
|
||||
"arF" = (
|
||||
/obj/structure/pool/ladder{
|
||||
dir = 8;
|
||||
icon_state = "ladder";
|
||||
pixel_x = 4
|
||||
},
|
||||
/turf/open/pool,
|
||||
@@ -10230,7 +10226,6 @@
|
||||
/area/security/main)
|
||||
"asN" = (
|
||||
/obj/machinery/light/built{
|
||||
icon_state = "tube-empty";
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
@@ -15691,15 +15686,7 @@
|
||||
/turf/open/floor/plasteel/grimy,
|
||||
/area/security/detectives_office)
|
||||
"aDN" = (
|
||||
/obj/structure/rack,
|
||||
/obj/item/storage/briefcase{
|
||||
pixel_x = -3;
|
||||
pixel_y = 2
|
||||
},
|
||||
/obj/item/storage/secure/briefcase{
|
||||
pixel_x = 2;
|
||||
pixel_y = -2
|
||||
},
|
||||
/obj/machinery/vending/wardrobe/det_wardrobe,
|
||||
/turf/open/floor/plasteel/grimy,
|
||||
/area/security/detectives_office)
|
||||
"aDO" = (
|
||||
@@ -63650,8 +63637,7 @@
|
||||
"cvL" = (
|
||||
/obj/effect/spawner/structure/window/reinforced,
|
||||
/obj/machinery/door/poddoor/preopen{
|
||||
id = "researchrangeshutters";
|
||||
name = "blast door"
|
||||
id = "researchrangeshutters"
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/science/misc_lab/range)
|
||||
@@ -66513,8 +66499,7 @@
|
||||
"cBm" = (
|
||||
/obj/effect/spawner/structure/window/reinforced,
|
||||
/obj/machinery/door/poddoor/preopen{
|
||||
id = "researchrangeshutters";
|
||||
name = "blast door"
|
||||
id = "researchrangeshutters"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
|
||||
dir = 4
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -334,8 +334,7 @@
|
||||
/area/crew_quarters/fitness/pool)
|
||||
"aaM" = (
|
||||
/turf/open/floor/plasteel/yellowsiding/corner{
|
||||
dir = 8;
|
||||
icon_state = "yellowcornersiding"
|
||||
dir = 8
|
||||
},
|
||||
/area/crew_quarters/fitness/pool)
|
||||
"aaN" = (
|
||||
@@ -354,8 +353,7 @@
|
||||
/area/crew_quarters/fitness/pool)
|
||||
"aaP" = (
|
||||
/turf/open/floor/plasteel/yellowsiding{
|
||||
dir = 8;
|
||||
icon_state = "yellowsiding"
|
||||
dir = 8
|
||||
},
|
||||
/area/crew_quarters/fitness/pool)
|
||||
"aaQ" = (
|
||||
@@ -433,8 +431,7 @@
|
||||
/area/crew_quarters/fitness/pool)
|
||||
"aaW" = (
|
||||
/turf/open/floor/plasteel/yellowsiding{
|
||||
dir = 1;
|
||||
icon_state = "yellowsiding"
|
||||
dir = 1
|
||||
},
|
||||
/area/crew_quarters/fitness/pool)
|
||||
"aaX" = (
|
||||
@@ -550,8 +547,7 @@
|
||||
"abm" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
|
||||
/turf/open/floor/plasteel/yellowsiding{
|
||||
dir = 4;
|
||||
icon_state = "yellowsiding"
|
||||
dir = 4
|
||||
},
|
||||
/area/crew_quarters/fitness/pool)
|
||||
"abn" = (
|
||||
@@ -580,8 +576,7 @@
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
|
||||
/turf/open/floor/plasteel/yellowsiding{
|
||||
dir = 4;
|
||||
icon_state = "yellowsiding"
|
||||
dir = 4
|
||||
},
|
||||
/area/crew_quarters/fitness/pool)
|
||||
"abr" = (
|
||||
@@ -595,8 +590,7 @@
|
||||
"abt" = (
|
||||
/obj/structure/pool/Rboard,
|
||||
/turf/open/floor/plasteel/yellowsiding{
|
||||
dir = 8;
|
||||
icon_state = "yellowsiding"
|
||||
dir = 8
|
||||
},
|
||||
/area/crew_quarters/fitness/pool)
|
||||
"abu" = (
|
||||
@@ -659,8 +653,7 @@
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
|
||||
/turf/open/floor/plasteel/yellowsiding/corner{
|
||||
dir = 4;
|
||||
icon_state = "yellowcornersiding"
|
||||
dir = 4
|
||||
},
|
||||
/area/crew_quarters/fitness/pool)
|
||||
"abB" = (
|
||||
@@ -670,21 +663,18 @@
|
||||
pixel_y = -27
|
||||
},
|
||||
/turf/open/floor/plasteel/yellowsiding{
|
||||
dir = 1;
|
||||
icon_state = "yellowsiding"
|
||||
dir = 1
|
||||
},
|
||||
/area/crew_quarters/fitness/pool)
|
||||
"abC" = (
|
||||
/obj/machinery/light,
|
||||
/turf/open/floor/plasteel/yellowsiding{
|
||||
dir = 1;
|
||||
icon_state = "yellowsiding"
|
||||
dir = 1
|
||||
},
|
||||
/area/crew_quarters/fitness/pool)
|
||||
"abD" = (
|
||||
/turf/open/floor/plasteel/yellowsiding/corner{
|
||||
dir = 1;
|
||||
icon_state = "yellowcornersiding"
|
||||
dir = 1
|
||||
},
|
||||
/area/crew_quarters/fitness/pool)
|
||||
"abE" = (
|
||||
@@ -2757,8 +2747,7 @@
|
||||
icon_state = "0-8"
|
||||
},
|
||||
/obj/machinery/door/poddoor/preopen{
|
||||
id = "executionfireblast";
|
||||
name = "blast door"
|
||||
id = "executionfireblast"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
|
||||
/turf/open/floor/plating,
|
||||
@@ -54863,6 +54852,10 @@
|
||||
},
|
||||
/turf/open/floor/engine,
|
||||
/area/engine/engineering)
|
||||
"gQo" = (
|
||||
/obj/machinery/vending/wardrobe/det_wardrobe,
|
||||
/turf/open/floor/plasteel/grimy,
|
||||
/area/security/detectives_office)
|
||||
"gSH" = (
|
||||
/turf/closed/wall,
|
||||
/area/lawoffice)
|
||||
@@ -57234,8 +57227,7 @@
|
||||
icon_state = "0-4"
|
||||
},
|
||||
/obj/machinery/door/poddoor/preopen{
|
||||
id = "executionfireblast";
|
||||
name = "blast door"
|
||||
id = "executionfireblast"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
|
||||
/turf/open/floor/plating,
|
||||
@@ -59204,8 +59196,7 @@
|
||||
icon_state = "2-4"
|
||||
},
|
||||
/obj/machinery/door/poddoor/preopen{
|
||||
id = "executionfireblast";
|
||||
name = "blast door"
|
||||
id = "executionfireblast"
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/security/execution/transfer)
|
||||
@@ -85514,7 +85505,7 @@ aCo
|
||||
aCk
|
||||
aEr
|
||||
aGa
|
||||
aCk
|
||||
gQo
|
||||
oEA
|
||||
uoS
|
||||
uoS
|
||||
|
||||
@@ -197,12 +197,10 @@
|
||||
/obj/structure/closet/emcloset/anchored,
|
||||
/obj/structure/sign/directions/medical{
|
||||
dir = 8;
|
||||
icon_state = "direction_med";
|
||||
pixel_y = 36
|
||||
},
|
||||
/obj/structure/sign/directions/science{
|
||||
dir = 8;
|
||||
icon_state = "direction_sci";
|
||||
pixel_y = 28
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
@@ -247,7 +245,6 @@
|
||||
},
|
||||
/obj/structure/sign/directions/engineering{
|
||||
dir = 4;
|
||||
icon_state = "direction_eng";
|
||||
pixel_x = 32;
|
||||
pixel_y = -28
|
||||
},
|
||||
@@ -285,8 +282,6 @@
|
||||
},
|
||||
/obj/structure/sign/directions/engineering{
|
||||
dir = 4;
|
||||
icon_state = "direction_eng";
|
||||
pixel_x = 0;
|
||||
pixel_y = 40
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
@@ -350,7 +345,6 @@
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/obj/structure/sign/directions/engineering{
|
||||
dir = 1;
|
||||
icon_state = "direction_eng";
|
||||
pixel_x = 32;
|
||||
pixel_y = 32
|
||||
},
|
||||
@@ -385,12 +379,10 @@
|
||||
"aaC" = (
|
||||
/obj/structure/sign/directions/medical{
|
||||
dir = 8;
|
||||
icon_state = "direction_med";
|
||||
pixel_y = 36
|
||||
},
|
||||
/obj/structure/sign/directions/science{
|
||||
dir = 8;
|
||||
icon_state = "direction_sci";
|
||||
pixel_y = 28
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
@@ -398,13 +390,10 @@
|
||||
"aaD" = (
|
||||
/obj/structure/sign/directions/engineering{
|
||||
dir = 4;
|
||||
icon_state = "direction_eng";
|
||||
pixel_y = 36
|
||||
},
|
||||
/obj/structure/sign/directions/supply{
|
||||
dir = 4;
|
||||
icon_state = "direction_supply";
|
||||
pixel_x = 0;
|
||||
pixel_y = 28
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
@@ -446,12 +435,10 @@
|
||||
},
|
||||
/obj/structure/sign/directions/medical{
|
||||
dir = 8;
|
||||
icon_state = "direction_med";
|
||||
pixel_y = 40
|
||||
},
|
||||
/obj/structure/sign/directions/science{
|
||||
dir = 8;
|
||||
icon_state = "direction_sci";
|
||||
pixel_y = 32
|
||||
},
|
||||
/obj/structure/sign/directions/security{
|
||||
@@ -472,13 +459,10 @@
|
||||
},
|
||||
/obj/structure/sign/directions/engineering{
|
||||
dir = 4;
|
||||
icon_state = "direction_eng";
|
||||
pixel_y = 40
|
||||
},
|
||||
/obj/structure/sign/directions/supply{
|
||||
dir = 4;
|
||||
icon_state = "direction_supply";
|
||||
pixel_x = 0;
|
||||
pixel_y = 32
|
||||
},
|
||||
/obj/structure/sign/directions/evac{
|
||||
@@ -506,7 +490,6 @@
|
||||
},
|
||||
/obj/structure/sign/directions/evac{
|
||||
dir = 4;
|
||||
pixel_x = 0;
|
||||
pixel_y = 40
|
||||
},
|
||||
/turf/open/floor/plasteel/white/corner{
|
||||
@@ -529,12 +512,10 @@
|
||||
},
|
||||
/obj/structure/sign/directions/medical{
|
||||
dir = 8;
|
||||
icon_state = "direction_med";
|
||||
pixel_y = 36
|
||||
},
|
||||
/obj/structure/sign/directions/science{
|
||||
dir = 8;
|
||||
icon_state = "direction_sci";
|
||||
pixel_y = 28
|
||||
},
|
||||
/obj/structure/sign/directions/science{
|
||||
@@ -565,13 +546,10 @@
|
||||
/obj/machinery/computer/shuttle/snow_taxi,
|
||||
/obj/structure/sign/directions/supply{
|
||||
dir = 4;
|
||||
icon_state = "direction_supply";
|
||||
pixel_x = 0;
|
||||
pixel_y = 36
|
||||
},
|
||||
/obj/structure/sign/directions/engineering{
|
||||
dir = 4;
|
||||
icon_state = "direction_eng";
|
||||
pixel_y = 28
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
@@ -605,18 +583,13 @@
|
||||
"aaV" = (
|
||||
/obj/structure/sign/directions/evac{
|
||||
dir = 1;
|
||||
icon_state = "direction_evac";
|
||||
pixel_y = 8
|
||||
},
|
||||
/obj/structure/sign/directions/security{
|
||||
dir = 8;
|
||||
icon_state = "direction_sec";
|
||||
pixel_x = 0;
|
||||
pixel_y = 0
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/sign/directions/command{
|
||||
dir = 8;
|
||||
icon_state = "direction_bridge";
|
||||
pixel_y = -8
|
||||
},
|
||||
/turf/closed/wall/r_wall,
|
||||
@@ -693,7 +666,6 @@
|
||||
},
|
||||
/obj/structure/sign/directions/supply{
|
||||
dir = 4;
|
||||
icon_state = "direction_supply";
|
||||
pixel_x = 32;
|
||||
pixel_y = -24
|
||||
},
|
||||
@@ -794,7 +766,6 @@
|
||||
},
|
||||
/obj/structure/sign/directions/evac{
|
||||
dir = 8;
|
||||
icon_state = "direction_evac";
|
||||
pixel_x = 32;
|
||||
pixel_y = 32
|
||||
},
|
||||
@@ -1165,13 +1136,11 @@
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/obj/structure/sign/directions/evac{
|
||||
dir = 8;
|
||||
icon_state = "direction_evac";
|
||||
pixel_x = 32;
|
||||
pixel_y = 40
|
||||
},
|
||||
/obj/structure/sign/directions/engineering{
|
||||
dir = 4;
|
||||
icon_state = "direction_eng";
|
||||
pixel_x = 32;
|
||||
pixel_y = 24
|
||||
},
|
||||
@@ -3941,7 +3910,7 @@
|
||||
name = "Privacy Shutters";
|
||||
pixel_y = 24
|
||||
},
|
||||
/obj/machinery/computer/med_data,
|
||||
/obj/machinery/vending/wardrobe/det_wardrobe,
|
||||
/turf/open/floor/plasteel/grimy,
|
||||
/area/security/detectives_office)
|
||||
"aMR" = (
|
||||
@@ -20414,7 +20383,6 @@
|
||||
"iXZ" = (
|
||||
/obj/machinery/computer/security/telescreen/toxins{
|
||||
dir = 1;
|
||||
network = list("toxins");
|
||||
pixel_y = -28
|
||||
},
|
||||
/obj/structure/chair{
|
||||
@@ -43144,6 +43112,7 @@
|
||||
pixel_x = 6;
|
||||
pixel_y = 36
|
||||
},
|
||||
/obj/machinery/computer/med_data/laptop,
|
||||
/turf/open/floor/carpet,
|
||||
/area/security/detectives_office)
|
||||
"wtY" = (
|
||||
|
||||
@@ -43,7 +43,7 @@
|
||||
},
|
||||
/area/shuttle/escape/arena)
|
||||
"l" = (
|
||||
/obj/structure/closet/crate/necropolis/tendril,
|
||||
/obj/structure/closet/crate/necropolis/tendril/magic,
|
||||
/turf/open/indestructible/necropolis/air,
|
||||
/area/shuttle/escape/arena)
|
||||
"m" = (
|
||||
@@ -65,10 +65,18 @@
|
||||
/obj/structure/healingfountain,
|
||||
/turf/open/indestructible/necropolis/air,
|
||||
/area/shuttle/escape/arena)
|
||||
"t" = (
|
||||
/obj/structure/closet/crate/necropolis/tendril/misc,
|
||||
/turf/open/indestructible/necropolis/air,
|
||||
/area/shuttle/escape/arena)
|
||||
"z" = (
|
||||
/obj/effect/landmark/shuttle_arena_safe,
|
||||
/turf/open/indestructible/necropolis/air,
|
||||
/area/shuttle/escape/arena)
|
||||
"H" = (
|
||||
/obj/structure/closet/crate/necropolis/tendril/weapon_armor,
|
||||
/turf/open/indestructible/necropolis/air,
|
||||
/area/shuttle/escape/arena)
|
||||
|
||||
(1,1,1) = {"
|
||||
a
|
||||
@@ -264,16 +272,16 @@ m
|
||||
l
|
||||
j
|
||||
m
|
||||
l
|
||||
H
|
||||
j
|
||||
k
|
||||
l
|
||||
H
|
||||
j
|
||||
m
|
||||
l
|
||||
t
|
||||
j
|
||||
m
|
||||
j
|
||||
t
|
||||
j
|
||||
p
|
||||
g
|
||||
@@ -524,16 +532,16 @@ m
|
||||
l
|
||||
j
|
||||
m
|
||||
l
|
||||
H
|
||||
j
|
||||
m
|
||||
l
|
||||
H
|
||||
j
|
||||
m
|
||||
l
|
||||
t
|
||||
j
|
||||
m
|
||||
j
|
||||
t
|
||||
j
|
||||
p
|
||||
g
|
||||
|
||||
Reference in New Issue
Block a user