Merge branch 'master' into upstream-merge-32161

This commit is contained in:
LetterJay
2017-11-11 23:02:13 -06:00
committed by GitHub
625 changed files with 27981 additions and 20284 deletions
View File
@@ -109,9 +109,7 @@
/obj/item/stack/sheet/mineral/plastitanium{
amount = 30
},
/obj/item/stack/rods{
amount = 50
},
/obj/item/stack/rods/fifty,
/obj/structure/table/reinforced,
/turf/open/floor/plasteel/podhatch{
dir = 9
@@ -195,12 +193,8 @@
},
/area/ruin/powered/syndicate_lava_base)
"aB" = (
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/glass{
amount = 50
},
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/glass/fifty,
/obj/structure/table/reinforced,
/obj/item/wrench,
/turf/open/floor/plasteel/podhatch{
@@ -1304,9 +1298,7 @@
/obj/item/stack/sheet/mineral/plastitanium{
amount = 30
},
/obj/item/stack/rods{
amount = 50
},
/obj/item/stack/rods/fifty,
/obj/structure/table/reinforced,
/obj/machinery/light{
dir = 4
@@ -1338,9 +1330,7 @@
},
/area/ruin/powered/syndicate_lava_base)
"dk" = (
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal/fifty,
/obj/item/grenade/chem_grenade,
/obj/item/grenade/chem_grenade,
/obj/item/grenade/chem_grenade,
+3 -13
View File
@@ -55,8 +55,7 @@
/area/ruin/space/djstation)
"an" = (
/obj/structure/cable{
icon_state = "0-2";
d2 = 2
icon_state = "0-2"
},
/obj/machinery/power/smes/magical{
desc = "A high-capacity superconducting magnetic energy storage (SMES) unit.";
@@ -66,16 +65,13 @@
/area/ruin/space/djstation)
"ao" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plating,
/area/ruin/space/djstation)
"ap" = (
/obj/structure/cable{
icon_state = "0-4";
d2 = 4
icon_state = "0-4"
},
/obj/machinery/power/apc{
dir = 0;
@@ -86,8 +82,6 @@
/area/ruin/space/djstation)
"aq" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/item/storage/box/lights/mixed,
@@ -101,8 +95,6 @@
/area/ruin/space/djstation)
"ar" = (
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/turf/open/floor/plating,
@@ -311,9 +303,7 @@
/obj/structure/window/reinforced{
dir = 1
},
/obj/structure/rack{
dir = 4
},
/obj/structure/rack,
/obj/item/clothing/under/soviet,
/obj/item/clothing/head/ushanka,
/turf/open/floor/plasteel/cafeteria,
File diff suppressed because it is too large Load Diff
+5 -70
View File
@@ -9,16 +9,13 @@
power = 1
},
/obj/structure/cable{
icon_state = "0-4";
d2 = 4
icon_state = "0-4"
},
/turf/open/floor/plating/airless,
/area/ruin/space/has_grav/abandonedzoo)
"ac" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plating,
@@ -30,12 +27,9 @@
power = 1
},
/obj/structure/cable{
icon_state = "0-2";
d2 = 2
icon_state = "0-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/turf/open/floor/plating/airless,
@@ -47,13 +41,10 @@
power = 1
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/obj/structure/cable{
icon_state = "0-2";
d2 = 2
icon_state = "0-2"
},
/turf/open/floor/plating/airless,
/area/ruin/space/has_grav/abandonedzoo)
@@ -64,7 +55,6 @@
power = 1
},
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
},
/turf/open/floor/plating/airless,
@@ -86,8 +76,6 @@
"ak" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plating,
@@ -192,8 +180,6 @@
/area/ruin/space/has_grav/abandonedzoo)
"aD" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/door/airlock/highsecurity{
@@ -211,30 +197,21 @@
power = 1
},
/obj/structure/cable{
icon_state = "0-2";
d2 = 2
icon_state = "0-2"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/turf/open/floor/plating,
/area/ruin/space/has_grav/abandonedzoo)
"aF" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/closed/wall/r_wall,
@@ -242,8 +219,6 @@
"aG" = (
/obj/structure/table/reinforced,
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/item/gun/energy/floragun,
@@ -253,8 +228,6 @@
/area/ruin/space/has_grav/abandonedzoo)
"aH" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel/darkgreen,
@@ -263,8 +236,6 @@
/obj/structure/table/reinforced,
/obj/machinery/computer/med_data/laptop,
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel{
@@ -278,17 +249,12 @@
power = 1
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
},
/turf/open/floor/plating,
@@ -306,8 +272,6 @@
/area/ruin/space/has_grav/abandonedzoo)
"aM" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/closed/wall/r_wall,
@@ -358,8 +322,7 @@
pixel_x = -24
},
/obj/structure/cable{
icon_state = "0-4";
d2 = 4
icon_state = "0-4"
},
/obj/structure/rack,
/obj/item/melee/baton/cattleprod,
@@ -370,13 +333,9 @@
/area/ruin/space/has_grav/abandonedzoo)
"aT" = (
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/rack,
@@ -463,8 +422,6 @@
/area/ruin/space/has_grav/abandonedzoo)
"bc" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel/darkgreen,
@@ -472,8 +429,6 @@
"bd" = (
/obj/machinery/power/terminal,
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel/darkgreen,
@@ -491,8 +446,6 @@
},
/obj/structure/cable,
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel{
@@ -568,19 +521,13 @@
power = 1
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/obj/structure/cable,
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/turf/open/floor/plating,
@@ -606,8 +553,6 @@
/obj/structure/table/reinforced,
/obj/machinery/microwave,
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel{
@@ -616,17 +561,12 @@
/area/ruin/space/has_grav/abandonedzoo)
"bs" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
},
/obj/machinery/shieldwallgen,
@@ -634,7 +574,6 @@
/area/ruin/space/has_grav/abandonedzoo)
"bt" = (
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
},
/obj/machinery/shieldwallgen,
@@ -764,8 +703,6 @@
power = 1
},
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/obj/structure/cable,
@@ -780,8 +717,6 @@
/area/space)
"bS" = (
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/obj/structure/cable,
+2 -95
View File
@@ -59,8 +59,6 @@
/area/ruin/space/has_grav/derelictoutpost/cargobay)
"an" = (
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/turf/open/floor/plasteel,
@@ -73,7 +71,6 @@
pixel_x = 24
},
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
},
/turf/open/floor/plasteel,
@@ -107,8 +104,6 @@
/area/ruin/space/has_grav/derelictoutpost/dockedship)
"au" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel,
@@ -301,8 +296,7 @@
"bb" = (
/obj/machinery/power/smes,
/obj/structure/cable{
icon_state = "0-4";
d2 = 4
icon_state = "0-4"
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/derelictoutpost/powerstorage)
@@ -310,13 +304,9 @@
/obj/structure/table,
/obj/item/stock_parts/cell/hyper,
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/turf/open/floor/plasteel,
@@ -324,7 +314,6 @@
"bd" = (
/obj/machinery/power/smes,
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
},
/turf/open/floor/plasteel,
@@ -467,8 +456,6 @@
/area/ruin/space/has_grav/derelictoutpost/powerstorage)
"bs" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel,
@@ -736,13 +723,9 @@
/area/ruin/space/has_grav/derelictoutpost/powerstorage)
"bZ" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/turf/open/floor/plasteel,
@@ -756,7 +739,6 @@
pixel_y = 2
},
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
},
/turf/open/floor/plasteel,
@@ -790,8 +772,6 @@
name = "gelatinous floor"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel,
@@ -837,8 +817,6 @@
/area/ruin/space/has_grav/derelictoutpost)
"cj" = (
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/turf/open/floor/plasteel,
@@ -851,7 +829,6 @@
pixel_y = -24
},
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
},
/turf/open/floor/plasteel,
@@ -892,8 +869,6 @@
/area/ruin/space/has_grav/derelictoutpost/powerstorage)
"cp" = (
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/turf/open/floor/plasteel,
@@ -901,8 +876,6 @@
"cq" = (
/obj/structure/barricade/wooden,
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel,
@@ -914,24 +887,18 @@
},
/obj/structure/barricade/wooden,
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/derelictoutpost/powerstorage)
"cs" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/derelictoutpost/cargobay)
"ct" = (
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/turf/open/floor/plasteel,
@@ -963,13 +930,9 @@
name = "gelatinous floor"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/turf/open/floor/plasteel,
@@ -981,8 +944,6 @@
name = "gelatinous floor"
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel,
@@ -994,8 +955,6 @@
name = "checkpoint security doors"
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/door/firedoor,
@@ -1003,8 +962,6 @@
/area/ruin/space/has_grav/derelictoutpost)
"cz" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel,
@@ -1016,16 +973,12 @@
name = "gelatinous floor"
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/derelictoutpost)
"cB" = (
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/turf/open/floor/plasteel,
@@ -1104,16 +1057,12 @@
opened = 1
},
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/derelictoutpost/cargobay)
"cI" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/structure/janitorialcart,
@@ -1126,8 +1075,6 @@
name = "gelatinous floor"
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/item/mop,
@@ -1145,8 +1092,6 @@
name = "gelatinous floor"
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel,
@@ -1163,8 +1108,6 @@
name = "gelatinous floor"
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel,
@@ -1177,8 +1120,6 @@
},
/obj/structure/glowshroom/single,
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel,
@@ -1190,13 +1131,9 @@
name = "gelatinous floor"
},
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel,
@@ -1356,8 +1293,6 @@
},
/obj/machinery/light,
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/turf/open/floor/plasteel,
@@ -1374,8 +1309,6 @@
name = "gelatinous floor"
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel,
@@ -1397,8 +1330,6 @@
name = "pried-open airlock"
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plating,
@@ -1418,8 +1349,6 @@
name = "gelatinous floor"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/turf/open/floor/plating,
@@ -1515,8 +1444,6 @@
name = "gelatinous floor"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plating,
@@ -1639,8 +1566,6 @@
name = "gelatinous floor"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plating,
@@ -1725,8 +1650,6 @@
name = "gelatinous floor"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plating,
@@ -1777,8 +1700,6 @@
dir = 9
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plating,
@@ -1947,8 +1868,6 @@
name = "dried blood trail"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plating,
@@ -2012,9 +1931,7 @@
pixel_x = 24
},
/obj/structure/cable{
icon_state = "0-2";
pixel_y = 1;
d2 = 2
icon_state = "0-2"
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/derelictoutpost/cargostorage)
@@ -2072,8 +1989,6 @@
/area/ruin/space/has_grav/derelictoutpost/cargostorage)
"eu" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel,
@@ -2120,8 +2035,6 @@
dir = 5
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel,
@@ -2186,8 +2099,6 @@
dir = 10
},
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/turf/open/floor/plasteel,
@@ -2204,8 +2115,6 @@
dir = 4
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plating,
@@ -2217,8 +2126,6 @@
dir = 6
},
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/turf/open/floor/plating,
+2 -6
View File
@@ -21,9 +21,7 @@
/turf/open/floor/plating/asteroid/airless,
/area/ruin/unpowered/no_grav)
"ag" = (
/obj/item/stack/rods{
amount = 50
},
/obj/item/stack/rods/fifty,
/obj/item/stock_parts/manipulator/femto,
/turf/open/floor/plating/asteroid/airless,
/area/ruin/unpowered/no_grav)
@@ -333,9 +331,7 @@
},
/area/ruin/unpowered/no_grav)
"bb" = (
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal/fifty,
/turf/open/floor/plating/asteroid/airless,
/area/ruin/unpowered/no_grav)
+10 -209
View File
@@ -110,8 +110,6 @@
/area/awaymission/BMPship/Midship)
"ay" = (
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/turf/open/floor/plating/airless,
@@ -119,8 +117,6 @@
"az" = (
/obj/structure/table/optable,
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plating/airless,
@@ -128,7 +124,6 @@
"aA" = (
/obj/machinery/computer/operating,
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
},
/turf/open/floor/plating/airless,
@@ -202,8 +197,6 @@
/area/awaymission/BMPship/Midship)
"aL" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plating/airless,
@@ -296,8 +289,6 @@
/area/awaymission/BMPship/Midship)
"bc" = (
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/obj/item/clothing/glasses/regular/hipster,
@@ -305,8 +296,6 @@
/area/awaymission/BMPship/Midship)
"bd" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plating/airless,
@@ -314,16 +303,12 @@
"be" = (
/obj/machinery/door/unpowered/shuttle,
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plating/airless,
/area/awaymission/BMPship/Midship)
"bf" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/effect/turf_decal/stripes/line{
@@ -333,8 +318,6 @@
/area/awaymission/BMPship/Aft)
"bg" = (
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/turf/open/floor/plating,
@@ -387,8 +370,6 @@
/area/awaymission/BMPship/Fore)
"br" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plating,
@@ -461,16 +442,12 @@
/area/awaymission/BMPship/Midship)
"bD" = (
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/turf/open/floor/plating,
/area/awaymission/BMPship/Aft)
"bE" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/item/hand_labeler,
@@ -478,16 +455,12 @@
/area/awaymission/BMPship/Aft)
"bF" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plating,
/area/awaymission/BMPship/Aft)
"bG" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/item/storage/box,
@@ -583,8 +556,6 @@
/area/awaymission/BMPship/Aft)
"bT" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/effect/turf_decal/stripes/line{
@@ -603,8 +574,7 @@
/area/awaymission/BMPship/Fore)
"bW" = (
/obj/structure/cable{
icon_state = "0-2";
d2 = 2
icon_state = "0-2"
},
/obj/machinery/power/apc{
dir = 1;
@@ -718,8 +688,6 @@
/area/awaymission/BMPship/Midship)
"cn" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/door/poddoor/shutters{
@@ -729,8 +697,6 @@
/area/awaymission/BMPship/Aft)
"co" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/carpet,
@@ -792,8 +758,6 @@
/area/awaymission/BMPship/Aft)
"cD" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel,
@@ -809,16 +773,12 @@
/area/awaymission/BMPship/Fore)
"cH" = (
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/turf/open/floor/carpet,
/area/awaymission/BMPship/Fore)
"cI" = (
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/turf/open/floor/carpet,
@@ -838,9 +798,7 @@
"cM" = (
/obj/structure/window/reinforced,
/obj/structure/cable{
icon_state = "0-2";
pixel_y = 1;
d2 = 2
icon_state = "0-2"
},
/turf/open/floor/plasteel/barber,
/area/awaymission/BMPship/Midship)
@@ -861,9 +819,7 @@
/area/awaymission/BMPship/Midship)
"cQ" = (
/obj/structure/cable{
icon_state = "0-2";
pixel_y = 1;
d2 = 2
icon_state = "0-2"
},
/turf/open/floor/plasteel/showroomfloor,
/area/awaymission/BMPship/Aft)
@@ -895,9 +851,7 @@
/area/awaymission/BMPship/Aft)
"cW" = (
/obj/structure/cable{
icon_state = "0-2";
pixel_y = 1;
d2 = 2
icon_state = "0-2"
},
/obj/machinery/power/apc{
dir = 1;
@@ -933,8 +887,6 @@
/area/awaymission/BMPship/Fore)
"db" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/carpet,
@@ -961,37 +913,27 @@
/area/awaymission/BMPship/Midship)
"dg" = (
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel/bar,
/area/awaymission/BMPship/Midship)
"dh" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel/bar,
/area/awaymission/BMPship/Midship)
"di" = (
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/turf/open/floor/plasteel/bar,
/area/awaymission/BMPship/Midship)
"dj" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel/showroomfloor,
@@ -1001,55 +943,39 @@
/area/awaymission/BMPship/Aft)
"dl" = (
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/turf/open/floor/plasteel,
/area/awaymission/BMPship/Aft)
"dm" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plating,
/area/awaymission/BMPship/Aft)
"dn" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/turf/open/floor/plating,
/area/awaymission/BMPship/Aft)
"do" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/turf/open/floor/plating,
/area/awaymission/BMPship/Aft)
"dp" = (
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/obj/machinery/light/small{
@@ -1093,8 +1019,6 @@
dir = 4
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/carpet,
@@ -1107,24 +1031,18 @@
/area/awaymission/BMPship/Midship)
"dx" = (
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/turf/open/floor/plasteel/bar,
/area/awaymission/BMPship/Midship)
"dy" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel/bar,
/area/awaymission/BMPship/Midship)
"dz" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel/bar,
@@ -1155,16 +1073,12 @@
/area/awaymission/BMPship/Aft)
"dE" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel,
/area/awaymission/BMPship/Aft)
"dF" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/effect/turf_decal/stripes/line{
@@ -1184,13 +1098,9 @@
/area/awaymission/BMPship/Fore)
"dI" = (
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/turf/open/floor/carpet,
@@ -1198,16 +1108,12 @@
"dJ" = (
/obj/machinery/door/airlock/silver,
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/carpet,
/area/awaymission/BMPship/Fore)
"dK" = (
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/turf/open/floor/plasteel/bar,
@@ -1215,28 +1121,22 @@
"dL" = (
/obj/machinery/shieldwallgen,
/obj/structure/cable{
icon_state = "0-4";
d2 = 4
icon_state = "0-4"
},
/turf/open/floor/plating,
/area/awaymission/BMPship/Midship)
"dM" = (
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel/bar,
/area/awaymission/BMPship/Midship)
"dN" = (
/obj/structure/cable{
icon_state = "0-2";
d2 = 2
icon_state = "0-2"
},
/obj/machinery/power/apc{
dir = 1;
@@ -1286,8 +1186,6 @@
dir = 4
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel/bar,
@@ -1333,8 +1231,6 @@
/area/awaymission/BMPship/Aft)
"dZ" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel/hydrofloor,
@@ -1345,20 +1241,17 @@
name = "power storage unit"
},
/obj/structure/cable{
icon_state = "0-2";
d2 = 2
icon_state = "0-2"
},
/obj/structure/cable,
/obj/structure/cable{
icon_state = "0-2";
d2 = 2
icon_state = "0-2"
},
/turf/open/floor/plating,
/area/awaymission/BMPship/Aft)
"eb" = (
/obj/structure/cable{
icon_state = "0-4";
d2 = 4
icon_state = "0-4"
},
/obj/machinery/power/terminal{
dir = 8
@@ -1367,13 +1260,9 @@
/area/awaymission/BMPship/Aft)
"ec" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/obj/effect/turf_decal/stripes/line{
@@ -1450,8 +1339,6 @@
/area/awaymission/BMPship/Aft)
"ep" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/disposalpipe/segment{
@@ -1491,8 +1378,6 @@
/area/awaymission/BMPship/Aft)
"eu" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/effect/turf_decal/stripes/line{
@@ -1502,24 +1387,18 @@
/area/awaymission/BMPship/Aft)
"ev" = (
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/turf/open/floor/carpet,
/area/awaymission/BMPship/Fore)
"ew" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/carpet,
/area/awaymission/BMPship/Fore)
"ex" = (
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/turf/open/floor/carpet,
@@ -1531,39 +1410,27 @@
/area/awaymission/BMPship/Midship)
"ez" = (
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/turf/open/floor/plasteel/bar,
/area/awaymission/BMPship/Midship)
"eA" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/turf/open/floor/plasteel/bar,
/area/awaymission/BMPship/Midship)
"eB" = (
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/turf/open/floor/plasteel/bar,
@@ -1634,34 +1501,24 @@
/area/awaymission/BMPship/Midship)
"eM" = (
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/turf/open/floor/plasteel/bar,
/area/awaymission/BMPship/Midship)
"eN" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel/showroomfloor,
/area/awaymission/BMPship/Aft)
"eO" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/turf/open/floor/plasteel/showroomfloor,
@@ -1684,8 +1541,6 @@
/area/awaymission/BMPship/Aft)
"eR" = (
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/obj/effect/turf_decal/stripes/line{
@@ -1739,8 +1594,6 @@
/area/awaymission/BMPship/Aft)
"fa" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/item/stock_parts/cell/high,
@@ -1756,8 +1609,6 @@
/area/awaymission/BMPship/Fore)
"fd" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/door/unpowered/shuttle,
@@ -1870,8 +1721,6 @@
/area/awaymission/BMPship/Fore)
"fw" = (
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/turf/open/floor/plating/airless,
@@ -1881,16 +1730,12 @@
icon_state = "small"
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plating/airless,
/area/awaymission/BMPship/Fore)
"fy" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plating/airless{
@@ -1899,8 +1744,6 @@
/area/awaymission/BMPship/Fore)
"fz" = (
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/turf/open/floor/plating/airless{
@@ -1909,8 +1752,6 @@
/area/awaymission/BMPship/Fore)
"fA" = (
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/obj/item/kitchen/knife,
@@ -1924,24 +1765,18 @@
/area/awaymission/BMPship/Midship)
"fC" = (
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/turf/open/floor/plasteel/showroomfloor,
/area/awaymission/BMPship/Aft)
"fD" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel/showroomfloor,
/area/awaymission/BMPship/Aft)
"fE" = (
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/turf/open/floor/plasteel/showroomfloor,
@@ -1986,16 +1821,12 @@
/area/awaymission/BMPship/Fore)
"fM" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plating/airless,
/area/awaymission/BMPship/Fore)
"fN" = (
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/turf/open/floor/plasteel/bar,
@@ -2015,8 +1846,6 @@
/area/awaymission/BMPship/Aft)
"fR" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plating,
@@ -2065,8 +1894,6 @@
locked = 1
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel,
@@ -2074,8 +1901,6 @@
"ga" = (
/obj/machinery/door/unpowered/shuttle,
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel,
@@ -2091,8 +1916,6 @@
/area/awaymission/BMPship)
"gd" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/door/airlock/silver,
@@ -2216,41 +2039,30 @@
"gA" = (
/obj/effect/decal/remains/human,
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel,
/area/awaymission/BMPship/Aft)
"gB" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel,
/area/awaymission/BMPship/Aft)
"gC" = (
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/turf/open/floor/plasteel,
/area/awaymission/BMPship/Aft)
"gD" = (
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
},
/obj/item/wallframe/apc,
@@ -2309,8 +2121,6 @@
/obj/item/bedsheet,
/obj/item/storage/wallet/random,
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel,
@@ -2340,15 +2150,12 @@
/area/awaymission/BMPship/Midship)
"gU" = (
/obj/structure/cable{
icon_state = "0-4";
d2 = 4
icon_state = "0-4"
},
/turf/open/floor/plating/airless,
/area/awaymission/BMPship/Midship)
"gV" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plating/airless,
@@ -2356,24 +2163,18 @@
"gW" = (
/obj/machinery/door/unpowered/shuttle,
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/closed/wall/mineral/titanium/interior,
/area/awaymission/BMPship/Midship)
"gX" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel,
/area/awaymission/BMPship/Aft)
"gY" = (
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/turf/open/floor/plasteel,
+19 -259
View File
@@ -200,8 +200,6 @@
/area/ruin/space/has_grav/deepstorage/crusher)
"aC" = (
/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/turf/open/floor/plating{
@@ -210,8 +208,6 @@
/area/ruin/space/has_grav/deepstorage/crusher)
"aD" = (
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plating{
@@ -220,7 +216,6 @@
/area/ruin/space/has_grav/deepstorage/crusher)
"aE" = (
/obj/structure/cable/yellow{
d2 = 8;
icon_state = "0-8"
},
/obj/machinery/power/apc{
@@ -299,55 +294,35 @@
/area/ruin/space/has_grav/deepstorage/storage)
"aK" = (
/obj/structure/closet/cardboard,
/obj/item/stack/sheet/metal{
amount = 50;
/obj/item/stack/sheet/metal/fifty{
pixel_x = 2;
pixel_y = 2
},
/obj/item/stack/sheet/metal{
amount = 50;
/obj/item/stack/sheet/metal/fifty{
pixel_x = 2;
pixel_y = 2
},
/obj/item/stack/sheet/metal{
amount = 50;
/obj/item/stack/sheet/metal/fifty{
pixel_x = 2;
pixel_y = 2
},
/obj/item/stack/sheet/metal{
amount = 50;
/obj/item/stack/sheet/metal/fifty{
pixel_x = 2;
pixel_y = 2
},
/obj/item/stack/rods{
amount = 50
},
/obj/item/stack/rods{
amount = 50
},
/obj/item/stack/rods{
amount = 50
},
/obj/item/stack/rods{
amount = 50
},
/obj/item/stack/rods/fifty,
/obj/item/stack/rods/fifty,
/obj/item/stack/rods/fifty,
/obj/item/stack/rods/fifty,
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/storage)
"aL" = (
/obj/structure/closet/cardboard,
/obj/item/stack/sheet/glass{
amount = 50
},
/obj/item/stack/sheet/glass{
amount = 50
},
/obj/item/stack/sheet/glass{
amount = 50
},
/obj/item/stack/sheet/glass{
amount = 50
},
/obj/item/stack/sheet/glass/fifty,
/obj/item/stack/sheet/glass/fifty,
/obj/item/stack/sheet/glass/fifty,
/obj/item/stack/sheet/glass/fifty,
/obj/item/stack/sheet/plasteel{
amount = 10
},
@@ -389,8 +364,6 @@
req_access_txt = "200"
},
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel/floorgrime{
@@ -566,8 +539,6 @@
/area/ruin/space/has_grav/deepstorage/kitchen)
"be" = (
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/atmospherics/components/unary/vent_pump/on{
@@ -752,8 +723,6 @@
/area/ruin/space/has_grav/deepstorage/kitchen)
"by" = (
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/light{
@@ -838,8 +807,6 @@
"bJ" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/turf/open/floor/plasteel/cafeteria{
@@ -851,8 +818,6 @@
dir = 6
},
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel/cafeteria{
@@ -864,8 +829,6 @@
dir = 4
},
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel/cafeteria{
@@ -877,8 +840,6 @@
dir = 9
},
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel/cafeteria{
@@ -887,7 +848,6 @@
/area/ruin/space/has_grav/deepstorage/kitchen)
"bN" = (
/obj/structure/cable/yellow{
d2 = 8;
icon_state = "0-8"
},
/obj/machinery/power/apc{
@@ -908,8 +868,6 @@
/area/ruin/space/has_grav/deepstorage/kitchen)
"bP" = (
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/firealarm{
@@ -1001,8 +959,6 @@
"bY" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/door/firedoor,
@@ -1022,13 +978,9 @@
/area/ruin/space/has_grav/deepstorage/kitchen)
"ca" = (
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
@@ -1039,8 +991,6 @@
"cb" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel/floorgrime{
@@ -1049,8 +999,6 @@
/area/ruin/space/has_grav/deepstorage)
"cc" = (
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/door/firedoor,
@@ -1062,8 +1010,6 @@
"cd" = (
/obj/structure/table,
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel/hydrofloor{
@@ -1072,8 +1018,6 @@
/area/ruin/space/has_grav/deepstorage/hydroponics)
"ce" = (
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel/hydrofloor{
@@ -1082,8 +1026,6 @@
/area/ruin/space/has_grav/deepstorage/hydroponics)
"cf" = (
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
@@ -1093,7 +1035,6 @@
/area/ruin/space/has_grav/deepstorage/hydroponics)
"cg" = (
/obj/structure/cable/yellow{
d2 = 8;
icon_state = "0-8"
},
/obj/machinery/power/apc/highcap/five_k{
@@ -1179,8 +1120,6 @@
},
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel/bar{
@@ -1231,8 +1170,6 @@
/area/ruin/space/has_grav/deepstorage)
"ct" = (
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
@@ -1333,8 +1270,6 @@
dir = 5
},
/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/turf/open/floor/plasteel/floorgrime{
@@ -1350,8 +1285,6 @@
dir = 4
},
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel/floorgrime{
@@ -1364,8 +1297,6 @@
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/cable/yellow{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/turf/open/floor/plasteel/floorgrime{
@@ -1410,8 +1341,6 @@
"cK" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel/bar{
@@ -1455,8 +1384,6 @@
"cP" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel/floorgrime{
@@ -1477,8 +1404,6 @@
"cR" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/computer/arcade,
@@ -1513,8 +1438,6 @@
dir = 4
},
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel/bar{
@@ -1555,7 +1478,6 @@
/area/ruin/space/has_grav/deepstorage)
"da" = (
/obj/structure/cable/yellow{
d2 = 2;
icon_state = "0-2"
},
/obj/machinery/door/firedoor,
@@ -1625,9 +1547,7 @@
"dh" = (
/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden,
/obj/structure/cable/yellow{
icon_state = "1-4";
d1 = 1;
d2 = 4
icon_state = "1-4"
},
/obj/machinery/computer/arcade,
/turf/open/floor/plasteel/floorgrime{
@@ -1639,8 +1559,6 @@
dir = 4
},
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/structure/chair/stool,
@@ -1654,13 +1572,9 @@
dir = 4
},
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/turf/open/floor/plasteel/floorgrime{
@@ -1672,8 +1586,6 @@
dir = 10
},
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel/floorgrime{
@@ -1682,13 +1594,9 @@
/area/ruin/space/has_grav/deepstorage)
"dl" = (
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/turf/open/floor/plasteel/floorgrime{
@@ -1697,8 +1605,6 @@
/area/ruin/space/has_grav/deepstorage)
"dm" = (
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel/floorgrime{
@@ -1708,13 +1614,9 @@
"dn" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/cable/yellow{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/turf/open/floor/plasteel/floorgrime{
@@ -1749,13 +1651,9 @@
"dr" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/turf/open/floor/plasteel/floorgrime{
@@ -1764,12 +1662,9 @@
/area/ruin/space/has_grav/deepstorage)
"ds" = (
/obj/structure/cable/yellow{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/obj/structure/cable/yellow{
d2 = 8;
icon_state = "0-8"
},
/obj/machinery/door/firedoor,
@@ -1791,14 +1686,11 @@
/area/ruin/space/has_grav/deepstorage/armory)
"dv" = (
/obj/structure/table,
/obj/item/stack/sheet/metal{
amount = 50;
/obj/item/stack/sheet/metal/fifty{
pixel_x = 2;
pixel_y = 2
},
/obj/item/stack/rods{
amount = 50
},
/obj/item/stack/rods/fifty,
/obj/item/stack/cable_coil,
/obj/item/stack/cable_coil,
/obj/machinery/firealarm{
@@ -1880,8 +1772,6 @@
"dC" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/light{
@@ -1904,8 +1794,6 @@
dir = 4
},
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel/floorgrime{
@@ -1926,8 +1814,6 @@
},
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel/floorgrime{
@@ -1969,8 +1855,6 @@
"dL" = (
/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel/floorgrime{
@@ -2033,8 +1917,6 @@
dir = 6
},
/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/turf/open/floor/plasteel/floorgrime{
@@ -2046,8 +1928,6 @@
dir = 4
},
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/door/firedoor,
@@ -2061,8 +1941,6 @@
"dT" = (
/obj/machinery/atmospherics/pipe/manifold/supplymain/hidden,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/turf/open/floor/plasteel/floorgrime{
@@ -2095,9 +1973,7 @@
"dW" = (
/obj/machinery/atmospherics/pipe/manifold/supplymain/hidden,
/obj/structure/cable/yellow{
icon_state = "1-4";
d1 = 1;
d2 = 4
icon_state = "1-4"
},
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel/floorgrime{
@@ -2109,8 +1985,6 @@
dir = 4
},
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel/floorgrime{
@@ -2122,13 +1996,9 @@
dir = 1
},
/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel/floorgrime{
@@ -2141,8 +2011,6 @@
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel/floorgrime{
@@ -2152,8 +2020,6 @@
"ea" = (
/obj/machinery/atmospherics/pipe/manifold/supplymain/hidden,
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel/floorgrime{
@@ -2165,8 +2031,6 @@
dir = 4
},
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/door/firedoor,
@@ -2180,18 +2044,12 @@
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/cable/yellow{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/turf/open/floor/plasteel/floorgrime{
@@ -2201,8 +2059,6 @@
"ed" = (
/obj/machinery/atmospherics/pipe/manifold4w/supplymain/hidden,
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel/floorgrime{
@@ -2218,8 +2074,6 @@
dir = 4
},
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel/black{
@@ -2231,8 +2085,6 @@
dir = 10
},
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel/black{
@@ -2241,8 +2093,6 @@
/area/ruin/space/has_grav/deepstorage/armory)
"eg" = (
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel/black{
@@ -2255,7 +2105,6 @@
pixel_y = 5
},
/obj/structure/cable/yellow{
d2 = 8;
icon_state = "0-8"
},
/obj/machinery/power/apc/highcap/five_k{
@@ -2304,8 +2153,6 @@
"em" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel/floorgrime{
@@ -2352,8 +2199,6 @@
},
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel/floorgrime{
@@ -2369,13 +2214,9 @@
"et" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/obj/machinery/light{
@@ -2387,12 +2228,9 @@
/area/ruin/space/has_grav/deepstorage)
"eu" = (
/obj/structure/cable/yellow{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/obj/structure/cable/yellow{
d2 = 8;
icon_state = "0-8"
},
/obj/machinery/door/firedoor,
@@ -2479,8 +2317,6 @@
dir = 4
},
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel/floorgrime{
@@ -2574,14 +2410,10 @@
},
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/cable/yellow{
icon_state = "1-4";
d1 = 1;
d2 = 4
icon_state = "1-4"
},
/turf/open/floor/plasteel/floorgrime{
baseturf = /turf/open/floor/plating/asteroid/airless
@@ -2593,8 +2425,6 @@
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/firealarm{
@@ -2609,7 +2439,6 @@
dir = 10
},
/obj/structure/cable/yellow{
d2 = 8;
icon_state = "0-8"
},
/obj/machinery/power/apc{
@@ -2683,8 +2512,6 @@
"eQ" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/light{
@@ -2714,12 +2541,9 @@
id = "bunkershutter"
},
/obj/structure/cable/yellow{
d2 = 4;
icon_state = "0-4"
},
/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/obj/machinery/door/firedoor,
@@ -2733,8 +2557,6 @@
dir = 8
},
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel/floorgrime{
@@ -2743,8 +2565,6 @@
/area/ruin/space/has_grav/deepstorage/airlock)
"eV" = (
/obj/structure/cable/yellow{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/obj/machinery/atmospherics/components/unary/vent_pump/on{
@@ -2779,8 +2599,6 @@
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel/floorgrime{
@@ -2832,8 +2650,6 @@
"fe" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/extinguisher_cabinet{
@@ -2892,8 +2708,6 @@
"fl" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel/floorgrime{
@@ -3006,12 +2820,9 @@
"fx" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/cable/yellow{
d2 = 2;
icon_state = "0-2"
},
/obj/machinery/power/apc{
@@ -3246,8 +3057,6 @@
/area/ruin/space/has_grav/deepstorage)
"fW" = (
/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
@@ -3259,8 +3068,6 @@
/area/ruin/space/has_grav/deepstorage/power)
"fX" = (
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
@@ -3278,8 +3085,6 @@
dir = 4
},
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
@@ -3294,8 +3099,6 @@
dir = 4
},
/obj/structure/cable/yellow{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/turf/open/floor/plasteel/floorgrime{
@@ -3374,14 +3177,10 @@
/area/ruin/space/has_grav/deepstorage/dorm)
"gh" = (
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/cable/yellow{
icon_state = "1-4";
d1 = 1;
d2 = 4
icon_state = "1-4"
},
/obj/machinery/light/small{
dir = 8
@@ -3398,7 +3197,6 @@
dir = 4
},
/obj/structure/cable/yellow{
d2 = 4;
icon_state = "0-4"
},
/turf/open/floor/plating{
@@ -3408,8 +3206,6 @@
"gj" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
/obj/structure/cable/yellow{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/turf/open/floor/plasteel/floorgrime{
@@ -3470,9 +3266,7 @@
/area/ruin/space/has_grav/deepstorage/power)
"gq" = (
/obj/structure/cable/yellow{
icon_state = "1-4";
d1 = 1;
d2 = 4
icon_state = "1-4"
},
/turf/open/floor/plating{
baseturf = /turf/open/floor/plating/asteroid/airless
@@ -3481,7 +3275,6 @@
"gr" = (
/obj/machinery/power/smes/engineering,
/obj/structure/cable/yellow{
d2 = 8;
icon_state = "0-8"
},
/obj/structure/sign/electricshock{
@@ -3496,8 +3289,6 @@
dir = 4
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel/floorgrime{
@@ -3507,13 +3298,9 @@
"gt" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
/obj/structure/cable/yellow{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel/floorgrime{
@@ -3584,8 +3371,6 @@
dir = 8
},
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel/floorgrime{
@@ -3663,8 +3448,6 @@
dir = 8
},
/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/turf/open/floor/plating{
@@ -3673,13 +3456,9 @@
/area/ruin/space/has_grav/deepstorage/power)
"gK" = (
/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plating{
@@ -3692,8 +3471,6 @@
req_access_txt = "200"
},
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plating{
@@ -3703,8 +3480,6 @@
"gM" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/turf/open/floor/plasteel/floorgrime{
@@ -3750,8 +3525,6 @@
"gR" = (
/obj/structure/grille,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plating{
@@ -3761,13 +3534,9 @@
"gS" = (
/obj/structure/grille,
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/obj/machinery/door/firedoor,
@@ -3823,8 +3592,6 @@
"gX" = (
/obj/machinery/power/rtg/advanced,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/cable/yellow,
@@ -3924,8 +3691,6 @@
dir = 4
},
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/effect/turf_decal/stripes/corner{
@@ -3940,8 +3705,6 @@
dir = 4
},
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/firealarm{
@@ -3962,8 +3725,6 @@
"hl" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/firealarm{
@@ -4002,7 +3763,6 @@
"hp" = (
/obj/machinery/power/smes/engineering,
/obj/structure/cable/yellow{
d2 = 8;
icon_state = "0-8"
},
/turf/open/floor/plating{
+1 -6
View File
@@ -50,8 +50,7 @@
pixel_y = 26
},
/obj/structure/cable{
icon_state = "0-4";
d2 = 4
icon_state = "0-4"
},
/turf/open/floor/plating/airless,
/area/tcommsat/chamber)
@@ -60,8 +59,6 @@
dir = 1
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/turf/open/floor/plating/airless,
@@ -107,8 +104,6 @@
/area/template_noop)
"au" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plating/airless,
File diff suppressed because it is too large Load Diff
+9 -101
View File
@@ -4,8 +4,6 @@
/area/template_noop)
"ab" = (
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/obj/structure/lattice/catwalk,
@@ -13,8 +11,6 @@
/area/template_noop)
"ac" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/structure/lattice/catwalk,
@@ -22,8 +18,6 @@
/area/template_noop)
"ad" = (
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/obj/structure/lattice/catwalk,
@@ -40,8 +34,6 @@
/area/template_noop)
"af" = (
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/obj/structure/lattice/catwalk,
@@ -56,8 +48,6 @@
/area/ruin/space/has_grav/onehalf/dorms_med)
"ai" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/lattice/catwalk,
@@ -98,8 +88,6 @@
"aq" = (
/obj/machinery/door/airlock/external,
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plating,
@@ -189,8 +177,6 @@
/area/ruin/space/has_grav/onehalf/dorms_med)
"aD" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/light/small{
@@ -233,15 +219,12 @@
/area/ruin/space/has_grav/onehalf/dorms_med)
"aL" = (
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/turf/open/floor/plasteel/white,
/area/ruin/space/has_grav/onehalf/dorms_med)
"aM" = (
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
},
/obj/structure/closet/crate/medical,
@@ -302,8 +285,6 @@
/area/template_noop)
"aT" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel/airless{
@@ -318,8 +299,6 @@
"aV" = (
/obj/machinery/door/airlock/glass_medical,
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel/white,
@@ -330,13 +309,9 @@
/area/ruin/space/has_grav/onehalf/dorms_med)
"aX" = (
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/effect/turf_decal/stripes/line{
@@ -346,7 +321,6 @@
/area/ruin/space/has_grav/onehalf/drone_bay)
"aY" = (
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
},
/obj/machinery/power/apc{
@@ -470,13 +444,9 @@
dir = 4
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/turf/open/floor/plasteel/airless{
@@ -488,8 +458,6 @@
dir = 4
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel/airless{
@@ -501,8 +469,6 @@
dir = 4
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel/airless,
@@ -513,13 +479,9 @@
dir = 4
},
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel/airless{
@@ -531,13 +493,9 @@
dir = 4
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/turf/open/floor/plasteel/airless,
@@ -548,8 +506,6 @@
dir = 4
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel/airless,
@@ -560,8 +516,6 @@
},
/obj/machinery/door/airlock/glass,
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel,
@@ -571,8 +525,6 @@
dir = 4
},
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/turf/open/floor/plasteel,
@@ -843,8 +795,7 @@
/area/ruin/space/has_grav/onehalf/bridge)
"cf" = (
/obj/structure/cable{
icon_state = "0-4";
d2 = 4
icon_state = "0-4"
},
/obj/machinery/power/apc{
dir = 1;
@@ -855,8 +806,6 @@
/area/ruin/space/has_grav/onehalf/bridge)
"cg" = (
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/obj/structure/table/reinforced,
@@ -939,13 +888,9 @@
/area/ruin/space/has_grav/onehalf/bridge)
"cp" = (
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/obj/structure/table/reinforced,
@@ -955,16 +900,12 @@
"cq" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable{
icon_state = "0-4";
d2 = 4
icon_state = "0-4"
},
/obj/structure/cable{
icon_state = "0-2";
pixel_y = 1;
d2 = 2
icon_state = "0-2"
},
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
},
/obj/machinery/door/poddoor/preopen{
@@ -1021,9 +962,7 @@
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable,
/obj/structure/cable{
icon_state = "0-2";
pixel_y = 1;
d2 = 2
icon_state = "0-2"
},
/obj/machinery/door/poddoor/preopen{
id = "bridge_onehalf";
@@ -1041,8 +980,6 @@
"cC" = (
/obj/structure/lattice,
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/turf/open/space,
@@ -1129,8 +1066,6 @@
"cO" = (
/obj/structure/lattice,
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/space,
@@ -1169,8 +1104,7 @@
"cV" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable{
icon_state = "0-4";
d2 = 4
icon_state = "0-4"
},
/obj/structure/cable,
/obj/machinery/door/poddoor/preopen{
@@ -1181,13 +1115,9 @@
/area/ruin/space/has_grav/onehalf/bridge)
"cW" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/obj/structure/lattice/catwalk,
@@ -1195,8 +1125,6 @@
/area/template_noop)
"cX" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel/airless{
@@ -1227,8 +1155,6 @@
"dc" = (
/obj/structure/grille/broken,
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plating/airless{
@@ -1246,13 +1172,10 @@
"de" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable{
icon_state = "0-2";
pixel_y = 1;
d2 = 2
icon_state = "0-2"
},
/obj/structure/cable{
icon_state = "0-4";
d2 = 4
icon_state = "0-4"
},
/obj/machinery/door/poddoor/preopen{
id = "bridge_onehalf";
@@ -1263,11 +1186,9 @@
"df" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable{
icon_state = "0-4";
d2 = 4
icon_state = "0-4"
},
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
},
/obj/machinery/door/poddoor/preopen{
@@ -1279,12 +1200,9 @@
"dg" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable{
icon_state = "0-2";
pixel_y = 1;
d2 = 2
icon_state = "0-2"
},
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
},
/obj/machinery/door/poddoor/preopen{
@@ -1300,8 +1218,6 @@
/area/template_noop)
"di" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/item/shard{
@@ -1312,13 +1228,9 @@
/area/template_noop)
"dj" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/obj/item/stack/rods,
@@ -1327,13 +1239,9 @@
/area/template_noop)
"dk" = (
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/structure/lattice/catwalk,
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+2 -8
View File
@@ -108,15 +108,13 @@
name = "cabin APC"
},
/obj/structure/cable{
icon_state = "0-4";
d2 = 4
icon_state = "0-4"
},
/turf/open/floor/plating,
/area/awaymission/cabin)
"aw" = (
/obj/machinery/power/smes/magical,
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
},
/turf/open/floor/plating,
@@ -131,7 +129,6 @@
name = "geothermal generator"
},
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
},
/turf/open/floor/plating,
@@ -179,15 +176,12 @@
dir = 1
},
/obj/structure/cable{
icon_state = "0-4";
d2 = 4
icon_state = "0-4"
},
/turf/open/floor/plating,
/area/awaymission/cabin)
"aF" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plating,
+5 -16
View File
@@ -1554,15 +1554,12 @@
/obj/machinery/power/smes,
/obj/structure/cable,
/obj/structure/cable{
icon_state = "0-4";
d2 = 4
icon_state = "0-4"
},
/turf/open/floor/plating,
/area/awaymission/centcomAway/general)
"fN" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plating,
@@ -1571,7 +1568,6 @@
/obj/machinery/power/smes,
/obj/structure/cable,
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
},
/turf/open/floor/plating,
@@ -2165,9 +2161,7 @@
/area/awaymission/centcomAway/hangar)
"hP" = (
/obj/structure/table,
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal/fifty,
/turf/open/floor/plating,
/area/awaymission/centcomAway/hangar)
"hQ" = (
@@ -2249,8 +2243,7 @@
"ih" = (
/obj/machinery/mech_bay_recharge_port,
/obj/structure/cable{
icon_state = "0-2";
d2 = 2
icon_state = "0-2"
},
/turf/open/floor/plating,
/area/awaymission/centcomAway/hangar)
@@ -2615,12 +2608,8 @@
/area/awaymission/centcomAway/hangar)
"jt" = (
/obj/structure/table,
/obj/item/stack/sheet/glass{
amount = 50
},
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/glass/fifty,
/obj/item/stack/sheet/metal/fifty,
/turf/open/floor/plasteel/vault,
/area/awaymission/centcomAway/hangar)
"ju" = (
+1 -11
View File
@@ -968,9 +968,7 @@
"cZ" = (
/obj/machinery/gateway,
/obj/structure/cable{
icon_state = "0-2";
pixel_y = 1;
d2 = 2
icon_state = "0-2"
},
/turf/open/floor/plasteel/vault{
dir = 8
@@ -990,8 +988,6 @@
/area/awaymission/challenge/end)
"dc" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel/black,
@@ -1061,13 +1057,9 @@
/area/awaymission/challenge/end)
"dm" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/mob/living/simple_animal/hostile/syndicate{
@@ -1077,8 +1069,6 @@
/area/awaymission/challenge/end)
"dn" = (
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/turf/open/floor/plasteel/black,
+14 -195
View File
@@ -404,8 +404,7 @@
"aX" = (
/obj/machinery/gateway,
/obj/structure/cable{
icon_state = "0-2";
d2 = 2
icon_state = "0-2"
},
/turf/open/floor/plasteel/vault{
dir = 8;
@@ -472,8 +471,6 @@
/area/awaymission/moonoutpost19/syndicate)
"bg" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel/black{
@@ -601,8 +598,6 @@
req_access_txt = "150"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/effect/turf_decal/stripes/line{
@@ -701,8 +696,6 @@
/area/awaymission/moonoutpost19/syndicate)
"bC" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel/floorgrime{
@@ -808,8 +801,6 @@
/area/awaymission/moonoutpost19/syndicate)
"bQ" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/door/airlock/highsecurity{
@@ -824,8 +815,6 @@
/area/awaymission/moonoutpost19/syndicate)
"bR" = (
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/obj/structure/table,
@@ -844,12 +833,10 @@
/area/awaymission/moonoutpost19/syndicate)
"bS" = (
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
},
/obj/structure/cable{
icon_state = "0-4";
d2 = 4
icon_state = "0-4"
},
/obj/machinery/computer/monitor,
/obj/effect/turf_decal/stripes/line{
@@ -868,7 +855,6 @@
outputting = 1
},
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
},
/turf/open/floor/plating{
@@ -1005,8 +991,6 @@
/area/awaymission/moonoutpost19/syndicate)
"cf" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
@@ -1049,8 +1033,6 @@
/area/awaymission/moonoutpost19/syndicate)
"ci" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/table,
@@ -1080,8 +1062,7 @@
dir = 1
},
/obj/structure/cable{
icon_state = "0-2";
d2 = 2
icon_state = "0-2"
},
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -1170,13 +1151,9 @@
/area/awaymission/moonoutpost19/syndicate)
"ct" = (
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel{
@@ -1186,8 +1163,6 @@
/area/awaymission/moonoutpost19/syndicate)
"cu" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel/floorgrime{
@@ -1199,8 +1174,6 @@
/area/awaymission/moonoutpost19/syndicate)
"cv" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel/red/side{
@@ -1212,8 +1185,6 @@
/area/awaymission/moonoutpost19/syndicate)
"cw" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/door/airlock/engineering{
@@ -1226,8 +1197,6 @@
/area/awaymission/moonoutpost19/syndicate)
"cx" = (
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/turf/open/floor/plating{
@@ -1236,8 +1205,6 @@
/area/awaymission/moonoutpost19/syndicate)
"cy" = (
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/turf/open/floor/plating{
@@ -1246,18 +1213,12 @@
/area/awaymission/moonoutpost19/syndicate)
"cz" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/obj/effect/decal/cleanable/dirt,
@@ -1267,8 +1228,6 @@
/area/awaymission/moonoutpost19/syndicate)
"cA" = (
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/turf/open/floor/plating{
@@ -2174,8 +2133,6 @@
/area/awaymission/moonoutpost19/research)
"ei" = (
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/simple/general/visible{
@@ -2186,8 +2143,6 @@
/area/awaymission/moonoutpost19/research)
"ej" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/structure/alien/weeds,
@@ -2200,7 +2155,6 @@
/area/awaymission/moonoutpost19/research)
"ek" = (
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
},
/obj/machinery/shieldwallgen{
@@ -2208,8 +2162,7 @@
req_access = null
},
/obj/structure/cable{
icon_state = "0-2";
d2 = 2
icon_state = "0-2"
},
/turf/open/floor/plating{
heat_capacity = 1e+006
@@ -2312,8 +2265,6 @@
/area/awaymission/moonoutpost19/research)
"ex" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold{
@@ -2340,8 +2291,7 @@
/area/awaymission/moonoutpost19/research)
"ez" = (
/obj/structure/cable{
icon_state = "0-2";
d2 = 2
icon_state = "0-2"
},
/obj/machinery/door/poddoor/preopen{
desc = "A heavy duty blast door that opens mechanically. This one has been applied with an acid-proof coating.";
@@ -2438,8 +2388,6 @@
/area/awaymission/moonoutpost19/research)
"eN" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/general/visible,
@@ -2495,8 +2443,7 @@
name = "P.A.C.M.A.N.-type portable generator"
},
/obj/structure/cable{
icon_state = "0-2";
d2 = 2
icon_state = "0-2"
},
/turf/open/floor/plating{
heat_capacity = 1e+006
@@ -2508,8 +2455,7 @@
name = "S.U.P.E.R.P.A.C.M.A.N.-type portable generator"
},
/obj/structure/cable{
icon_state = "0-2";
d2 = 2
icon_state = "0-2"
},
/turf/open/floor/plating{
broken = 1;
@@ -2534,8 +2480,7 @@
dir = 4
},
/obj/structure/cable{
icon_state = "0-2";
d2 = 2
icon_state = "0-2"
},
/obj/machinery/airalarm{
frequency = 1439;
@@ -2549,8 +2494,7 @@
/area/awaymission/moonoutpost19/research)
"eW" = (
/obj/structure/cable{
icon_state = "0-2";
d2 = 2
icon_state = "0-2"
},
/obj/machinery/power/smes{
charge = 1.5e+006;
@@ -2565,8 +2509,6 @@
/area/awaymission/moonoutpost19/research)
"eX" = (
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/turf/open/floor/plating{
@@ -2575,8 +2517,6 @@
/area/awaymission/moonoutpost19/research)
"eY" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/item/newspaper,
@@ -2586,8 +2526,6 @@
/area/awaymission/moonoutpost19/research)
"eZ" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plating{
@@ -2598,8 +2536,6 @@
/area/awaymission/moonoutpost19/research)
"fa" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/effect/decal/cleanable/blood/tracks{
@@ -2613,8 +2549,6 @@
/area/awaymission/moonoutpost19/research)
"fb" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plating{
@@ -2623,8 +2557,6 @@
/area/awaymission/moonoutpost19/research)
"fc" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/door/airlock/maintenance{
@@ -2642,8 +2574,6 @@
/area/awaymission/moonoutpost19/research)
"fd" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/effect/decal/cleanable/blood/tracks{
@@ -2661,8 +2591,6 @@
pixel_x = 32
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/obj/structure/alien/weeds,
@@ -2741,8 +2669,6 @@
/area/awaymission/moonoutpost19/research)
"fl" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/general/visible,
@@ -2762,8 +2688,7 @@
"fn" = (
/obj/structure/cable,
/obj/structure/cable{
icon_state = "0-2";
d2 = 2
icon_state = "0-2"
},
/obj/machinery/door/poddoor/preopen{
desc = "A heavy duty blast door that opens mechanically. This one has been applied with an acid-proof coating.";
@@ -2793,8 +2718,6 @@
/area/awaymission/moonoutpost19/research)
"fq" = (
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/turf/open/floor/plating{
@@ -2803,13 +2726,9 @@
/area/awaymission/moonoutpost19/research)
"fr" = (
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
@@ -2820,8 +2739,6 @@
/area/awaymission/moonoutpost19/research)
"fs" = (
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/turf/open/floor/plating{
@@ -2830,8 +2747,6 @@
/area/awaymission/moonoutpost19/research)
"ft" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plating{
@@ -2842,8 +2757,6 @@
/area/awaymission/moonoutpost19/research)
"fu" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plating{
@@ -2866,13 +2779,9 @@
/area/awaymission/moonoutpost19/research)
"fw" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/obj/structure/alien/weeds,
@@ -2883,8 +2792,6 @@
/area/awaymission/moonoutpost19/research)
"fx" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/door/firedoor,
@@ -2903,8 +2810,6 @@
/area/awaymission/moonoutpost19/research)
"fy" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel/floorgrime{
@@ -2914,8 +2819,6 @@
/area/awaymission/moonoutpost19/research)
"fz" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel{
@@ -2924,8 +2827,6 @@
/area/awaymission/moonoutpost19/research)
"fA" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/door/firedoor,
@@ -2938,8 +2839,6 @@
/area/awaymission/moonoutpost19/research)
"fB" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/structure/alien/weeds/node,
@@ -2947,8 +2846,6 @@
/area/awaymission/moonoutpost19/research)
"fC" = (
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/obj/machinery/atmospherics/pipe/simple/general/visible{
@@ -2995,8 +2892,6 @@
icon_state = "medium"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/engine,
@@ -3091,13 +2986,9 @@
/area/awaymission/moonoutpost19/research)
"fP" = (
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plating{
@@ -3110,8 +3001,6 @@
req_one_access_txt = "0"
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plating{
@@ -3120,13 +3009,9 @@
/area/awaymission/moonoutpost19/research)
"fR" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/obj/effect/decal/cleanable/oil,
@@ -3199,8 +3084,6 @@
pixel_x = 32
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/alien/weeds,
@@ -3242,8 +3125,7 @@
/area/awaymission/moonoutpost19/research)
"gb" = (
/obj/structure/cable{
icon_state = "0-2";
d2 = 2
icon_state = "0-2"
},
/obj/structure/grille,
/obj/machinery/door/poddoor/preopen{
@@ -3297,8 +3179,6 @@
"gh" = (
/obj/effect/decal/cleanable/oil,
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plating{
@@ -3341,8 +3221,6 @@
/area/awaymission/moonoutpost19/research)
"gm" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/firealarm{
@@ -3427,8 +3305,7 @@
/area/awaymission/moonoutpost19/research)
"gt" = (
/obj/structure/cable{
icon_state = "0-2";
d2 = 2
icon_state = "0-2"
},
/obj/structure/disposalpipe/segment{
desc = "An underfloor disposal pipe. This one has been applied with an acid-proof coating.";
@@ -3633,8 +3510,7 @@
name = "Acid-Proof containment chamber blast door"
},
/obj/structure/cable{
icon_state = "0-2";
d2 = 2
icon_state = "0-2"
},
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating{
@@ -3651,8 +3527,6 @@
/area/awaymission/moonoutpost19/research)
"gN" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/item/stack/rods,
@@ -3824,8 +3698,6 @@
/area/awaymission/moonoutpost19/research)
"hd" = (
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/obj/effect/decal/cleanable/cobweb,
@@ -3835,8 +3707,6 @@
/area/awaymission/moonoutpost19/research)
"he" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
@@ -3846,8 +3716,6 @@
/area/awaymission/moonoutpost19/research)
"hf" = (
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/obj/effect/decal/cleanable/dirt,
@@ -3941,8 +3809,6 @@
/area/awaymission/moonoutpost19/research)
"hp" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/effect/decal/cleanable/oil,
@@ -4278,8 +4144,6 @@
/area/awaymission/moonoutpost19/arrivals)
"hW" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plating{
@@ -4635,8 +4499,6 @@
/area/awaymission/moonoutpost19/arrivals)
"iE" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
@@ -4971,8 +4833,6 @@
/area/awaymission/moonoutpost19/arrivals)
"jp" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/effect/decal/cleanable/oil,
@@ -5117,8 +4977,7 @@
/area/awaymission/moonoutpost19/arrivals)
"jH" = (
/obj/structure/cable{
icon_state = "0-2";
d2 = 2
icon_state = "0-2"
},
/obj/machinery/power/apc/highcap/fifteen_k{
dir = 1;
@@ -5224,8 +5083,6 @@
/area/awaymission/moonoutpost19/arrivals)
"jS" = (
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/turf/open/floor/plating{
@@ -5236,8 +5093,6 @@
/area/awaymission/moonoutpost19/research)
"jT" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/light/small{
@@ -5250,8 +5105,6 @@
/area/awaymission/moonoutpost19/arrivals)
"jU" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel{
@@ -5260,8 +5113,6 @@
/area/awaymission/moonoutpost19/arrivals)
"jV" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel/floorgrime{
@@ -5271,8 +5122,6 @@
/area/awaymission/moonoutpost19/arrivals)
"jW" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
@@ -5282,8 +5131,6 @@
/area/awaymission/moonoutpost19/arrivals)
"jX" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/item/cigbutt,
@@ -5297,8 +5144,6 @@
dir = 1
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/airalarm{
@@ -5314,8 +5159,6 @@
/area/awaymission/moonoutpost19/arrivals)
"jZ" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel/purple/corner{
@@ -5325,8 +5168,6 @@
/area/awaymission/moonoutpost19/arrivals)
"ka" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
@@ -5337,8 +5178,6 @@
/area/awaymission/moonoutpost19/arrivals)
"kb" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/door/firedoor{
@@ -5352,8 +5191,6 @@
/area/awaymission/moonoutpost19/arrivals)
"kc" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel{
@@ -5367,8 +5204,6 @@
/area/awaymission/moonoutpost19/arrivals)
"kd" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel{
@@ -5382,8 +5217,6 @@
/area/awaymission/moonoutpost19/arrivals)
"ke" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
@@ -5399,8 +5232,6 @@
dir = 1
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel/floorgrime{
@@ -5412,8 +5243,6 @@
/area/awaymission/moonoutpost19/arrivals)
"kg" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel{
@@ -5427,8 +5256,6 @@
/area/awaymission/moonoutpost19/arrivals)
"kh" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plating{
@@ -5441,8 +5268,6 @@
/area/awaymission/moonoutpost19/arrivals)
"ki" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel{
@@ -5456,8 +5281,6 @@
/area/awaymission/moonoutpost19/arrivals)
"kj" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
@@ -5474,8 +5297,6 @@
"kk" = (
/obj/machinery/light/small,
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel/floorgrime{
@@ -5485,8 +5306,6 @@
/area/awaymission/moonoutpost19/arrivals)
"kl" = (
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/obj/effect/decal/cleanable/dirt,
+6 -241
View File
@@ -270,8 +270,6 @@
/area/space)
"aY" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/light/small{
@@ -362,13 +360,10 @@
/area/awaymission/research/interior/gateway)
"bm" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/cable{
icon_state = "0-2";
d2 = 2
icon_state = "0-2"
},
/obj/machinery/power/apc/highcap/ten_k{
auto_name = 1;
@@ -486,8 +481,6 @@
/area/awaymission/research/interior/gateway)
"bD" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plating,
@@ -664,32 +657,24 @@
pixel_x = 24
},
/obj/structure/cable{
icon_state = "0-2";
pixel_y = 1;
d2 = 2
icon_state = "0-2"
},
/turf/open/floor/plasteel/black,
/area/awaymission/research/interior/gateway)
"cc" = (
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/turf/open/floor/plating,
/area/awaymission/research/interior/maint)
"cd" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plating,
/area/awaymission/research/interior/maint)
"ce" = (
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/turf/open/floor/plating,
@@ -740,8 +725,6 @@
dir = 4
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/window/reinforced,
@@ -749,16 +732,12 @@
/area/awaymission/research/interior/gateway)
"cm" = (
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/turf/open/floor/plating,
/area/awaymission/research/interior/maint)
"cn" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/light/small,
@@ -766,8 +745,6 @@
/area/awaymission/research/interior/maint)
"co" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plating,
@@ -813,16 +790,12 @@
/area/awaymission/research/interior/gateway)
"cu" = (
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/turf/open/floor/plasteel/black,
/area/awaymission/research/interior/gateway)
"cv" = (
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/obj/structure/table,
@@ -830,8 +803,6 @@
/area/awaymission/research/interior/gateway)
"cw" = (
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/turf/open/floor/plating,
@@ -848,8 +819,6 @@
/area/awaymission/research/interior/maint)
"cz" = (
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/mob/living/simple_animal/hostile/syndicate/ranged,
@@ -880,16 +849,12 @@
/area/awaymission/research/interior/gateway)
"cE" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel/black,
/area/awaymission/research/interior/gateway)
"cF" = (
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/obj/structure/table,
@@ -931,8 +896,6 @@
/area/awaymission/research/interior/genetics)
"cL" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/mob/living/simple_animal/hostile/syndicate/ranged,
@@ -968,8 +931,6 @@
/area/awaymission/research/interior/secure)
"cR" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/door/airlock/highsecurity{
@@ -981,8 +942,6 @@
/area/awaymission/research/interior/gateway)
"cS" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/power/apc/highcap/five_k{
@@ -991,9 +950,7 @@
pixel_x = 24
},
/obj/structure/cable{
icon_state = "0-2";
pixel_y = 1;
d2 = 2
icon_state = "0-2"
},
/turf/open/floor/plating,
/area/awaymission/research/interior/genetics)
@@ -1021,8 +978,6 @@
/area/awaymission/research/interior/genetics)
"cY" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/item/ammo_casing/c9mm,
@@ -1087,8 +1042,6 @@
/area/awaymission/research/interior/secure)
"dg" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plating,
@@ -1110,8 +1063,6 @@
/area/awaymission/research/interior/genetics)
"dk" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/effect/decal/cleanable/blood/drip,
@@ -1182,8 +1133,6 @@
/area/awaymission/research/interior/genetics)
"dw" = (
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/obj/effect/decal/cleanable/blood/drip,
@@ -1191,8 +1140,6 @@
/area/awaymission/research/interior/maint)
"dx" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/item/ammo_casing/c9mm,
@@ -1200,8 +1147,6 @@
/area/awaymission/research/interior/maint)
"dy" = (
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/obj/machinery/light/small{
@@ -1337,8 +1282,6 @@
/area/awaymission/research/interior/genetics)
"dR" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/item/ammo_casing/c45,
@@ -1346,13 +1289,9 @@
/area/awaymission/research/interior/maint)
"dS" = (
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/turf/open/floor/plating,
@@ -1401,8 +1340,6 @@
/area/awaymission/research/interior)
"dZ" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/light/small{
@@ -1440,8 +1377,6 @@
/area/awaymission/research/interior/maint)
"eg" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/effect/decal/cleanable/blood/drip,
@@ -1514,8 +1449,6 @@
req_access_txt = "12"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plating,
@@ -1602,16 +1535,12 @@
req_access_txt = "12"
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plating,
/area/awaymission/research/interior/maint)
"eI" = (
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/turf/open/floor/plasteel/whitepurple/side{
@@ -1663,8 +1592,7 @@
"eR" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable{
icon_state = "0-2";
d2 = 2
icon_state = "0-2"
},
/turf/open/floor/plating,
/area/awaymission/research/interior/security)
@@ -1720,8 +1648,6 @@
},
/obj/structure/cable,
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel/whitepurple,
@@ -1787,8 +1713,6 @@
/area/awaymission/research/interior/cryo)
"fj" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel/whitepurple/side{
@@ -1825,24 +1749,18 @@
/area/awaymission/research/interior/security)
"fr" = (
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/turf/open/floor/plasteel/whitered/side,
/area/awaymission/research/interior/security)
"fs" = (
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/turf/open/floor/plasteel/whitered/side,
/area/awaymission/research/interior/security)
"ft" = (
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/obj/machinery/light{
@@ -1873,8 +1791,6 @@
/area/awaymission/research/interior/secure)
"fx" = (
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/obj/machinery/light/small{
@@ -1889,7 +1805,6 @@
pixel_x = 24
},
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
},
/turf/open/floor/plasteel/black,
@@ -1915,8 +1830,6 @@
/area/awaymission/research/interior)
"fC" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel/whitepurple,
@@ -1975,8 +1888,6 @@
/area/awaymission/research/interior)
"fN" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel/whitepurple/side{
@@ -2027,8 +1938,6 @@
/area/awaymission/research/interior/security)
"fX" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel/whitered,
@@ -2039,8 +1948,6 @@
/area/awaymission/research/interior/security)
"fZ" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/chair{
@@ -2072,20 +1979,15 @@
dir = 1
},
/obj/structure/cable{
d2 = 4;
icon_state = "0-4"
},
/turf/open/floor/plasteel/black,
/area/awaymission/research/interior/secure)
"ge" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/turf/open/floor/plasteel/black,
@@ -2093,12 +1995,9 @@
"gf" = (
/obj/machinery/power/terminal,
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/structure/cable{
d2 = 4;
icon_state = "0-4"
},
/turf/open/floor/plasteel/black,
@@ -2110,32 +2009,24 @@
req_access_txt = "36"
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel/black,
/area/awaymission/research/interior/secure)
"gh" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel/black,
/area/awaymission/research/interior/secure)
"gi" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel/black,
/area/awaymission/research/interior/secure)
"gj" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/mob/living/simple_animal/hostile/nanotrasen/ranged/smg,
@@ -2143,8 +2034,6 @@
/area/awaymission/research/interior/secure)
"gk" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/structure/barricade/security,
@@ -2152,8 +2041,6 @@
/area/awaymission/research/interior/secure)
"gl" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/door/airlock/highsecurity{
@@ -2166,8 +2053,6 @@
"gm" = (
/obj/structure/barricade/security,
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel/black,
@@ -2178,30 +2063,22 @@
req_access_txt = "9,63"
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plating,
/area/awaymission/research/interior/secure)
"go" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plating,
/area/awaymission/research/interior)
"gp" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/light/small,
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/turf/open/floor/plating,
@@ -2212,34 +2089,24 @@
req_access_txt = "9"
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plating,
/area/awaymission/research/interior)
"gr" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel/whitepurple,
/area/awaymission/research/interior)
"gs" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/turf/open/floor/plasteel/whitepurple,
@@ -2300,8 +2167,6 @@
dir = 8
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel/whitepurple,
@@ -2337,39 +2202,27 @@
/area/awaymission/research/interior/security)
"gJ" = (
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/turf/open/floor/plasteel/whitered,
/area/awaymission/research/interior/security)
"gK" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel/whitered,
/area/awaymission/research/interior/security)
"gL" = (
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/structure/chair{
@@ -2379,8 +2232,6 @@
/area/awaymission/research/interior/security)
"gM" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/structure/table,
@@ -2388,8 +2239,6 @@
/area/awaymission/research/interior/security)
"gN" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/structure/table,
@@ -2399,8 +2248,6 @@
/area/awaymission/research/interior/security)
"gO" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/structure/chair{
@@ -2410,8 +2257,6 @@
/area/awaymission/research/interior/security)
"gP" = (
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/turf/open/floor/plasteel/whitered/side{
@@ -2453,8 +2298,6 @@
/area/awaymission/research/interior)
"gW" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel/whitepurple,
@@ -2524,8 +2367,6 @@
/area/awaymission/research/interior/security)
"hi" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel/whitered/side{
@@ -2557,8 +2398,6 @@
/area/awaymission/research/interior/security)
"ho" = (
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/turf/open/floor/plasteel/whitered/side{
@@ -2567,8 +2406,6 @@
/area/awaymission/research/interior/security)
"hp" = (
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/turf/open/floor/plasteel/whitered/side{
@@ -2583,8 +2420,6 @@
/area/awaymission/research/interior/security)
"hr" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/light{
@@ -2615,29 +2450,21 @@
/area/awaymission/research/interior/cryo)
"hw" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plating,
/area/awaymission/research/interior/maint)
"hx" = (
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plating,
/area/awaymission/research/interior/maint)
"hy" = (
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/obj/effect/decal/cleanable/blood/drip,
@@ -2664,8 +2491,6 @@
/area/awaymission/research/interior)
"hD" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/light/small{
@@ -2693,8 +2518,6 @@
/area/awaymission/research/interior/security)
"hH" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/vending/security,
@@ -2773,8 +2596,6 @@
/area/awaymission/research/interior)
"hR" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/table,
@@ -2873,8 +2694,6 @@
/area/awaymission/research/interior/maint)
"ie" = (
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/obj/machinery/light/small{
@@ -2888,8 +2707,6 @@
/area/awaymission/research/interior)
"ig" = (
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/obj/machinery/light/small{
@@ -2925,8 +2742,6 @@
/area/awaymission/research/interior/security)
"ik" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/light/small{
@@ -2984,21 +2799,15 @@
/area/awaymission/research/interior/bathroom)
"iq" = (
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plating,
/area/awaymission/research/interior/maint)
"ir" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel/whitegreen/side{
@@ -3007,16 +2816,12 @@
/area/awaymission/research/interior)
"is" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel/whitegreen,
/area/awaymission/research/interior)
"it" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel/whitegreen/side{
@@ -3025,13 +2830,9 @@
/area/awaymission/research/interior)
"iu" = (
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plating,
@@ -3042,8 +2843,6 @@
req_access_txt = "63"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plating,
@@ -3055,13 +2854,9 @@
pixel_x = 24
},
/obj/structure/cable{
icon_state = "0-2";
pixel_y = 1;
d2 = 2
icon_state = "0-2"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plating,
@@ -3116,12 +2911,9 @@
pixel_y = 24
},
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plating,
@@ -3205,8 +2997,6 @@
/area/awaymission/research/interior/maint)
"iT" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/door/airlock/maintenance_hatch{
@@ -3216,15 +3006,12 @@
/area/awaymission/research/interior/maint)
"iU" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel,
/area/awaymission/research/interior/maint)
"iV" = (
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
},
/turf/open/floor/plating,
@@ -3651,14 +3438,10 @@
pixel_x = 24
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/cable{
icon_state = "0-2";
pixel_y = 1;
d2 = 2
icon_state = "0-2"
},
/turf/open/floor/plating,
/area/awaymission/research/interior/dorm)
@@ -3760,8 +3543,6 @@
/area/awaymission/research/interior/dorm)
"kG" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/door/airlock/maintenance_hatch{
@@ -3771,8 +3552,6 @@
/area/awaymission/research/interior/maint)
"kH" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel/whitegreen/side{
@@ -3781,16 +3560,12 @@
/area/awaymission/research/interior)
"kI" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel/whitegreen,
/area/awaymission/research/interior)
"kJ" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel/whitegreen/side{
@@ -3799,8 +3574,6 @@
/area/awaymission/research/interior)
"kK" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plating,
@@ -3824,8 +3597,6 @@
/area/awaymission/research/interior/medbay)
"kP" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/light/small{
@@ -4211,15 +3982,12 @@
dir = 1
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plating,
/area/awaymission/research/interior/maint)
"lW" = (
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
},
/obj/machinery/power/apc{
@@ -4242,8 +4010,6 @@
/area/awaymission/research/interior/dorm)
"lZ" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/power/apc{
@@ -4252,7 +4018,6 @@
pixel_y = -24
},
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
},
/turf/open/floor/plating,
+4 -27
View File
@@ -219,9 +219,7 @@
/area/awaymission/snowdin/base)
"aE" = (
/obj/structure/cable{
icon_state = "0-2";
pixel_y = 1;
d2 = 2
icon_state = "0-2"
},
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating{
@@ -256,8 +254,6 @@
/area/awaymission/snowdin/base)
"aJ" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel{
@@ -497,9 +493,7 @@
"bp" = (
/obj/machinery/gateway,
/obj/structure/cable{
icon_state = "0-2";
pixel_y = 1;
d2 = 2
icon_state = "0-2"
},
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel{
@@ -556,9 +550,7 @@
dir = 8
},
/obj/structure/cable{
icon_state = "0-2";
pixel_y = 1;
d2 = 2
icon_state = "0-2"
},
/turf/open/floor/plasteel{
baseturf = /turf/open/floor/plating/asteroid/snow;
@@ -585,8 +577,6 @@
"bx" = (
/obj/effect/landmark/awaystart,
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel{
@@ -596,8 +586,6 @@
/area/awaymission/snowdin/base)
"by" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/effect/landmark/awaystart,
@@ -676,12 +664,9 @@
dir = 8
},
/obj/structure/cable{
icon_state = "0-4";
d2 = 4
icon_state = "0-4"
},
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/turf/open/floor/plasteel{
@@ -691,8 +676,6 @@
/area/awaymission/snowdin/base)
"bI" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/effect/landmark/awaystart,
@@ -703,14 +686,10 @@
/area/awaymission/snowdin/base)
"bJ" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/effect/landmark/awaystart,
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/turf/open/floor/plasteel{
@@ -728,8 +707,6 @@
/area/awaymission/snowdin/base)
"bL" = (
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/obj/effect/landmark/awaystart,
File diff suppressed because it is too large Load Diff
+1 -4
View File
@@ -1,8 +1,5 @@
{
"map_name": "Box Station",
"map_path": "map_files/BoxStation",
"map_file": "BoxStation.dmm",
"minetype": "lavaland",
"transition_config": "default",
"allow_custom_shuttles": "yes"
"map_file": "BoxStation.dmm"
}
+1 -4
View File
@@ -1,8 +1,5 @@
{
"map_name": "Delta Station",
"map_path": "map_files/Deltastation",
"map_file": "DeltaStation2.dmm",
"minetype": "lavaland",
"transition_config": "default",
"allow_custom_shuttles": "yes"
"map_file": "DeltaStation2.dmm"
}
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+143 -353
View File
@@ -4798,10 +4798,7 @@
/turf/open/floor/plating,
/area/maintenance/port)
"akp" = (
/obj/structure/rack{
dir = 8;
layer = 2.9
},
/obj/structure/rack,
/obj/item/clothing/gloves/color/yellow,
/obj/item/mop,
/obj/item/bikehorn/rubberducky,
@@ -4823,10 +4820,7 @@
/turf/open/floor/plating,
/area/maintenance/port/fore)
"aks" = (
/obj/structure/rack{
dir = 8;
layer = 2.9
},
/obj/structure/rack,
/obj/item/clothing/neck/tie/red{
pixel_x = -5;
pixel_y = 3
@@ -5195,9 +5189,7 @@
/turf/open/floor/plasteel,
/area/security/range)
"akZ" = (
/obj/structure/rack{
pixel_y = 2
},
/obj/structure/rack,
/obj/item/gun/energy/laser/practice{
pixel_x = 2;
pixel_y = -2
@@ -5515,10 +5507,7 @@
/obj/structure/light_construct/small{
dir = 4
},
/obj/structure/rack{
dir = 8;
layer = 2.9
},
/obj/structure/rack,
/obj/item/storage/secure/briefcase,
/obj/item/disk/data,
/obj/item/grenade/flashbang,
@@ -6180,9 +6169,7 @@
/turf/open/floor/plating,
/area/maintenance/port)
"ana" = (
/obj/structure/rack{
dir = 1
},
/obj/structure/rack,
/obj/item/clothing/under/rank/mailman,
/obj/item/clothing/under/rank/vice{
pixel_x = 4;
@@ -7176,10 +7163,7 @@
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"ape" = (
/obj/structure/rack{
dir = 8;
layer = 2.9
},
/obj/structure/rack,
/obj/item/storage/belt{
desc = "Can hold quite a lot of stuff.";
name = "multi-belt"
@@ -7355,10 +7339,7 @@
/turf/open/floor/plating,
/area/maintenance/port/fore)
"apx" = (
/obj/structure/rack{
dir = 8;
layer = 2.9
},
/obj/structure/rack,
/obj/item/circuitboard/computer/secure_data{
pixel_x = -2;
pixel_y = 2
@@ -7725,10 +7706,7 @@
/obj/item/device/mmi{
name = "man-machine interface"
},
/obj/structure/rack{
dir = 8;
layer = 2.9
},
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
@@ -10395,18 +10373,15 @@
/area/hallway/primary/port)
"avI" = (
/obj/structure/closet/crate,
/obj/item/stack/sheet/metal{
amount = 50;
/obj/item/stack/sheet/metal/fifty{
pixel_x = 2;
pixel_y = 2
},
/obj/item/stack/sheet/metal{
amount = 50;
/obj/item/stack/sheet/metal/fifty{
pixel_x = 2;
pixel_y = 2
},
/obj/item/stack/sheet/metal{
amount = 50;
/obj/item/stack/sheet/metal/fifty{
pixel_x = 2;
pixel_y = 2
},
@@ -12120,9 +12095,7 @@
},
/area/quartermaster/miningoffice)
"azp" = (
/obj/structure/rack{
dir = 1
},
/obj/structure/rack,
/obj/item/storage/toolbox/emergency{
pixel_x = 2;
pixel_y = -3
@@ -13509,10 +13482,7 @@
/turf/open/floor/plasteel/floorgrime,
/area/quartermaster/warehouse)
"aCc" = (
/obj/structure/rack{
dir = 8;
layer = 2.9
},
/obj/structure/rack,
/obj/item/electronics/apc,
/obj/item/stock_parts/cell{
maxcharge = 2000
@@ -14363,10 +14333,7 @@
/turf/open/floor/plasteel/grimy,
/area/security/detectives_office)
"aDN" = (
/obj/structure/rack{
dir = 8;
layer = 2.9
},
/obj/structure/rack,
/obj/item/storage/briefcase{
pixel_x = -3;
pixel_y = 2
@@ -15329,9 +15296,7 @@
},
/area/quartermaster/miningoffice)
"aFH" = (
/obj/structure/rack{
dir = 1
},
/obj/structure/rack,
/obj/item/pickaxe{
pixel_x = 5
},
@@ -15933,9 +15898,7 @@
/area/crew_quarters/dorms)
"aGQ" = (
/obj/structure/table,
/obj/item/stack/rods{
amount = 50
},
/obj/item/stack/rods/fifty,
/obj/item/wrench,
/obj/item/storage/box/lights/mixed,
/obj/effect/turf_decal/bot{
@@ -15947,24 +15910,12 @@
/area/engine/engineering)
"aGR" = (
/obj/structure/table,
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/glass{
amount = 50
},
/obj/item/stack/sheet/glass{
amount = 50
},
/obj/item/stack/sheet/glass{
amount = 50
},
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/glass/fifty,
/obj/item/stack/sheet/glass/fifty,
/obj/item/stack/sheet/glass/fifty,
/obj/item/crowbar,
/obj/item/grenade/chem_grenade/smart_metal_foam,
/obj/item/grenade/chem_grenade/smart_metal_foam,
@@ -17061,10 +17012,7 @@
/turf/open/floor/wood,
/area/lawoffice)
"aIW" = (
/obj/structure/rack{
dir = 8;
layer = 2.9
},
/obj/structure/rack,
/obj/item/storage/briefcase{
pixel_x = -3;
pixel_y = 2
@@ -18822,15 +18770,9 @@
/area/engine/engineering)
"aNo" = (
/obj/structure/closet/crate,
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/rods{
amount = 50
},
/obj/item/stack/sheet/glass{
amount = 50
},
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/rods/fifty,
/obj/item/stack/sheet/glass/fifty,
/obj/item/electronics/airlock,
/obj/item/electronics/airlock,
/obj/item/stock_parts/cell/high{
@@ -20879,15 +20821,9 @@
/area/construction/mining/aux_base)
"aRF" = (
/obj/structure/table,
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/glass{
amount = 50
},
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/glass/fifty,
/obj/item/pipe_dispenser,
/obj/machinery/light{
dir = 4
@@ -21411,9 +21347,7 @@
/obj/item/stack/sheet/plasteel{
amount = 10
},
/obj/item/stack/rods{
amount = 50
},
/obj/item/stack/rods/fifty,
/obj/item/storage/box/lights/mixed,
/turf/open/floor/plasteel/yellow/side{
dir = 6
@@ -23974,10 +23908,7 @@
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"aYi" = (
/obj/structure/rack{
dir = 8;
layer = 2.9
},
/obj/structure/rack,
/obj/item/storage/toolbox/electrical{
pixel_x = 1;
pixel_y = -1
@@ -23988,10 +23919,7 @@
/turf/open/floor/plasteel/black,
/area/storage/tech)
"aYj" = (
/obj/structure/rack{
dir = 8;
layer = 2.9
},
/obj/structure/rack,
/obj/item/circuitboard/computer/pandemic{
pixel_x = -3;
pixel_y = 3
@@ -24010,10 +23938,7 @@
/turf/open/floor/plasteel/black,
/area/storage/tech)
"aYk" = (
/obj/structure/rack{
dir = 8;
layer = 2.9
},
/obj/structure/rack,
/obj/item/circuitboard/computer/mining,
/obj/item/circuitboard/machine/autolathe{
pixel_x = 3;
@@ -25616,10 +25541,7 @@
},
/area/maintenance/starboard/fore)
"bbk" = (
/obj/structure/rack{
dir = 8;
layer = 2.9
},
/obj/structure/rack,
/obj/item/circuitboard/computer/borgupload{
pixel_x = -1;
pixel_y = 1
@@ -25657,10 +25579,7 @@
},
/area/storage/tech)
"bbn" = (
/obj/structure/rack{
dir = 8;
layer = 2.9
},
/obj/structure/rack,
/obj/item/circuitboard/computer/cloning,
/obj/item/circuitboard/computer/med_data{
pixel_x = 3;
@@ -25676,10 +25595,7 @@
/turf/closed/wall,
/area/maintenance/solars/port/fore)
"bbp" = (
/obj/structure/rack{
dir = 8;
layer = 2.9
},
/obj/structure/rack,
/obj/item/circuitboard/computer/powermonitor{
pixel_x = -2;
pixel_y = 2
@@ -26136,10 +26052,7 @@
},
/area/hallway/primary/central)
"bcn" = (
/obj/structure/rack{
dir = 8;
layer = 2.9
},
/obj/structure/rack,
/obj/machinery/firealarm{
dir = 8;
pixel_x = -26
@@ -26196,10 +26109,7 @@
/turf/open/floor/plating,
/area/storage/tech)
"bcv" = (
/obj/structure/rack{
dir = 8;
layer = 2.9
},
/obj/structure/rack,
/obj/item/circuitboard/computer/crew{
pixel_x = -1;
pixel_y = 1
@@ -26884,12 +26794,8 @@
/area/storage/tools)
"bdS" = (
/obj/structure/table,
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/metal/fifty,
/obj/item/storage/box/lights/mixed,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/yellow/side{
@@ -26913,12 +26819,8 @@
/area/storage/tools)
"bdV" = (
/obj/structure/table,
/obj/item/stack/sheet/glass{
amount = 50
},
/obj/item/stack/rods{
amount = 50
},
/obj/item/stack/sheet/glass/fifty,
/obj/item/stack/rods/fifty,
/turf/open/floor/plasteel/yellow/side{
dir = 6
},
@@ -26932,10 +26834,7 @@
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"bdX" = (
/obj/structure/rack{
dir = 8;
layer = 2.9
},
/obj/structure/rack,
/obj/item/circuitboard/computer/robotics{
pixel_x = -2;
pixel_y = 2
@@ -26977,10 +26876,7 @@
/turf/open/floor/plasteel/black,
/area/storage/tech)
"bec" = (
/obj/structure/rack{
dir = 8;
layer = 2.9
},
/obj/structure/rack,
/obj/item/storage/toolbox/electrical{
pixel_x = 1;
pixel_y = -1
@@ -27040,10 +26936,7 @@
},
/area/crew_quarters/heads/chief)
"beh" = (
/obj/structure/rack{
dir = 8;
layer = 2.9
},
/obj/structure/rack,
/obj/item/storage/secure/briefcase,
/obj/item/clothing/mask/cigarette/cigar,
/obj/machinery/computer/security/telescreen{
@@ -27057,10 +26950,7 @@
},
/area/crew_quarters/heads/chief)
"bei" = (
/obj/structure/rack{
dir = 8;
layer = 2.9
},
/obj/structure/rack,
/obj/item/lighter,
/obj/item/clothing/glasses/meson,
/obj/machinery/button/door{
@@ -30215,10 +30105,7 @@
/obj/structure/cable/yellow{
icon_state = "1-8"
},
/obj/structure/rack{
dir = 8;
layer = 2.9
},
/obj/structure/rack,
/obj/item/storage/box,
/obj/item/storage/box,
/obj/item/storage/box,
@@ -37350,12 +37237,8 @@
/area/crew_quarters/theatre)
"byO" = (
/obj/structure/table,
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/glass{
amount = 50
},
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/glass/fifty,
/obj/machinery/power/apc{
dir = 2;
name = "MiniSat Maint APC";
@@ -37410,18 +37293,12 @@
/obj/machinery/light{
dir = 1
},
/obj/structure/table,
/obj/item/paper_bin{
pixel_x = -3;
pixel_y = 7
},
/obj/item/pen,
/obj/machinery/computer/atmos_alert,
/turf/open/floor/plasteel/caution{
dir = 1
},
/area/engine/atmos)
"byT" = (
/obj/machinery/computer/atmos_alert,
/obj/structure/sign/map/left{
desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown).";
icon_state = "map-left-MS";
@@ -37431,6 +37308,7 @@
c_tag = "Atmospherics - Control Room";
network = list("SS13")
},
/obj/machinery/computer/station_alert,
/turf/open/floor/plasteel/caution{
dir = 1
},
@@ -37441,7 +37319,6 @@
icon_state = "map-right-MS";
pixel_y = 32
},
/obj/machinery/computer/station_alert,
/turf/open/floor/plasteel/caution{
dir = 1
},
@@ -38222,13 +38099,12 @@
/turf/open/floor/plating,
/area/engine/atmos)
"bAB" = (
/obj/item/clothing/mask/breath{
pixel_x = 4
},
/obj/item/tank/internals/emergency_oxygen{
pixel_x = -8
},
/obj/structure/table,
/obj/item/paper_bin{
pixel_x = -3;
pixel_y = 7
},
/obj/item/pen,
/turf/open/floor/plasteel/caution{
dir = 8
},
@@ -38269,12 +38145,8 @@
dir = 8
},
/obj/structure/table,
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/metal/fifty,
/obj/item/grenade/chem_grenade/smart_metal_foam,
/obj/item/grenade/chem_grenade/smart_metal_foam,
/turf/open/floor/plasteel/caution{
@@ -41866,12 +41738,8 @@
/obj/item/stack/sheet/rglass{
amount = 50
},
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/rods{
amount = 50
},
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/rods/fifty,
/obj/item/storage/toolbox/emergency,
/obj/item/device/flashlight,
/obj/machinery/power/apc/highcap/five_k{
@@ -42066,18 +41934,10 @@
/area/engine/atmos)
"bIN" = (
/obj/structure/table,
/obj/item/stack/sheet/glass{
amount = 50
},
/obj/item/stack/sheet/glass{
amount = 50
},
/obj/item/stack/rods{
amount = 50
},
/obj/item/stack/rods{
amount = 50
},
/obj/item/stack/sheet/glass/fifty,
/obj/item/stack/sheet/glass/fifty,
/obj/item/stack/rods/fifty,
/obj/item/stack/rods/fifty,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 5
},
@@ -42492,9 +42352,7 @@
/obj/item/stack/sheet/rglass{
amount = 50
},
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal/fifty,
/obj/item/storage/toolbox/emergency,
/obj/item/device/flashlight,
/obj/structure/window/reinforced,
@@ -43123,20 +42981,14 @@
/turf/open/floor/plating,
/area/maintenance/port)
"bLf" = (
/obj/structure/rack{
dir = 8;
layer = 2.9
},
/obj/structure/rack,
/obj/effect/spawner/lootdrop/costume,
/obj/effect/spawner/lootdrop/costume,
/turf/open/floor/plating,
/area/maintenance/port)
"bLg" = (
/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/structure/rack{
dir = 8;
layer = 2.9
},
/obj/structure/rack,
/obj/effect/spawner/lootdrop/costume,
/obj/effect/spawner/lootdrop/costume,
/turf/open/floor/plating,
@@ -43174,12 +43026,8 @@
/obj/item/stack/sheet/rglass{
amount = 50
},
/obj/item/stack/rods{
amount = 50
},
/obj/item/stack/rods{
amount = 50
},
/obj/item/stack/rods/fifty,
/obj/item/stack/rods/fifty,
/obj/structure/table,
/obj/item/storage/toolbox/mechanical{
pixel_x = -2;
@@ -43238,10 +43086,7 @@
dir = 1;
pixel_y = 1
},
/obj/structure/rack{
dir = 8;
layer = 2.9
},
/obj/structure/rack,
/obj/item/clothing/shoes/magboots{
pixel_x = -4;
pixel_y = 3
@@ -43623,10 +43468,7 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"bMf" = (
/obj/structure/rack{
dir = 8;
layer = 2.9
},
/obj/structure/rack,
/obj/item/clothing/suit/hazardvest,
/obj/item/clothing/suit/hazardvest,
/obj/item/clothing/suit/hazardvest,
@@ -44666,12 +44508,8 @@
},
/area/hallway/primary/central)
"bOo" = (
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/metal/fifty,
/obj/structure/table,
/obj/item/stack/sheet/plasteel{
amount = 10
@@ -44680,12 +44518,8 @@
dir = 4;
pixel_x = -22
},
/obj/item/stack/sheet/glass{
amount = 50
},
/obj/item/stack/sheet/glass{
amount = 50
},
/obj/item/stack/sheet/glass/fifty,
/obj/item/stack/sheet/glass/fifty,
/obj/item/crowbar,
/obj/item/wrench,
/obj/item/storage/toolbox/electrical{
@@ -44729,10 +44563,7 @@
req_access_txt = "19"
},
/obj/structure/window/reinforced,
/obj/structure/rack{
dir = 8;
layer = 2.9
},
/obj/structure/rack,
/obj/item/tank/jetpack/carbondioxide{
pixel_x = 4;
pixel_y = -1
@@ -44852,10 +44683,7 @@
/turf/open/floor/wood,
/area/bridge/showroom/corporate)
"bOG" = (
/obj/structure/rack{
dir = 8;
layer = 2.9
},
/obj/structure/rack,
/obj/item/stack/medical/ointment,
/obj/item/stack/medical/bruise_pack,
/obj/item/reagent_containers/syringe/charcoal,
@@ -45304,10 +45132,7 @@
/turf/open/floor/plating,
/area/maintenance/port)
"bPJ" = (
/obj/structure/rack{
dir = 8;
layer = 2.9
},
/obj/structure/rack,
/obj/item/clothing/mask/horsehead,
/turf/open/floor/plating,
/area/maintenance/port)
@@ -45553,10 +45378,7 @@
/turf/open/floor/wood,
/area/bridge/showroom/corporate)
"bQp" = (
/obj/structure/rack{
dir = 8;
layer = 2.9
},
/obj/structure/rack,
/obj/item/clothing/suit/hazardvest,
/obj/item/clothing/suit/hazardvest,
/obj/item/clothing/head/hardhat/orange{
@@ -46226,10 +46048,7 @@
/obj/item/device/radio/off,
/obj/item/device/radio/off,
/obj/item/device/radio/off,
/obj/structure/rack{
dir = 8;
layer = 2.9
},
/obj/structure/rack,
/obj/machinery/button/door{
id = "gateshutter";
name = "Gateway Shutter Control";
@@ -55862,14 +55681,11 @@
},
/area/hallway/primary/aft)
"clz" = (
/obj/item/stack/sheet/glass{
amount = 50;
/obj/item/stack/sheet/glass/fifty{
pixel_x = 3;
pixel_y = 3
},
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal/fifty,
/obj/item/clothing/glasses/welding,
/obj/structure/table,
/obj/effect/turf_decal/stripes/line{
@@ -62997,15 +62813,9 @@
},
/area/science/mixing)
"czG" = (
/obj/item/stack/rods{
amount = 50
},
/obj/item/stack/sheet/glass{
amount = 50
},
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/rods/fifty,
/obj/item/stack/sheet/glass/fifty,
/obj/item/stack/sheet/metal/fifty,
/obj/item/target,
/obj/item/target/syndicate,
/obj/item/target/alien,
@@ -67652,10 +67462,7 @@
/area/maintenance/aft)
"cIC" = (
/obj/item/clothing/gloves/color/latex/nitrile,
/obj/structure/rack{
dir = 8;
layer = 2.9
},
/obj/structure/rack,
/obj/item/clothing/suit/toggle/labcoat,
/obj/item/clothing/suit/apron/surgical,
/obj/item/clothing/mask/surgical,
@@ -68044,10 +67851,7 @@
/turf/open/floor/plating,
/area/maintenance/aft)
"cJt" = (
/obj/structure/rack{
dir = 8;
layer = 2.9
},
/obj/structure/rack,
/obj/item/screwdriver{
pixel_y = 6
},
@@ -69948,10 +69752,7 @@
/turf/open/floor/plating,
/area/maintenance/port/aft)
"cNg" = (
/obj/structure/rack{
dir = 8;
layer = 2.9
},
/obj/structure/rack,
/obj/item/device/flashlight,
/obj/effect/spawner/lootdrop/maintenance,
/obj/machinery/light/small,
@@ -69983,9 +69784,7 @@
/obj/item/reagent_containers/food/snacks/grown/citrus/orange,
/obj/item/reagent_containers/food/snacks/grown/grapes,
/obj/item/reagent_containers/food/snacks/grown/cocoapod,
/obj/structure/rack{
layer = 2.8
},
/obj/structure/rack,
/obj/item/seeds/wheat,
/obj/item/seeds/watermelon,
/obj/item/seeds/watermelon,
@@ -70000,9 +69799,7 @@
/obj/item/device/plant_analyzer,
/obj/item/cultivator,
/obj/item/reagent_containers/glass/bucket,
/obj/structure/rack{
layer = 2.8
},
/obj/structure/rack,
/obj/item/seeds/corn,
/obj/item/seeds/cabbage,
/obj/item/seeds/ambrosia,
@@ -71518,24 +71315,12 @@
pixel_x = 3;
pixel_y = -4
},
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/metal/fifty,
/obj/structure/extinguisher_cabinet{
pixel_x = 27
},
@@ -72016,10 +71801,7 @@
/turf/open/floor/plating,
/area/chapel/main)
"cRM" = (
/obj/machinery/processor{
desc = "A machine used to process slimes and retrieve their extract.";
name = "Slime Processor"
},
/obj/machinery/processor/slime,
/obj/effect/turf_decal/stripes/corner{
dir = 2
},
@@ -73252,7 +73034,8 @@
frequency = 1441;
id = "n2_in"
},
/turf/open/floor/plating/airless,
/obj/structure/lattice/catwalk,
/turf/open/space,
/area/engine/atmos)
"cVB" = (
/obj/structure/chair{
@@ -73404,9 +73187,7 @@
/area/shuttle/abandoned)
"cVU" = (
/obj/structure/table,
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal/fifty,
/obj/item/stock_parts/cell/high{
charge = 100;
maxcharge = 15000;
@@ -73783,14 +73564,11 @@
/area/shuttle/abandoned)
"cWy" = (
/obj/structure/table,
/obj/item/stack/sheet/glass{
amount = 50;
/obj/item/stack/sheet/glass/fifty{
pixel_x = -2;
pixel_y = 2
},
/obj/item/stack/rods{
amount = 50
},
/obj/item/stack/rods/fifty,
/obj/effect/decal/cleanable/dirt{
desc = "A thin layer of dust coating the floor.";
name = "dust"
@@ -73799,11 +73577,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
"cWz" = (
/obj/structure/rack{
dir = 8;
layer = 2.9;
pixel_y = 2
},
/obj/structure/rack,
/obj/item/storage/toolbox/electrical{
pixel_x = 1;
pixel_y = 6
@@ -75728,9 +75502,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"dav" = (
/obj/structure/rack{
dir = 1
},
/obj/structure/rack,
/obj/item/tank/internals/oxygen/red,
/obj/item/clothing/suit/fire/firefighter,
/obj/item/clothing/mask/gas,
@@ -77567,10 +77339,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{
filter_type = "freon";
name = "gas filter (freon)"
},
/obj/machinery/atmospherics/components/trinary/filter/flipped/critical,
/turf/open/floor/engine,
/area/engine/engineering)
"deK" = (
@@ -78455,14 +78224,9 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/structure/rack{
dir = 8;
layer = 2.9
},
/obj/structure/rack,
/obj/item/stack/sheet/cardboard,
/obj/item/stack/rods{
amount = 50
},
/obj/item/stack/rods/fifty,
/obj/item/paper,
/obj/item/storage/box/lights/mixed,
/obj/structure/sign/poster/official/random{
@@ -80853,9 +80617,7 @@
},
/area/construction/mining/aux_base)
"dDK" = (
/obj/structure/rack{
dir = 4
},
/obj/structure/rack,
/obj/item/electronics/airlock,
/obj/item/electronics/airlock,
/obj/item/electronics/airlock,
@@ -81025,6 +80787,34 @@
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned)
"EDo" = (
/obj/effect/spawner/structure/window/plasma/reinforced,
/turf/open/floor/plating,
/area/engine/atmos)
"EDp" = (
/obj/effect/spawner/structure/window/plasma/reinforced,
/turf/open/floor/plating,
/area/engine/atmos)
"EDq" = (
/obj/effect/spawner/structure/window/plasma/reinforced,
/turf/open/floor/plating,
/area/engine/atmos)
"EDr" = (
/obj/effect/spawner/structure/window/plasma/reinforced,
/turf/open/floor/plating,
/area/engine/atmos)
"EDs" = (
/obj/effect/spawner/structure/window/plasma/reinforced,
/turf/open/floor/plating,
/area/engine/atmos)
"EDt" = (
/obj/effect/spawner/structure/window/plasma/reinforced,
/turf/open/floor/plating,
/area/engine/atmos)
"EDu" = (
/obj/effect/spawner/structure/window/plasma/reinforced,
/turf/open/floor/plating,
/area/engine/atmos)
(1,1,1) = {"
aaa
@@ -122552,7 +122342,7 @@ cbe
ccO
bza
aaf
bza
EDs
chO
cjd
ckG
@@ -123580,7 +123370,7 @@ cbi
ccS
bza
aaf
bza
EDt
chR
cjg
ckH
@@ -124608,7 +124398,7 @@ cVJ
ccQ
bza
aaf
bza
EDu
chU
cjj
ckJ
@@ -126130,19 +125920,19 @@ aaa
aaf
bAR
dBC
bza
EDo
bFZ
bAR
bCA
bza
EDp
bFZ
bAR
bCA
bza
EDq
bFZ
bAR
bCA
bza
EDr
bFZ
bAR
aaf
+2 -6
View File
@@ -107,9 +107,7 @@
/turf/open/floor/plasteel/white,
/area/mine/laborcamp)
"au" = (
/obj/structure/rack{
dir = 1
},
/obj/structure/rack,
/obj/item/storage/bag/ore,
/obj/item/pickaxe,
/obj/item/device/flashlight,
@@ -117,9 +115,7 @@
/turf/open/floor/plasteel,
/area/mine/laborcamp)
"av" = (
/obj/structure/rack{
dir = 1
},
/obj/structure/rack,
/obj/item/storage/bag/ore,
/obj/item/device/flashlight,
/obj/item/pickaxe,
+21 -63
View File
@@ -6702,15 +6702,9 @@
/area/ai_monitored/storage/eva)
"amo" = (
/obj/structure/table/reinforced,
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/glass{
amount = 50
},
/obj/item/stack/rods{
amount = 50
},
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/glass/fifty,
/obj/item/stack/rods/fifty,
/obj/item/stock_parts/cell/high,
/obj/item/stock_parts/cell/high,
/obj/structure/cable/white{
@@ -12772,12 +12766,8 @@
/area/engine/atmos)
"axz" = (
/obj/structure/table/reinforced,
/obj/item/stack/sheet/glass{
amount = 50
},
/obj/item/stack/rods{
amount = 50
},
/obj/item/stack/sheet/glass/fifty,
/obj/item/stack/rods/fifty,
/obj/machinery/airalarm{
pixel_y = 23
},
@@ -12790,12 +12780,8 @@
/area/engine/atmos)
"axA" = (
/obj/structure/table/reinforced,
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/metal/fifty,
/obj/item/grenade/chem_grenade/smart_metal_foam,
/obj/item/grenade/chem_grenade/smart_metal_foam,
/obj/machinery/newscaster{
@@ -18280,9 +18266,7 @@
/area/engine/engineering)
"aIs" = (
/obj/structure/table/reinforced,
/obj/item/stack/rods{
amount = 50
},
/obj/item/stack/rods/fifty,
/obj/item/wrench,
/obj/item/storage/box/lights/mixed,
/obj/machinery/newscaster{
@@ -18900,18 +18884,10 @@
/area/engine/engineering)
"aJB" = (
/obj/structure/table/reinforced,
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/glass{
amount = 50
},
/obj/item/stack/sheet/glass{
amount = 50
},
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/glass/fifty,
/obj/item/stack/sheet/glass/fifty,
/obj/item/crowbar,
/obj/item/grenade/chem_grenade/smart_metal_foam,
/obj/item/grenade/chem_grenade/smart_metal_foam,
@@ -19920,9 +19896,7 @@
/area/engine/gravity_generator)
"aLF" = (
/obj/structure/table/reinforced,
/obj/item/stack/sheet/plasteel{
amount = 20
},
/obj/item/stack/sheet/plasteel/twenty,
/obj/item/wrench,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -20657,9 +20631,7 @@
/area/engine/engineering)
"aNd" = (
/obj/structure/table/reinforced,
/obj/item/stack/sheet/plasteel{
amount = 50
},
/obj/item/stack/sheet/plasteel/fifty,
/obj/item/stack/sheet/rglass{
amount = 50;
pixel_x = 2;
@@ -22096,9 +22068,7 @@
dir = 8
},
/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{
dir = 1;
filter_type = "freon";
name = "gas filter (freon)"
dir = 1
},
/turf/open/floor/plasteel,
/area/engine/engineering)
@@ -25012,12 +24982,8 @@
/area/medical/chemistry)
"aWk" = (
/obj/structure/table,
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/glass{
amount = 50
},
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/glass/fifty,
/obj/item/wrench,
/obj/item/clothing/glasses/welding,
/turf/open/floor/plasteel/whitepurple/corner{
@@ -26948,18 +26914,10 @@
/turf/open/floor/plasteel,
/area/science/robotics/lab)
"baf" = (
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/glass{
amount = 50
},
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/glass/fifty,
/obj/structure/table/reinforced,
/obj/item/stack/cable_coil/white,
/obj/item/stack/cable_coil/white,
+63 -191
View File
@@ -8240,8 +8240,8 @@
/area/security/brig)
"avu" = (
/obj/structure/closet/secure_closet/brig{
id = "Cell 2";
name = "Cell 2 Locker"
id = "Cell 1";
name = "Cell 1 Locker"
},
/turf/open/floor/plasteel/blue/side,
/area/security/brig)
@@ -8259,8 +8259,8 @@
/area/security/brig)
"avx" = (
/obj/structure/closet/secure_closet/brig{
id = "Cell 3";
name = "Cell 3 Locker"
id = "Cell 2";
name = "Cell 2 Locker"
},
/turf/open/floor/plasteel/green/side,
/area/security/brig)
@@ -15724,10 +15724,7 @@
/turf/open/floor/plating,
/area/maintenance/department/crew_quarters/bar)
"aNp" = (
/obj/structure/rack{
dir = 8;
layer = 2.9
},
/obj/structure/rack,
/obj/item/clothing/shoes/magboots{
pixel_x = -4;
pixel_y = 3
@@ -15769,10 +15766,7 @@
/turf/open/floor/plasteel,
/area/storage/eva)
"aNt" = (
/obj/structure/rack{
dir = 8;
layer = 2.9
},
/obj/structure/rack,
/obj/item/tank/jetpack/carbondioxide,
/obj/item/tank/jetpack/carbondioxide{
pixel_x = -4;
@@ -17337,12 +17331,8 @@
/area/storage/eva)
"aQZ" = (
/obj/structure/table,
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/metal/fifty,
/obj/item/crowbar,
/obj/structure/cable{
icon_state = "0-4"
@@ -17369,12 +17359,8 @@
/obj/item/stack/sheet/rglass{
amount = 50
},
/obj/item/stack/rods{
amount = 50
},
/obj/item/stack/rods{
amount = 50
},
/obj/item/stack/rods/fifty,
/obj/item/stack/rods/fifty,
/obj/machinery/airalarm{
dir = 1;
pixel_y = -22
@@ -17383,9 +17369,7 @@
/area/storage/eva)
"aRc" = (
/obj/structure/table,
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/rglass{
amount = 50
},
@@ -18709,12 +18693,8 @@
/area/crew_quarters/bar)
"aUe" = (
/obj/structure/closet/gmcloset,
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/glass{
amount = 50
},
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/glass/fifty,
/obj/item/stack/cable_coil,
/obj/item/storage/box/mousetraps,
/turf/open/floor/wood{
@@ -23478,9 +23458,7 @@
},
/area/quartermaster/qm)
"bfE" = (
/obj/structure/rack{
dir = 1
},
/obj/structure/rack,
/obj/item/storage/toolbox/mechanical{
pixel_x = -2;
pixel_y = -1
@@ -26364,10 +26342,7 @@
/turf/open/floor/plasteel,
/area/science/research/lobby)
"bmL" = (
/obj/structure/rack{
dir = 8;
layer = 2.9
},
/obj/structure/rack,
/obj/item/storage/toolbox/electrical{
pixel_x = 1;
pixel_y = 6
@@ -26422,24 +26397,12 @@
pixel_x = 3;
pixel_y = -4
},
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/metal/fifty,
/obj/structure/extinguisher_cabinet{
pixel_x = 27
},
@@ -27896,23 +27859,17 @@
/area/science/explab)
"bqu" = (
/obj/structure/table,
/obj/item/stack/sheet/glass{
amount = 50;
/obj/item/stack/sheet/glass/fifty{
pixel_x = 3;
pixel_y = 3
},
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal/fifty,
/obj/item/device/assembly/timer,
/obj/item/device/assembly/timer,
/turf/open/floor/plasteel/white,
/area/science/explab)
"bqv" = (
/obj/machinery/processor{
desc = "A machine used to process slimes and retrieve their extract.";
name = "Slime Processor"
},
/obj/machinery/processor/slime,
/obj/machinery/light{
dir = 8
},
@@ -29755,11 +29712,8 @@
/obj/effect/decal/cleanable/oil{
icon_state = "floor6"
},
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/glass{
amount = 50;
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/glass/fifty{
pixel_x = 3;
pixel_y = 3
},
@@ -39022,9 +38976,7 @@
/area/engine/atmos)
"bOW" = (
/obj/structure/table,
/obj/item/stack/sheet/glass{
amount = 50
},
/obj/item/stack/sheet/glass/fifty,
/obj/item/storage/belt/utility,
/obj/item/device/t_scanner,
/obj/item/device/t_scanner,
@@ -39033,21 +38985,13 @@
/area/engine/atmos)
"bOX" = (
/obj/structure/table,
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal{
amount = 50;
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/metal/fifty{
pixel_x = 2;
pixel_y = 2
},
/obj/item/stack/sheet/glass{
layer = 3.1
},
/obj/item/stack/rods{
amount = 50;
layer = 3.2
},
/obj/item/stack/sheet/glass,
/obj/item/stack/rods/fifty,
/turf/open/floor/plasteel/yellow/side,
/area/engine/atmos)
"bOY" = (
@@ -39561,10 +39505,7 @@
/turf/open/floor/plasteel/darkgreen,
/area/storage/tech)
"bQv" = (
/obj/structure/rack{
dir = 8;
layer = 2.9
},
/obj/structure/rack,
/obj/item/circuitboard/computer/pandemic{
pixel_x = -3;
pixel_y = 3
@@ -39587,10 +39528,7 @@
/turf/open/floor/plasteel/darkgreen,
/area/storage/tech)
"bQw" = (
/obj/structure/rack{
dir = 8;
layer = 2.9
},
/obj/structure/rack,
/obj/item/circuitboard/computer/mining,
/obj/item/circuitboard/machine/autolathe{
pixel_x = 3;
@@ -40199,10 +40137,7 @@
/turf/open/floor/plasteel/black,
/area/storage/tech)
"bRO" = (
/obj/structure/rack{
dir = 8;
layer = 2.9
},
/obj/structure/rack,
/obj/item/circuitboard/computer/cloning,
/obj/item/circuitboard/computer/med_data{
pixel_x = 3;
@@ -40214,10 +40149,7 @@
/turf/open/floor/plasteel/darkgreen,
/area/storage/tech)
"bRP" = (
/obj/structure/rack{
dir = 8;
layer = 2.9
},
/obj/structure/rack,
/obj/item/circuitboard/computer/secure_data{
pixel_x = -2;
pixel_y = 2
@@ -40229,10 +40161,7 @@
/turf/open/floor/plasteel/darkgreen,
/area/storage/tech)
"bRQ" = (
/obj/structure/rack{
dir = 8;
layer = 2.9
},
/obj/structure/rack,
/obj/item/circuitboard/computer/powermonitor{
pixel_x = -2;
pixel_y = 2
@@ -40931,10 +40860,7 @@
/turf/open/floor/plasteel/darkgreen,
/area/storage/tech)
"bTz" = (
/obj/structure/rack{
dir = 8;
layer = 2.9
},
/obj/structure/rack,
/obj/item/storage/toolbox/electrical{
pixel_x = 2;
pixel_y = 4
@@ -40944,10 +40870,7 @@
/turf/open/floor/plasteel/darkgreen,
/area/storage/tech)
"bTA" = (
/obj/structure/rack{
dir = 8;
layer = 2.9
},
/obj/structure/rack,
/obj/item/storage/toolbox/electrical{
pixel_x = 2;
pixel_y = 4
@@ -41795,9 +41718,7 @@
/turf/open/floor/plating,
/area/maintenance/department/engine)
"bVu" = (
/obj/structure/rack{
dir = 4
},
/obj/structure/rack,
/obj/item/wrench,
/obj/item/clothing/head/welding,
/obj/machinery/light/small{
@@ -41807,9 +41728,7 @@
/turf/open/floor/plating,
/area/maintenance/department/engine)
"bVv" = (
/obj/structure/rack{
dir = 4
},
/obj/structure/rack,
/obj/item/electronics/airlock,
/obj/item/electronics/airlock,
/obj/item/electronics/airlock,
@@ -41827,27 +41746,17 @@
/area/maintenance/department/engine)
"bVw" = (
/obj/structure/table,
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/rods{
amount = 50
},
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/rods/fifty,
/turf/open/floor/plating{
icon_state = "panelscorched"
},
/area/maintenance/department/engine)
"bVx" = (
/obj/structure/table,
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/glass{
amount = 50
},
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/glass/fifty,
/turf/open/floor/plating,
/area/maintenance/department/engine)
"bVy" = (
@@ -42250,10 +42159,7 @@
},
/area/crew_quarters/heads/chief)
"bWs" = (
/obj/structure/rack{
dir = 8;
layer = 2.9
},
/obj/structure/rack,
/obj/item/circuitboard/computer/robotics{
pixel_x = -2;
pixel_y = 2
@@ -42265,10 +42171,7 @@
/turf/open/floor/plasteel/darkred,
/area/storage/tech)
"bWt" = (
/obj/structure/rack{
dir = 8;
layer = 2.9
},
/obj/structure/rack,
/obj/item/circuitboard/computer/crew{
pixel_x = -1;
pixel_y = 1
@@ -42288,10 +42191,7 @@
/turf/open/floor/plasteel/darkred,
/area/storage/tech)
"bWu" = (
/obj/structure/rack{
dir = 8;
layer = 2.9
},
/obj/structure/rack,
/obj/item/circuitboard/computer/borgupload{
pixel_x = -1;
pixel_y = 1
@@ -42304,21 +42204,17 @@
/area/storage/tech)
"bWv" = (
/obj/structure/table,
/obj/item/stack/sheet/plasteel{
amount = 20;
/obj/item/stack/sheet/plasteel/twenty{
pixel_x = -3;
pixel_y = 3
},
/obj/item/stack/sheet/glass{
amount = 50;
/obj/item/stack/sheet/glass/fifty{
layer = 4
},
/obj/item/stack/sheet/glass{
amount = 50;
/obj/item/stack/sheet/glass/fifty{
layer = 4
},
/obj/item/stack/sheet/glass{
amount = 50;
/obj/item/stack/sheet/glass/fifty{
layer = 4
},
/obj/structure/cable{
@@ -42635,15 +42531,9 @@
/area/engine/engineering)
"bXl" = (
/obj/structure/table,
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/rods{
amount = 50
},
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/rods/fifty,
/obj/item/stack/cable_coil,
/obj/machinery/power/apc/highcap/ten_k{
dir = 8;
@@ -42652,10 +42542,7 @@
pixel_x = -26
},
/obj/structure/cable,
/obj/item/stack/sheet/metal{
amount = 50;
layer = 2.9
},
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/cable_coil,
/turf/open/floor/plasteel/darkyellow/side{
tag = "icon-darkyellow (WEST)";
@@ -43882,10 +43769,7 @@
/turf/open/floor/plasteel,
/area/engine/engineering)
"cao" = (
/obj/structure/rack{
dir = 8;
layer = 2.9
},
/obj/structure/rack,
/obj/item/storage/belt/utility,
/obj/item/clothing/head/welding{
pixel_x = -3;
@@ -43941,10 +43825,7 @@
/turf/open/floor/plasteel,
/area/engine/engineering)
"cau" = (
/obj/structure/rack{
dir = 8;
layer = 2.9
},
/obj/structure/rack,
/obj/item/clothing/mask/gas{
pixel_x = 3;
pixel_y = 3
@@ -44795,15 +44676,9 @@
/area/engine/engineering)
"ccR" = (
/obj/structure/closet/crate,
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/rods{
amount = 50
},
/obj/item/stack/sheet/glass{
amount = 50
},
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/rods/fifty,
/obj/item/stack/sheet/glass/fifty,
/obj/item/electronics/airlock,
/obj/item/electronics/airlock,
/obj/item/stock_parts/cell/high/plus,
@@ -46975,8 +46850,7 @@
/obj/effect/decal/cleanable/cobweb{
icon_state = "cobweb2"
},
/obj/item/stack/sheet/glass{
amount = 50;
/obj/item/stack/sheet/glass/fifty{
layer = 4
},
/obj/item/stack/sheet/metal{
@@ -47142,9 +47016,7 @@
/obj/structure/extinguisher_cabinet{
pixel_x = 24
},
/obj/item/stack/rods{
amount = 50
},
/obj/item/stack/rods/fifty,
/turf/open/floor/plating,
/area/maintenance/department/chapel/monastery)
"ckl" = (
+2 -6
View File
@@ -926,12 +926,8 @@
/area/hallway/secondary/entry)
"cK" = (
/obj/structure/table,
/obj/item/stack/sheet/glass{
amount = 50
},
/obj/item/stack/rods{
amount = 50
},
/obj/item/stack/sheet/glass/fifty,
/obj/item/stack/rods/fifty,
/obj/machinery/light,
/turf/open/floor/plasteel/arrival,
/area/hallway/secondary/entry)
+6 -18
View File
@@ -6351,12 +6351,8 @@
/area/centcom/ferry)
"rs" = (
/obj/structure/table/reinforced,
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/plasteel{
amount = 15
},
@@ -6365,9 +6361,7 @@
pixel_x = 2;
pixel_y = -2
},
/obj/item/stack/rods{
amount = 50
},
/obj/item/stack/rods/fifty,
/obj/item/stack/cable_coil/white,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line,
@@ -6442,12 +6436,8 @@
pixel_x = 26
},
/obj/structure/table/reinforced,
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/plasteel{
amount = 15
},
@@ -6456,9 +6446,7 @@
pixel_x = 2;
pixel_y = -2
},
/obj/item/stack/rods{
amount = 50
},
/obj/item/stack/rods/fifty,
/obj/item/stack/cable_coil/white,
/obj/item/screwdriver/power,
/obj/effect/decal/cleanable/dirt,
+1 -4
View File
@@ -1,8 +1,5 @@
{
"map_name": "MetaStation",
"map_path": "map_files/MetaStation",
"map_file": "MetaStation.dmm",
"minetype": "lavaland",
"transition_config": "default",
"allow_custom_shuttles": "yes"
"map_file": "MetaStation.dmm"
}
+1 -4
View File
@@ -1,8 +1,5 @@
{
"map_name": "OmegaStation",
"map_path": "map_files/OmegaStation",
"map_file": "OmegaStation.dmm",
"minetype": "lavaland",
"transition_config": "default",
"allow_custom_shuttles": "yes"
"map_file": "OmegaStation.dmm"
}
+1 -4
View File
@@ -1,8 +1,5 @@
{
"map_name": "PubbyStation",
"map_path": "map_files/PubbyStation",
"map_file": "PubbyStation.dmm",
"minetype": "lavaland",
"transition_config": "default",
"allow_custom_shuttles": "yes"
"map_file": "PubbyStation.dmm"
}
+1 -4
View File
@@ -1,8 +1,5 @@
{
"map_name": "Runtime Station",
"map_path": "map_files/debug",
"map_file": "runtimestation.dmm",
"minetype": "lavaland",
"transition_config": "default",
"allow_custom_shuttles": "no"
"map_file": "runtimestation.dmm"
}
+1 -3
View File
@@ -669,9 +669,7 @@
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/escape)
"bM" = (
/obj/structure/rack{
dir = 1
},
/obj/structure/rack,
/obj/item/tank/internals/oxygen/red,
/obj/item/clothing/suit/fire/firefighter,
/obj/item/clothing/mask/gas,
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+10 -19
View File
@@ -117,9 +117,7 @@
/area/shuttle/abandoned)
"al" = (
/obj/structure/table,
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal/fifty,
/obj/item/stock_parts/cell/high{
charge = 100;
maxcharge = 15000;
@@ -299,7 +297,7 @@
name = "dust"
},
/obj/effect/decal/remains/human{
desc = "They look like human remains, and have clearly been gnawed at.";
desc = "They look like human remains, and have clearly been gnawed at."
},
/obj/item/gun/energy/laser/retro,
/turf/open/floor/mineral/titanium/blue,
@@ -368,7 +366,7 @@
name = "dust"
},
/obj/effect/decal/remains/human{
desc = "They look like human remains, and have clearly been gnawed at.";
desc = "They look like human remains, and have clearly been gnawed at."
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/abandoned)
@@ -435,7 +433,7 @@
},
/obj/item/soap/nanotrasen,
/obj/effect/decal/remains/human{
desc = "They look like human remains, and have clearly been gnawed at.";
desc = "They look like human remains, and have clearly been gnawed at."
},
/obj/effect/decal/cleanable/blood/gibs/old,
/turf/open/floor/mineral/titanium,
@@ -478,14 +476,11 @@
/area/shuttle/abandoned)
"aM" = (
/obj/structure/table,
/obj/item/stack/sheet/glass{
amount = 50;
/obj/item/stack/sheet/glass/fifty{
pixel_x = -2;
pixel_y = 2
},
/obj/item/stack/rods{
amount = 50
},
/obj/item/stack/rods/fifty,
/obj/effect/decal/cleanable/dirt{
desc = "A thin layer of dust coating the floor.";
name = "dust"
@@ -494,11 +489,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
"aN" = (
/obj/structure/rack{
dir = 8;
layer = 2.9;
pixel_y = 2
},
/obj/structure/rack,
/obj/item/storage/toolbox/electrical{
pixel_x = 1;
pixel_y = 6
@@ -938,7 +929,7 @@
name = "dust"
},
/obj/effect/decal/remains/human{
desc = "They look like human remains, and have clearly been gnawed at.";
desc = "They look like human remains, and have clearly been gnawed at."
},
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
@@ -1057,7 +1048,7 @@
name = "\improper damaged CentCom hat"
},
/obj/effect/decal/remains/human{
desc = "They look like human remains, and have clearly been gnawed at.";
desc = "They look like human remains, and have clearly been gnawed at."
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/abandoned)
@@ -1460,7 +1451,7 @@
name = "dust"
},
/obj/effect/decal/remains/xeno{
desc = "A pile of remains that look vaguely humanoid. The skull is abnormally elongated, and there are burns through some of the other bones.";
desc = "A pile of remains that look vaguely humanoid. The skull is abnormally elongated, and there are burns through some of the other bones."
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/abandoned)
+8 -8
View File
@@ -214,9 +214,9 @@
(1,1,1) = {"
a
d
c
a
d
c
a
d
a
"}
@@ -230,13 +230,13 @@ y
C
"}
(3,1,1) = {"
c
a
f
l
l
u
z
c
a
"}
(4,1,1) = {"
b
@@ -248,13 +248,13 @@ A
D
"}
(5,1,1) = {"
c
a
h
n
r
w
A
c
a
"}
(6,1,1) = {"
b
@@ -268,9 +268,9 @@ E
(7,1,1) = {"
a
j
c
a
j
c
a
j
a
"}
+1 -1
View File
@@ -10,7 +10,7 @@
#define GLOBAL_PROTECT(X)\
/datum/controller/global_vars/InitGlobal##X(){\
..();\
gvars_datum_protected_varlist += #X;\
gvars_datum_protected_varlist[#X] = TRUE;\
}
#else
#define GLOBAL_PROTECT(X)
+6 -3
View File
@@ -66,13 +66,10 @@ GLOBAL_LIST_EMPTY(all_scripture) //a list containing scripture instances; not us
#define ARK_SUMMON_COST 5 //how many of each component an Ark costs to summon
#define ARK_CONSUME_COST 15 //how many of each component an Ark needs to consume to activate
//Objective text define
#define CLOCKCULT_OBJECTIVE "Construct the Ark of the Clockwork Justicar and free Ratvar."
//misc clockcult stuff
#define MARAUDER_EMERGE_THRESHOLD 65 //marauders cannot emerge unless host is at this% or less health
#define SIGIL_ACCESS_RANGE 2 //range at which transmission sigils can access power
@@ -83,3 +80,9 @@ GLOBAL_LIST_EMPTY(all_scripture) //a list containing scripture instances; not us
#define CLOCKWORK_ARMOR_COOLDOWN 1800 //The cooldown period between summoning suits of clockwork armor
#define RATVARIAN_SPEAR_COOLDOWN 300 //The cooldown period between summoning another Ratvarian spear
#define MARAUDER_SCRIPTURE_SCALING_THRESHOLD 200 //The amount of deciseconds that must pass before marauder scripture will not gain a recital penalty
#define MARAUDER_SCRIPTURE_SCALING_TIME 50 //The amount of extra deciseconds tacked on to the marauder scripture recital time per recent marauder
#define MARAUDER_SCRIPTURE_SCALING_MAX 300 //The maximum extra time applied to the marauder scripture
+1
View File
@@ -38,6 +38,7 @@
#define COMSIG_ATOM_RCD_ACT "atom_rcd_act" //from base of atom/rcd_act(): (/mob, /obj/item/construction/rcd, passed_mode)
#define COMSIG_ATOM_SING_PULL "atom_sing_pull" //from base of atom/singularity_pull(): (S, current_size)
#define COMSIG_ATOM_SET_LIGHT "atom_set_light" //from base of atom/set_light(): (l_range, l_power, l_color)
#define COMSIG_ATOM_ROTATE "atom_rotate" //from base of atom/shuttleRotate(): (rotation, params)
#define COMSIG_CLICK "atom_click" //from base of atom/Click(): (location, control, params)
#define COMSIG_CLICK_SHIFT "shift_click" //from base of atom/ShiftClick(): (/mob)
+1 -1
View File
@@ -28,7 +28,7 @@
#define BAN_CHAPEL "chapel"
#define BAN_HURTPRIEST "hurtpriest"
#define BAN_AVOIDWATER "avoidwater"
#define BAN_STRIKEUNCONCIOUS "strikeunconcious"
#define BAN_STRIKEUNCONSCIOUS "strikeunconscious"
#define BAN_HURTLIZARD "hurtlizard"
#define BAN_HURTANIMAL "hurtanimal"
+67
View File
@@ -161,3 +161,70 @@
#define TINT_DARKENED 2 //Threshold of tint level to apply weld mask overlay
#define TINT_BLIND 3 //Threshold of tint level to obscure vision fully
//Allowed equipment lists for security vests and hardsuits.
GLOBAL_LIST_INIT(advanced_hardsuit_allowed, typecacheof(list(
/obj/item/ammo_box,
/obj/item/ammo_casing,
/obj/item/device/flashlight,
/obj/item/gun,
/obj/item/melee/baton,
/obj/item/reagent_containers/spray/pepper,
/obj/item/restraints/handcuffs,
/obj/item/tank/internals)))
GLOBAL_LIST_INIT(security_hardsuit_allowed, typecacheof(list(
/obj/item/ammo_box,
/obj/item/ammo_casing,
/obj/item/device/flashlight,
/obj/item/gun/ballistic,
/obj/item/gun/energy,
/obj/item/melee/baton,
/obj/item/reagent_containers/spray/pepper,
/obj/item/restraints/handcuffs,
/obj/item/tank/internals)))
GLOBAL_LIST_INIT(detective_vest_allowed, typecacheof(list(
/obj/item/ammo_box,
/obj/item/ammo_casing,
/obj/item/device/detective_scanner,
/obj/item/device/flashlight,
/obj/item/device/taperecorder,
/obj/item/gun/ballistic,
/obj/item/gun/energy,
/obj/item/lighter,
/obj/item/melee/baton,
/obj/item/melee/classic_baton,
/obj/item/reagent_containers/spray/pepper,
/obj/item/restraints/handcuffs,
/obj/item/storage/fancy/cigarettes,
/obj/item/tank/internals/emergency_oxygen)))
GLOBAL_LIST_INIT(security_vest_allowed, typecacheof(list(
/obj/item/ammo_box,
/obj/item/ammo_casing,
/obj/item/device/flashlight,
/obj/item/gun/ballistic,
/obj/item/gun/energy,
/obj/item/kitchen/knife/combat,
/obj/item/melee/baton,
/obj/item/melee/classic_baton/telescopic,
/obj/item/reagent_containers/spray/pepper,
/obj/item/restraints/handcuffs,
/obj/item/tank/internals/emergency_oxygen)))
GLOBAL_LIST_INIT(security_wintercoat_allowed, typecacheof(list(
/obj/item/ammo_box,
/obj/item/ammo_casing,
/obj/item/device/flashlight,
/obj/item/storage/fancy/cigarettes,
/obj/item/gun/ballistic,
/obj/item/gun/energy,
/obj/item/lighter,
/obj/item/melee/baton,
/obj/item/melee/classic_baton/telescopic,
/obj/item/reagent_containers/spray/pepper,
/obj/item/restraints/handcuffs,
/obj/item/tank/internals/emergency_oxygen,
/obj/item/toy)))
+2 -2
View File
@@ -8,7 +8,7 @@
#define ismovableatom(A) (istype(A, /atom/movable))
#define isatom(A) (istype(A, /atom))
#define isatom(A) (isloc(A))
//Turfs
//#define isturf(A) (istype(A, /turf)) This is actually a byond built-in. Added here for completeness sake.
@@ -183,4 +183,4 @@ GLOBAL_LIST_INIT(glass_sheet_types, typecacheof(list(
/obj/item/stack/sheet/plasmaglass,
/obj/item/stack/sheet/plasmarglass)))
#define is_glass_sheet(O) (is_type_in_typecache(O, GLOB.glass_sheet_types))
#define is_glass_sheet(O) (is_type_in_typecache(O, GLOB.glass_sheet_types))
+1 -1
View File
@@ -13,6 +13,7 @@
//#define TURF_LAYER 2 //For easy recordkeeping; this is a byond define
#define MID_TURF_LAYER 2.02
#define HIGH_TURF_LAYER 2.03
#define TURF_DECAL_LAYER 2.039 //Makes turf decals appear in DM how they will look inworld.
#define ABOVE_OPEN_TURF_LAYER 2.04
#define CLOSED_TURF_LAYER 2.05
#define BULLET_HOLE_LAYER 2.06
@@ -20,7 +21,6 @@
#define LATTICE_LAYER 2.2
#define DISPOSAL_PIPE_LAYER 2.3
#define GAS_PIPE_HIDDEN_LAYER 2.35
#define TURF_DECAL_LAYER 2.39
#define WIRE_LAYER 2.4
#define WIRE_TERMINAL_LAYER 2.45
#define GAS_SCRUBBER_LAYER 2.46
+2
View File
@@ -10,6 +10,8 @@
#define T20C 293.15 // 20degC
#define TCMB 2.7 // -270.3degC
#define SHORT_REAL_LIMIT 16777216
//"fancy" math for calculating time in ms from tick_usage percentage and the length of ticks
//percent_of_tick_used * (ticklag * 100(to convert to ms)) / 100(percent ratio)
//collapsed to percent_of_tick_used * tick_lag
+29
View File
@@ -0,0 +1,29 @@
#define PROFILE_START ;PROFILE_STORE = list();PROFILE_SET;
#define PROFILE_STOP ;PROFILE_STORE = null;
#define PROFILE_SET ;PROFILE_TIME = TICK_USAGE_REAL; PROFILE_LINE = __LINE__; PROFILE_FILE = __FILE__; PROFILE_SLEEPCHECK = world.time;
#define PROFILE_TICK ;\
if (PROFILE_STORE) {\
var/PROFILE_TICK_USAGE_REAL = TICK_USAGE_REAL;\
if (PROFILE_SLEEPCHECK == world.time) {\
var/PROFILE_STRING = "[PROFILE_FILE]:[PROFILE_LINE] - [__FILE__]:[__LINE__]";\
var/list/PROFILE_ITEM = PROFILE_STORE[PROFILE_STRING];\
if (!PROFILE_ITEM) {\
PROFILE_ITEM = new(PROFILE_ITEM_LEN);\
PROFILE_STORE[PROFILE_STRING] = PROFILE_ITEM;\
PROFILE_ITEM[PROFILE_ITEM_TIME] = 0;\
PROFILE_ITEM[PROFILE_ITEM_COUNT] = 0;\
};\
PROFILE_ITEM[PROFILE_ITEM_TIME] += TICK_DELTA_TO_MS(PROFILE_TICK_USAGE_REAL-PROFILE_TIME);\
var/PROFILE_INCR_AMOUNT = min(1, 2**round(PROFILE_ITEM[PROFILE_ITEM_COUNT]/SHORT_REAL_LIMIT));\
if (prob(100/PROFILE_INCR_AMOUNT)) {\
PROFILE_ITEM[PROFILE_ITEM_COUNT] += PROFILE_INCR_AMOUNT;\
};\
};\
PROFILE_SET;\
};
#define PROFILE_ITEM_LEN 2
#define PROFILE_ITEM_TIME 1
#define PROFILE_ITEM_COUNT 2
+6 -1
View File
@@ -65,4 +65,9 @@
//Docking turf movements
#define MOVE_TURF 1
#define MOVE_AREA 2
#define MOVE_CONTENTS 4
#define MOVE_CONTENTS 4
//Rotation params
#define ROTATE_DIR 1
#define ROTATE_SMOOTH 2
#define ROTATE_OFFSET 4
+69 -23
View File
@@ -1,23 +1,69 @@
//max channel is 1024. Only go lower from here, because byond tends to pick the first availiable channel to play sounds on
#define CHANNEL_LOBBYMUSIC 1024
#define CHANNEL_ADMIN 1023
#define CHANNEL_VOX 1022
#define CHANNEL_JUKEBOX 1021
#define CHANNEL_JUSTICAR_ARK 1020
#define CHANNEL_HEARTBEAT 1019 //sound channel for heartbeats
#define CHANNEL_AMBIENCE 1018
#define CHANNEL_BUZZ 1017
#define CHANNEL_BICYCLE 1016
//Citadel code
#define CHANNEL_PRED 1015
#define CHANNEL_PREYLOOP 1014
//THIS SHOULD ALWAYS BE THE LOWEST ONE!
//KEEP IT UPDATED
#define CHANNEL_HIGHEST_AVAILABLE 1013
#define CHANNEL_HIGHEST_AVAILABLE 1017
#define SOUND_MINIMUM_PRESSURE 10
#define FALLOFF_SOUNDS 0.5
//max channel is 1024. Only go lower from here, because byond tends to pick the first availiable channel to play sounds on
#define CHANNEL_LOBBYMUSIC 1024
#define CHANNEL_ADMIN 1023
#define CHANNEL_VOX 1022
#define CHANNEL_JUKEBOX 1021
#define CHANNEL_JUSTICAR_ARK 1020
#define CHANNEL_HEARTBEAT 1019 //sound channel for heartbeats
#define CHANNEL_AMBIENCE 1018
#define CHANNEL_BUZZ 1017
#define CHANNEL_BICYCLE 1016
//Citadel code
#define CHANNEL_PRED 1015
#define CHANNEL_PREYLOOP 1014
//THIS SHOULD ALWAYS BE THE LOWEST ONE!
//KEEP IT UPDATED
#define CHANNEL_HIGHEST_AVAILABLE 1013
#define SOUND_MINIMUM_PRESSURE 10
#define FALLOFF_SOUNDS 0.5
//Ambience types
#define GENERIC list('sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg',\
'sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg',\
'sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg',\
'sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg',\
'sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg',\
'sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg')
#define HOLY list('sound/ambience/ambicha1.ogg','sound/ambience/ambicha2.ogg','sound/ambience/ambicha3.ogg',\
'sound/ambience/ambicha4.ogg', 'sound/ambience/ambiholy.ogg', 'sound/ambience/ambiholy2.ogg',\
'sound/ambience/ambiholy3.ogg')
#define HIGHSEC list('sound/ambience/ambidanger.ogg', 'sound/ambience/ambidanger2.ogg')
#define RUINS list('sound/ambience/ambimine.ogg', 'sound/ambience/ambicave.ogg', 'sound/ambience/ambiruin.ogg',\
'sound/ambience/ambiruin2.ogg', 'sound/ambience/ambiruin3.ogg', 'sound/ambience/ambiruin4.ogg',\
'sound/ambience/ambiruin5.ogg', 'sound/ambience/ambiruin6.ogg', 'sound/ambience/ambiruin7.ogg',\
'sound/ambience/ambidanger.ogg', 'sound/ambience/ambidanger2.ogg', 'sound/ambience/ambitech3.ogg',\
'sound/ambience/ambimystery.ogg', 'sound/ambience/ambimaint1.ogg')
#define ENGINEERING list('sound/ambience/ambisin1.ogg','sound/ambience/ambisin2.ogg','sound/ambience/ambisin3.ogg','sound/ambience/ambisin4.ogg', 'sound/ambience/ambieng1.ogg',\
'sound/ambience/ambiatmos.ogg', 'sound/ambience/ambiatmos2.ogg', 'sound/ambience/ambitech.ogg', 'sound/ambience/ambitech2.ogg', 'sound/ambience/ambitech3.ogg')
#define MINING list('sound/ambience/ambimine.ogg', 'sound/ambience/ambicave.ogg', 'sound/ambience/ambiruin.ogg',\
'sound/ambience/ambiruin2.ogg', 'sound/ambience/ambiruin3.ogg', 'sound/ambience/ambiruin4.ogg',\
'sound/ambience/ambiruin5.ogg', 'sound/ambience/ambiruin6.ogg', 'sound/ambience/ambiruin7.ogg',\
'sound/ambience/ambidanger.ogg', 'sound/ambience/ambidanger2.ogg', 'sound/ambience/ambimaint1.ogg', 'sound/ambience/ambilava.ogg')
#define MEDICAL list('sound/ambience/ambinice.ogg')
#define SPOOKY list('sound/ambience/ambimo1.ogg','sound/ambience/ambimo2.ogg','sound/ambience/ambiruin7.ogg','sound/ambience/ambiruin6.ogg',\
'sound/ambience/ambiodd.ogg', 'sound/ambience/ambimystery.ogg')
#define SPACE list('sound/ambience/ambispace.ogg', 'sound/ambience/ambispace2.ogg', 'sound/ambience/title2.ogg', 'sound/ambience/ambiatmos.ogg')
#define MAINTENANCE list('sound/ambience/ambimaint1.ogg', 'sound/ambience/ambimaint2.ogg', 'sound/ambience/ambimaint3.ogg', 'sound/ambience/ambimaint4.ogg',\
'sound/ambience/ambimaint5.ogg', 'sound/voice/lowHiss2.ogg', 'sound/voice/lowHiss3.ogg', 'sound/voice/lowHiss4.ogg', 'sound/ambience/ambitech2.ogg' )
#define AWAY_MISSION list('sound/ambience/ambitech.ogg', 'sound/ambience/ambitech2.ogg', 'sound/ambience/ambiruin.ogg',\
'sound/ambience/ambiruin2.ogg', 'sound/ambience/ambiruin3.ogg', 'sound/ambience/ambiruin4.ogg',\
'sound/ambience/ambiruin5.ogg', 'sound/ambience/ambiruin6.ogg', 'sound/ambience/ambiruin7.ogg',\
'sound/ambience/ambidanger.ogg', 'sound/ambience/ambidanger2.ogg', 'sound/ambience/ambimaint.ogg',\
'sound/ambience/ambiatmos.ogg', 'sound/ambience/ambiatmos2.ogg', 'sound/ambience/ambiodd.ogg')
+2
View File
@@ -0,0 +1,2 @@
#define WALL_DENT_HIT 1
#define WALL_DENT_SHOT 2
+9
View File
@@ -58,4 +58,13 @@ GLOBAL_VAR_INIT(cmp_field, "name")
. = B.failures - A.failures
if (!.)
. = B.qdels - A.qdels
/proc/cmp_profile_avg_time_dsc(list/A, list/B)
return (B[PROFILE_ITEM_TIME]/(B[PROFILE_ITEM_COUNT] || 1)) - (A[PROFILE_ITEM_TIME]/(A[PROFILE_ITEM_COUNT] || 1))
/proc/cmp_profile_time_dsc(list/A, list/B)
return B[PROFILE_ITEM_TIME] - A[PROFILE_ITEM_TIME]
/proc/cmp_profile_count_dsc(list/A, list/B)
return B[PROFILE_ITEM_COUNT] - A[PROFILE_ITEM_COUNT]
+1 -1
View File
@@ -849,7 +849,7 @@ The _flatIcons list is a cache for generated icon files.
if(A.alpha < 255)
flat.Blend(rgb(255, 255, 255, A.alpha), ICON_MULTIPLY)
return icon(flat, "", SOUTH)
return icon(flat, "", curdir)
/proc/getIconMask(atom/A)//By yours truly. Creates a dynamic mask for a mob/whatever. /N
var/icon/alpha_mask = new(A.icon,A.icon_state)//So we want the default icon and icon state of A.
+1 -1
View File
@@ -138,7 +138,7 @@ GLOBAL_LIST_INIT(sqrtTable, list(1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 4,
var/t = round((val - min) / d)
return val - (t * d)
#define NORM_ROT(rot) ((((rot % 360) + (rot - round(rot, 1))) > 0) ? ((rot % 360) + (rot - round(rot, 1))) : (((rot % 360) + (rot - round(rot, 1))) + 360))
#define NORM_ROT(rot) ((((rot % 360) + (rot - round(rot, 1))) >= 0) ? ((rot % 360) + (rot - round(rot, 1))) : (((rot % 360) + (rot - round(rot, 1))) + 360))
/proc/get_angle_of_incidence(face_angle, angle_in, auto_normalize = TRUE)
+4 -2
View File
@@ -43,8 +43,10 @@
var/obj/item/paper/P = new /obj/item/paper(C.loc)
P.name = "paper - '[title]'"
P.info = text
C.messagetitle.Add("[title]")
C.messagetext.Add(text)
var/datum/comm_message/message = new
message.title = title
message.content = text
C.add_message(message)
P.update_icon()
/proc/minor_announce(message, title = "Attention:", alert)
+1 -1
View File
@@ -654,7 +654,7 @@ GLOBAL_LIST_INIT(binary, list("0","1"))
buffer = copytext(buffer, 1, cutoff) + punctbuffer
if(!findtext(buffer,alphanumeric))
continue
if(!buffer || lentext(buffer) > 140 || lentext(buffer) <= cullshort || buffer in accepted)
if(!buffer || lentext(buffer) > 280 || lentext(buffer) <= cullshort || buffer in accepted)
continue
accepted += buffer
+13
View File
@@ -518,6 +518,19 @@ Turf and target are separate in case you want to teleport some distance from a t
assembled += A
return assembled
/atom/proc/GetAllContentsIgnoring(list/ignore_typecache)
if(!ignore_typecache)
return GetAllContents()
var/list/processing = list(src)
var/list/assembled = list()
while(processing.len)
var/atom/A = processing[1]
processing.Cut(1,2)
if(!ignore_typecache[A.type])
processing += A.contents
assembled += A
return assembled
//Step-towards method of determining whether one atom can see another. Similar to viewers()
/proc/can_see(atom/source, atom/target, length=5) // I couldnt be arsed to do actual raycasting :I This is horribly inaccurate.
var/turf/current = get_turf(source)
+2 -1
View File
@@ -15,7 +15,7 @@
Override makes it so the alert is not replaced until cleared by a clear_alert with clear_override, and it's used for hallucinations.
*/
if(!category)
if(!category || QDELETED(src))
return
var/obj/screen/alert/thealert
@@ -629,4 +629,5 @@ so as to remain in compliance with the most up-to-date laws."
. = ..()
severity = 0
master = null
mob_viewer = null
screen_loc = ""
+177 -175
View File
@@ -1,175 +1,177 @@
/mob
var/list/screens = list()
/mob/proc/overlay_fullscreen(category, type, severity)
var/obj/screen/fullscreen/screen
if(screens[category])
screen = screens[category]
if(screen.type != type)
clear_fullscreen(category, FALSE)
return .()
else if(!severity || severity == screen.severity)
return null
else
screen = new type()
screen.icon_state = "[initial(screen.icon_state)][severity]"
screen.severity = severity
screens[category] = screen
if(client && screen.should_show_to(src))
client.screen += screen
return screen
/mob/proc/clear_fullscreen(category, animated = 10)
var/obj/screen/fullscreen/screen = screens[category]
if(!screen)
return
screens -= category
if(animated)
animate(screen, alpha = 0, time = animated)
addtimer(CALLBACK(src, .proc/clear_fullscreen_after_animate, screen), animated, TIMER_CLIENT_TIME)
else
if(client)
client.screen -= screen
qdel(screen)
/mob/proc/clear_fullscreen_after_animate(obj/screen/fullscreen/screen)
if(client)
client.screen -= screen
qdel(screen)
/mob/proc/clear_fullscreens()
for(var/category in screens)
clear_fullscreen(category)
/mob/proc/hide_fullscreens()
if(client)
for(var/category in screens)
client.screen -= screens[category]
/mob/proc/reload_fullscreen()
if(client)
var/obj/screen/fullscreen/screen
for(var/category in screens)
screen = screens[category]
if(screen.should_show_to(src))
client.screen |= screen
else
client.screen -= screen
/obj/screen/fullscreen
icon = 'icons/mob/screen_full.dmi'
icon_state = "default"
screen_loc = "CENTER-7,CENTER-7"
layer = FULLSCREEN_LAYER
plane = FULLSCREEN_PLANE
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
var/severity = 0
var/show_when_dead = FALSE
/obj/screen/fullscreen/proc/should_show_to(mob/mymob)
if(!show_when_dead && mymob.stat == DEAD)
return FALSE
return TRUE
/obj/screen/fullscreen/Destroy()
severity = 0
. = ..()
/obj/screen/fullscreen/brute
icon_state = "brutedamageoverlay"
layer = UI_DAMAGE_LAYER
plane = FULLSCREEN_PLANE
/obj/screen/fullscreen/oxy
icon_state = "oxydamageoverlay"
layer = UI_DAMAGE_LAYER
plane = FULLSCREEN_PLANE
/obj/screen/fullscreen/crit
icon_state = "passage"
layer = CRIT_LAYER
plane = FULLSCREEN_PLANE
/obj/screen/fullscreen/crit/vision
icon_state = "oxydamageoverlay"
layer = BLIND_LAYER
/obj/screen/fullscreen/blind
icon_state = "blackimageoverlay"
layer = BLIND_LAYER
plane = FULLSCREEN_PLANE
/obj/screen/fullscreen/curse
icon_state = "curse"
layer = CURSE_LAYER
plane = FULLSCREEN_PLANE
/obj/screen/fullscreen/impaired
icon_state = "impairedoverlay"
/obj/screen/fullscreen/blurry
icon = 'icons/mob/screen_gen.dmi'
screen_loc = "WEST,SOUTH to EAST,NORTH"
icon_state = "blurry"
/obj/screen/fullscreen/flash
icon = 'icons/mob/screen_gen.dmi'
screen_loc = "WEST,SOUTH to EAST,NORTH"
icon_state = "flash"
/obj/screen/fullscreen/flash/static
icon = 'icons/mob/screen_gen.dmi'
screen_loc = "WEST,SOUTH to EAST,NORTH"
icon_state = "noise"
/obj/screen/fullscreen/high
icon = 'icons/mob/screen_gen.dmi'
screen_loc = "WEST,SOUTH to EAST,NORTH"
icon_state = "druggy"
/obj/screen/fullscreen/color_vision
icon = 'icons/mob/screen_gen.dmi'
screen_loc = "WEST,SOUTH to EAST,NORTH"
icon_state = "flash"
alpha = 80
/obj/screen/fullscreen/color_vision/green
color = "#00ff00"
/obj/screen/fullscreen/color_vision/red
color = "#ff0000"
/obj/screen/fullscreen/color_vision/blue
color = "#0000ff"
/obj/screen/fullscreen/lighting_backdrop
icon = 'icons/mob/screen_gen.dmi'
icon_state = "flash"
transform = matrix(200, 0, 0, 0, 200, 0)
plane = LIGHTING_PLANE
blend_mode = BLEND_OVERLAY
show_when_dead = TRUE
//Provides darkness to the back of the lighting plane
/obj/screen/fullscreen/lighting_backdrop/lit
invisibility = INVISIBILITY_LIGHTING
layer = BACKGROUND_LAYER+21
color = "#000"
show_when_dead = TRUE
//Provides whiteness in case you don't see lights so everything is still visible
/obj/screen/fullscreen/lighting_backdrop/unlit
layer = BACKGROUND_LAYER+20
show_when_dead = TRUE
/obj/screen/fullscreen/see_through_darkness
icon_state = "nightvision"
plane = LIGHTING_PLANE
layer = LIGHTING_LAYER
blend_mode = BLEND_ADD
show_when_dead = TRUE
/mob
var/list/screens = list()
/mob/proc/overlay_fullscreen(category, type, severity)
var/obj/screen/fullscreen/screen = screens[category]
if (!screen || screen.type != type)
// needs to be recreated
clear_fullscreen(category, FALSE)
screens[category] = screen = new type()
else if ((!severity || severity == screen.severity) && (!client || screen.screen_loc != "CENTER-7,CENTER-7" || screen.view == client.view))
// doesn't need to be updated
return screen
screen.icon_state = "[initial(screen.icon_state)][severity]"
screen.severity = severity
if (client && screen.should_show_to(src))
client.screen += screen
if (screen.screen_loc == "CENTER-7,CENTER-7" && screen.view != client.view)
var/scale = (1 + 2 * client.view) / 15
screen.view = client.view
screen.transform = matrix(scale, 0, 0, 0, scale, 0)
return screen
/mob/proc/clear_fullscreen(category, animated = 10)
var/obj/screen/fullscreen/screen = screens[category]
if(!screen)
return
screens -= category
if(animated)
animate(screen, alpha = 0, time = animated)
addtimer(CALLBACK(src, .proc/clear_fullscreen_after_animate, screen), animated, TIMER_CLIENT_TIME)
else
if(client)
client.screen -= screen
qdel(screen)
/mob/proc/clear_fullscreen_after_animate(obj/screen/fullscreen/screen)
if(client)
client.screen -= screen
qdel(screen)
/mob/proc/clear_fullscreens()
for(var/category in screens)
clear_fullscreen(category)
/mob/proc/hide_fullscreens()
if(client)
for(var/category in screens)
client.screen -= screens[category]
/mob/proc/reload_fullscreen()
if(client)
var/obj/screen/fullscreen/screen
for(var/category in screens)
screen = screens[category]
if(screen.should_show_to(src))
client.screen |= screen
else
client.screen -= screen
/obj/screen/fullscreen
icon = 'icons/mob/screen_full.dmi'
icon_state = "default"
screen_loc = "CENTER-7,CENTER-7"
layer = FULLSCREEN_LAYER
plane = FULLSCREEN_PLANE
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
var/view = 7
var/severity = 0
var/show_when_dead = FALSE
/obj/screen/fullscreen/proc/should_show_to(mob/mymob)
if(!show_when_dead && mymob.stat == DEAD)
return FALSE
return TRUE
/obj/screen/fullscreen/Destroy()
severity = 0
. = ..()
/obj/screen/fullscreen/brute
icon_state = "brutedamageoverlay"
layer = UI_DAMAGE_LAYER
plane = FULLSCREEN_PLANE
/obj/screen/fullscreen/oxy
icon_state = "oxydamageoverlay"
layer = UI_DAMAGE_LAYER
plane = FULLSCREEN_PLANE
/obj/screen/fullscreen/crit
icon_state = "passage"
layer = CRIT_LAYER
plane = FULLSCREEN_PLANE
/obj/screen/fullscreen/crit/vision
icon_state = "oxydamageoverlay"
layer = BLIND_LAYER
/obj/screen/fullscreen/blind
icon_state = "blackimageoverlay"
layer = BLIND_LAYER
plane = FULLSCREEN_PLANE
/obj/screen/fullscreen/curse
icon_state = "curse"
layer = CURSE_LAYER
plane = FULLSCREEN_PLANE
/obj/screen/fullscreen/impaired
icon_state = "impairedoverlay"
/obj/screen/fullscreen/blurry
icon = 'icons/mob/screen_gen.dmi'
screen_loc = "WEST,SOUTH to EAST,NORTH"
icon_state = "blurry"
/obj/screen/fullscreen/flash
icon = 'icons/mob/screen_gen.dmi'
screen_loc = "WEST,SOUTH to EAST,NORTH"
icon_state = "flash"
/obj/screen/fullscreen/flash/static
icon = 'icons/mob/screen_gen.dmi'
screen_loc = "WEST,SOUTH to EAST,NORTH"
icon_state = "noise"
/obj/screen/fullscreen/high
icon = 'icons/mob/screen_gen.dmi'
screen_loc = "WEST,SOUTH to EAST,NORTH"
icon_state = "druggy"
/obj/screen/fullscreen/color_vision
icon = 'icons/mob/screen_gen.dmi'
screen_loc = "WEST,SOUTH to EAST,NORTH"
icon_state = "flash"
alpha = 80
/obj/screen/fullscreen/color_vision/green
color = "#00ff00"
/obj/screen/fullscreen/color_vision/red
color = "#ff0000"
/obj/screen/fullscreen/color_vision/blue
color = "#0000ff"
/obj/screen/fullscreen/lighting_backdrop
icon = 'icons/mob/screen_gen.dmi'
icon_state = "flash"
transform = matrix(200, 0, 0, 0, 200, 0)
plane = LIGHTING_PLANE
blend_mode = BLEND_OVERLAY
show_when_dead = TRUE
//Provides darkness to the back of the lighting plane
/obj/screen/fullscreen/lighting_backdrop/lit
invisibility = INVISIBILITY_LIGHTING
layer = BACKGROUND_LAYER+21
color = "#000"
show_when_dead = TRUE
//Provides whiteness in case you don't see lights so everything is still visible
/obj/screen/fullscreen/lighting_backdrop/unlit
layer = BACKGROUND_LAYER+20
show_when_dead = TRUE
/obj/screen/fullscreen/see_through_darkness
icon_state = "nightvision"
plane = LIGHTING_PLANE
layer = LIGHTING_LAYER
blend_mode = BLEND_ADD
show_when_dead = TRUE
+1 -1
View File
@@ -539,7 +539,7 @@
screen_loc = ui_healthdoll
/obj/screen/splash
icon = 'config/title_screens/images/title1.dmi'
icon = 'icons/blank_title.png'
icon_state = ""
screen_loc = "1,1"
layer = SPLASHSCREEN_LAYER
+7 -7
View File
@@ -53,19 +53,19 @@
if(user.client)
if(IsAdminGhost(user))
attack_ai(user)
if(user.client.prefs.inquisitive_ghost)
else if(user.client.prefs.inquisitive_ghost)
user.examinate(src)
/mob/living/attack_ghost(mob/dead/observer/user)
if(user.client && user.health_scan)
healthscan(user, src, 1, TRUE)
return
..()
// ---------------------------------------
// And here are some good things for free:
// Now you can click through portals, wormholes, gateways, and teleporters while observing. -Sayu
/obj/machinery/teleport/hub/attack_ghost(mob/user)
var/atom/l = loc
var/obj/machinery/computer/teleporter/com = locate(/obj/machinery/computer/teleporter, locate(l.x - 2, l.y, l.z))
if(com && com.locked)
user.forceMove(get_turf(com.locked))
/obj/effect/portal/attack_ghost(mob/user)
if(linked)
user.forceMove(get_turf(linked))
+31
View File
@@ -0,0 +1,31 @@
/*/////////////////////////////////////////////////////////////////////////////////
/////// ///////
/////// Cit's exclusive jumpsuits, uniforms, etc. go here ///////
/////// ///////
*//////////////////////////////////////////////////////////////////////////////////
/obj/item/clothing/under/rank/security/skirt
name = "security skirt"
desc = "A tactical security skirt for officers complete with Nanotrasen belt buckle."
icon = 'icons/obj/clothing/cit_clothes.dmi'
icon_state = "secskirt"
icon_override = 'icons/mob/citadel/uniforms.dmi'
item_state = "r_suit"
item_color = "secskirt"
/obj/item/clothing/under/rank/head_of_security/skirt
name = "head of security's skirt"
desc = "A security skirt decorated for those few with the dedication to achieve the position of Head of Security."
icon = 'icons/obj/clothing/cit_clothes.dmi'
icon_state = "hosskirt"
icon_override = 'icons/mob/citadel/uniforms.dmi'
item_state = "gy_suit"
item_color = "hosskirt"
/obj/item/clothing/suit/armor/hos/trenchcoat/cloak
name = "armored trenchcloak"
desc = "A trenchcoat enchanced with a special lightweight kevlar. This one appears to be designed to be draped over one's shoulders rather than worn normally.."
alternate_worn_icon = 'icons/mob/citadel/suit.dmi'
icon_state = "hostrench"
item_state = "hostrench"
+5
View File
@@ -0,0 +1,5 @@
/obj/structure/displaycase/clown
desc = "In the event of clown, honk glass."
alert = 1
start_showpiece_type = /obj/item/bikehorn
req_access = list(ACCESS_CENT_GENERAL)
+328 -17
View File
@@ -111,7 +111,7 @@
w_class = WEIGHT_CLASS_BULKY
can_suppress = 0
burst_size = 1
fire_delay = 20
fire_delay = 40
select = 0
actions_types = list()
casing_ejector = 0
@@ -140,14 +140,14 @@
/datum/supply_pack/security/armory/spinfusor
name = "Stormhammer Spinfusor Crate"
cost = 7000
cost = 14000
contains = list(/obj/item/gun/ballistic/automatic/spinfusor,
/obj/item/gun/ballistic/automatic/spinfusor)
crate_name = "spinfusor crate"
/datum/supply_pack/security/armory/spinfusorammo
name = "Spinfusor Disk Crate"
cost = 4000
cost = 7000
contains = list(/obj/item/ammo_box/aspinfusor,
/obj/item/ammo_box/aspinfusor,
/obj/item/ammo_box/aspinfusor,
@@ -210,19 +210,23 @@
/obj/item/projectile/bullet/mags
icon = 'icons/obj/guns/cit_guns.dmi'
icon_state = "magjectile"
damage = 25
damage = 15
armour_penetration = 10
light_range = 2
speed = 1.2
range = 25
light_color = LIGHT_COLOR_RED
/obj/item/projectile/bullet/nlmags //non-lethal boolets
icon = 'icons/obj/guns/cit_guns.dmi'
icon_state = "magjectile-nl"
damage = 2
knockdown = 15
stamina = 50
damage = 1
knockdown = 0
stamina = 30
armour_penetration = -10
light_range = 2
speed = 1.2
range = 25
light_color = LIGHT_COLOR_BLUE
@@ -378,19 +382,23 @@
/obj/item/projectile/bullet/magrifle
icon = 'icons/obj/guns/cit_guns.dmi'
icon_state = "magjectile-large"
damage = 30
damage = 20
armour_penetration = 25
light_range = 3
speed = 1.2
range = 35
light_color = LIGHT_COLOR_RED
/obj/item/projectile/bullet/nlmagrifle //non-lethal boolets
icon = 'icons/obj/guns/cit_guns.dmi'
icon_state = "magjectile-large-nl"
damage = 5
knockdown = 30
stamina = 75
armour_penetration = 0
damage = 1
knockdown = 0
stamina = 35
armour_penetration = -10
light_range = 3
speed = 1.0
range = 35
light_color = LIGHT_COLOR_BLUE
///ammo casings///
@@ -443,7 +451,7 @@
can_suppress = 0
burst_size = 3
fire_delay = 2
spread = 15
spread = 30
recoil = 1
casing_ejector = 0
@@ -494,7 +502,7 @@
name = "foamag rifle"
desc = "A foam launching magnetic rifle. Ages 8 and up."
icon_state = "foamagrifle"
needs_permit = 0
needs_permit = FALSE
mag_type = /obj/item/ammo_box/magazine/toy/foamag
casing_ejector = FALSE
origin_tech = "combat=2;engineering=2;magnets=2"
@@ -719,8 +727,8 @@ obj/item/projectile/bullet/c10mm/soporific
if((blocked != 100) && isliving(target))
var/mob/living/L = target
L.blur_eyes(6)
if(L.staminaloss >= 60)
L.Sleeping(250)
if(L.getStaminaLoss() >= 60)
L.Sleeping(300)
else
L.adjustStaminaLoss(25)
return 1
@@ -753,7 +761,7 @@ obj/item/projectile/bullet/c10mm/soporific
/obj/item/projectile/bullet/cflechettes //shreds flesh and forces bleeding
name = "flechette (serrated)"
damage = 8
damage = 15
dismemberment = 10
armour_penetration = -80
@@ -921,3 +929,306 @@ obj/item/projectile/bullet/c10mm/soporific
materials = list(MAT_METAL = 7500, MAT_GLASS = 1000)
build_path = /obj/item/gun/energy/laser/practice/raygun
category = list("hacked", "Misc")
/*/////////////////////////////////////////////////////////////////////////////////////////////
The Recolourable Gun
*//////////////////////////////////////////////////////////////////////////////////////////////
/obj/item/gun/ballistic/automatic/pistol/p37
name = "\improper CX Mk.37P"
desc = "A modern reimagining of an old legendary gun, the Mk.37 is a handgun with a toggle-locking mechanism manufactured by CX Armories. \
This model is coated with a special polychromic material. \
Has a small warning on the receiver that boldly states 'WARNING: WILL DETONATE UPON UNAUTHORIZED USE'. \
Uses 9mm bullets loaded into proprietary magazines."
icon = 'icons/obj/guns/cit_guns.dmi'
icon_state = "p37"
w_class = WEIGHT_CLASS_NORMAL
spawnwithmagazine = FALSE
mag_type = /obj/item/ammo_box/magazine/m9mm/p37
can_suppress = FALSE
pin = /obj/item/device/firing_pin/dna/dredd //goes boom if whoever isn't DNA locked to it tries to use it
actions_types = list(/datum/action/item_action/pick_color)
var/frame_color = "#808080" //RGB
var/receiver_color = "#808080"
var/body_color = "#0098FF"
var/barrel_color = "#808080"
var/tip_color = "#808080"
var/arm_color = "#808080"
var/grip_color = "#00FFCB" //Does not actually colour the grip, just the lights surrounding it
var/energy_color = "#00FFCB"
///Defining all the colourable bits and displaying them///
/obj/item/gun/ballistic/automatic/pistol/p37/update_icon()
var/mutable_appearance/frame_overlay = mutable_appearance('icons/obj/guns/cit_guns.dmi', "p37_frame")
var/mutable_appearance/receiver_overlay = mutable_appearance('icons/obj/guns/cit_guns.dmi', "p37_receiver")
var/mutable_appearance/body_overlay = mutable_appearance('icons/obj/guns/cit_guns.dmi', "p37_body")
var/mutable_appearance/barrel_overlay = mutable_appearance('icons/obj/guns/cit_guns.dmi', "p37_barrel")
var/mutable_appearance/tip_overlay = mutable_appearance('icons/obj/guns/cit_guns.dmi', "p37_tip")
var/mutable_appearance/grip_overlay = mutable_appearance('icons/obj/guns/cit_guns.dmi', "p37_grip")
var/mutable_appearance/energy_overlay = mutable_appearance('icons/obj/guns/cit_guns.dmi', "p37_light")
var/mutable_appearance/arm_overlay = mutable_appearance('icons/obj/guns/cit_guns.dmi', "p37_arm")
var/mutable_appearance/arm_overlay_e = mutable_appearance('icons/obj/guns/cit_guns.dmi', "p37_arm-e")
if(frame_color)
frame_overlay.color = frame_color
if(receiver_color)
receiver_overlay.color = receiver_color
if(body_color)
body_overlay.color = body_color
if(barrel_color)
barrel_overlay.color = barrel_color
if(tip_color)
tip_overlay.color = tip_color
if(grip_color)
grip_overlay.color = grip_color
if(energy_color)
energy_overlay.color = energy_color
if(arm_color)
arm_overlay.color = arm_color
if(arm_color)
arm_overlay_e.color = arm_color
cut_overlays() //So that it doesn't keep stacking overlays non-stop on top of each other
add_overlay(frame_overlay)
add_overlay(receiver_overlay)
add_overlay(body_overlay)
add_overlay(barrel_overlay)
add_overlay(tip_overlay)
add_overlay(grip_overlay)
add_overlay(energy_overlay)
if(magazine) //does not need a cut_overlays proc call here because it's already called further up
add_overlay("p37_mag")
if(chambered)
cut_overlay(arm_overlay_e)
add_overlay(arm_overlay)
else
cut_overlay(arm_overlay)
add_overlay(arm_overlay_e)
///letting you actually recolor things///
/obj/item/gun/ballistic/automatic/pistol/p37/ui_action_click(mob/user, var/datum/action/A)
if(istype(A, /datum/action/item_action/pick_color))
var/choice = input(user,"Mk.37P polychrome options", "Gun Recolor") in list("Frame Color","Receiver Color","Body Color",
"Barrel Color", "Barrel Tip Color", "Grip Light Color",
"Light Color", "Arm Color", "*CANCEL*")
switch(choice)
if("Frame Color")
var/frame_color_input = input(usr,"Choose Frame Color") as color|null
if(frame_color_input)
frame_color = sanitize_hexcolor(frame_color_input, desired_format=6, include_crunch=1)
update_icon()
if("Receiver Color")
var/receiver_color_input = input(usr,"Choose Receiver Color") as color|null
if(receiver_color_input)
receiver_color = sanitize_hexcolor(receiver_color_input, desired_format=6, include_crunch=1)
update_icon()
if("Body Color")
var/body_color_input = input(usr,"Choose Body Color") as color|null
if(body_color_input)
body_color = sanitize_hexcolor(body_color_input, desired_format=6, include_crunch=1)
update_icon()
if("Barrel Color")
var/barrel_color_input = input(usr,"Choose Barrel Color") as color|null
if(barrel_color_input)
barrel_color = sanitize_hexcolor(barrel_color_input, desired_format=6, include_crunch=1)
update_icon()
if("Barrel Tip Color")
var/tip_color_input = input(usr,"Choose Barrel Tip Color") as color|null
if(tip_color_input)
tip_color = sanitize_hexcolor(tip_color_input, desired_format=6, include_crunch=1)
update_icon()
if("Grip Light Color")
var/grip_color_input = input(usr,"Choose Grip Light Color") as color|null
if(grip_color_input)
grip_color = sanitize_hexcolor(grip_color_input, desired_format=6, include_crunch=1)
update_icon()
if("Light Color")
var/energy_color_input = input(usr,"Choose Light Color") as color|null
if(energy_color_input)
energy_color = sanitize_hexcolor(energy_color_input, desired_format=6, include_crunch=1)
update_icon()
if("Arm Color")
var/arm_color_input = input(usr,"Choose Arm Color") as color|null
if(arm_color_input)
arm_color = sanitize_hexcolor(arm_color_input, desired_format=6, include_crunch=1)
update_icon()
A.UpdateButtonIcon()
else
..()
///boolets///
/obj/item/projectile/bullet/c9mm/frangible
name = "9mm frangible bullet"
damage = 15
stamina = 0
speed = 1.0
range = 20
armour_penetration = -25
/obj/item/projectile/bullet/c9mm/rubber
name = "9mm rubber bullet"
damage = 5
stamina = 30
speed = 1.2
range = 14
knockdown = 0
/obj/item/ammo_casing/c9mm/frangible
name = "9mm frangible bullet casing"
desc = "A 9mm frangible bullet casing."
projectile_type = /obj/item/projectile/bullet/c9mm/frangible
/obj/item/ammo_casing/c9mm/rubber
name = "9mm rubber bullet casing"
desc = "A 9mm rubber bullet casing."
projectile_type = /obj/item/projectile/bullet/c9mm/rubber
/obj/item/ammo_box/magazine/m9mm/p37
name = "\improper P37 magazine (9mm frangible)"
desc = "A gun magazine. Loaded with plastic composite rounds which fragment upon impact to minimize collateral damage."
icon = 'icons/obj/guns/cit_guns.dmi'
icon_state = "11mm" //topkek
ammo_type = /obj/item/ammo_casing/c9mm/frangible
caliber = "9mm"
max_ammo = 11
multiple_sprites = 1
/obj/item/ammo_box/magazine/m9mm/p37/fmj
name = "\improper P37 magazine (9mm)"
ammo_type = /obj/item/ammo_casing/c9mm
desc = "A gun magazine. Loaded with conventional full metal jacket rounds."
/obj/item/ammo_box/magazine/m9mm/p37/rubber
name = "\improper P37 magazine (9mm Non-Lethal Rubbershot)"
ammo_type = /obj/item/ammo_casing/c9mm/rubber
desc = "A gun magazine. Loaded with less-than-lethal rubber bullets."
/obj/item/ammo_box/c9mm/frangible
name = "ammo box (9mm frangible)"
ammo_type = /obj/item/ammo_casing/c9mm/frangible
/obj/item/ammo_box/c9mm/rubber
name = "ammo box (9mm non-lethal rubbershot)"
ammo_type = /obj/item/ammo_casing/c9mm/rubber
/datum/design/c9mmfrag
name = "Box of 9mm Frangible Bullets"
id = "9mm_frag"
build_type = AUTOLATHE
materials = list(MAT_METAL = 25000)
build_path = /obj/item/ammo_box/c9mm/frangible
category = list("hacked", "Security")
/datum/design/c9mmrubber
name = "Box of 9mm Rubber Bullets"
id = "9mm_rubber"
build_type = AUTOLATHE
materials = list(MAT_METAL = 30000)
build_path = /obj/item/ammo_box/c9mm/rubber
category = list("initial", "Security")
///Security Variant///
/obj/item/gun/ballistic/automatic/pistol/p37/sec
name = "\improper CX Mk.37S"
desc = "A modern reimagining of an old legendary gun, the Mk.37 is a handgun with a toggle-locking mechanism manufactured by CX Armories. Uses 9mm bullets loaded into proprietary magazines."
spawnwithmagazine = FALSE
pin = /obj/item/device/firing_pin/implant/mindshield
actions_types = list() //so you can't recolor it
frame_color = "#808080" //RGB
receiver_color = "#808080"
body_color = "#282828"
barrel_color = "#808080"
tip_color = "#808080"
arm_color = "#800000"
grip_color = "#FFFF00" //Does not actually colour the grip, just the lights surrounding it
energy_color = "#FFFF00"
///Foam Variant because WE NEED MEMES///
/obj/item/gun/ballistic/automatic/pistol/p37/foam
name = "\improper Foam Force Mk.37F"
desc = "A licensed foam-firing reproduction of a handgun with a toggle-locking mechanism manufactured by CX Armories. This model is coated with a special polychromic material. Uses standard foam pistol magazines."
icon_state = "p37_foam"
pin = /obj/item/device/firing_pin
spawnwithmagazine = TRUE
needs_permit = FALSE
mag_type = /obj/item/ammo_box/magazine/toy/pistol
can_suppress = FALSE
actions_types = list(/datum/action/item_action/pick_color)
/datum/design/foam_p37
name = "Foam Force Mk.37F"
id = "foam_p37"
build_type = AUTOLATHE
materials = list(MAT_METAL = 15000, MAT_GLASS = 10000)
build_path = /obj/item/gun/ballistic/automatic/pistol/p37/foam
category = list("hacked", "Misc")
/*/////////////////////////////////////////////////////////////////////////////////////////////
The Recolourable Energy Gun
*//////////////////////////////////////////////////////////////////////////////////////////////
obj/item/gun/energy/e_gun/cx
name = "\improper CX Model D Energy Gun"
desc = "An overpriced hybrid energy gun with two settings: disable, and kill. Manufactured by CX Armories. Has a polychromic coating."
icon = 'icons/obj/guns/cit_guns.dmi'
icon_state = "cxe"
lefthand_file = 'icons/mob/citadel/guns_lefthand.dmi'
righthand_file = 'icons/mob/citadel/guns_righthand.dmi'
ammo_type = list(/obj/item/ammo_casing/energy/disabler, /obj/item/ammo_casing/energy/laser)
origin_tech = "combat=4;magnets=3"
flight_x_offset = 15
flight_y_offset = 10
actions_types = list(/datum/action/item_action/pick_color)
var/body_color = "#252528"
obj/item/gun/energy/e_gun/cx/update_icon()
..()
var/mutable_appearance/body_overlay = mutable_appearance('icons/obj/guns/cit_guns.dmi', "cxegun_body")
if(body_color)
body_overlay.color = body_color
add_overlay(body_overlay)
if(ismob(loc))
var/mob/M = loc
M.update_inv_hands()
obj/item/gun/energy/e_gun/cx/ui_action_click(mob/user, var/datum/action/A)
if(istype(A, /datum/action/item_action/pick_color))
if(alert("Are you sure you want to repaint your gun?", "Confirm Repaint", "Yes", "No") == "Yes")
var/body_color_input = input(usr,"Choose Body Color") as color|null
if(body_color_input)
body_color = sanitize_hexcolor(body_color_input, desired_format=6, include_crunch=1)
update_icon()
A.UpdateButtonIcon()
else
..()
obj/item/gun/energy/e_gun/cx/worn_overlays(isinhands, icon_file)
. = ..()
if(isinhands)
var/mutable_appearance/body_inhand = mutable_appearance(icon_file, "cxe_body")
body_inhand.color = body_color
. += body_inhand
+20 -6
View File
@@ -32,6 +32,10 @@
set_light(0)
update_icon()
for(var/X in actions)
var/datum/action/A = X
A.UpdateButtonIcon()
add_fingerprint(user)
/obj/item/toy/sword/cx/update_icon()
@@ -49,6 +53,10 @@
if(active)
add_overlay(blade_overlay)
if(ismob(loc))
var/mob/M = loc
M.update_inv_hands()
/obj/item/toy/sword/cx/ui_action_click(mob/user, var/datum/action/A)
if(istype(A, /datum/action/item_action/pick_color))
if(alert("Are you sure you want to recolor your blade?", "Confirm Repaint", "Yes", "No") == "Yes")
@@ -56,10 +64,8 @@
if(energy_color_input)
light_color = sanitize_hexcolor(energy_color_input, desired_format=6, include_crunch=1)
update_icon()
if(ismob(loc))
var/mob/M = loc
M.update_inv_hands()
update_light()
A.UpdateButtonIcon()
else
..()
@@ -72,6 +78,9 @@
blade_inhand.color = light_color
. += blade_inhand
/obj/item/toy/sword/cx/attackby(obj/item/W, mob/living/user, params)
return //NO MORE MAKING DUAL ESWORDS
/*///autolathe memes/// I really need to stop doing this and find a proper way of adding in my toys
/datum/design/toyneb
@@ -143,6 +152,9 @@
update_icon()
transform_messages(user, supress_message_text)
add_fingerprint(user)
for(var/X in actions)
var/datum/action/A = X
A.UpdateButtonIcon()
return TRUE
/obj/item/melee/transforming/energy/sword/cx/transform_messages(mob/living/user, supress_message_text)
@@ -165,6 +177,10 @@
if(active)
add_overlay(blade_overlay)
if(ismob(loc))
var/mob/M = loc
M.update_inv_hands()
/obj/item/melee/transforming/energy/sword/cx/ui_action_click(mob/user, var/datum/action/A)
if(istype(A, /datum/action/item_action/pick_color))
if(alert("Are you sure you want to recolor your blade?", "Confirm Repaint", "Yes", "No") == "Yes")
@@ -172,10 +188,8 @@
if(energy_color_input)
light_color = sanitize_hexcolor(energy_color_input, desired_format=6, include_crunch=1)
update_icon()
if(ismob(loc))
var/mob/M = loc
M.update_inv_hands()
update_light()
A.UpdateButtonIcon()
else
..()
@@ -372,3 +372,10 @@ CONFIG_TWEAK(number/mc_tick_rate/ValidateAndSet(str_val))
. = ..()
if (.)
Master.UpdateTickRate()
CONFIG_DEF(flag/resume_after_initializations)
CONFIG_TWEAK(flag/ValidateAndSet(str_val))
. = ..()
if(. && Master.current_runlevel)
world.sleep_offline = !value
@@ -163,9 +163,20 @@ CONFIG_DEF(flag/ooc_during_round)
CONFIG_DEF(flag/emojis)
CONFIG_DEF(number/run_delay) //Used for modifying movement speed for mobs.
var/static/value_cache = 0
CONFIG_TWEAK(number/run_delay/ValidateAndSet())
. = ..()
if(.)
value_cache = value
CONFIG_DEF(number/walk_delay)
var/static/value_cache = 0
CONFIG_TWEAK(number/walk_delay/ValidateAndSet())
. = ..()
if(.)
value_cache = value
CONFIG_DEF(number/human_delay) //Mob specific modifiers. NOTE: These will affect different mob types in different ways
CONFIG_DEF(number/robot_delay)
+3 -3
View File
@@ -40,18 +40,18 @@ GLOBAL_REAL(GLOB, /datum/controller/global_vars)
stat("Globals:", statclick.update("Edit"))
/datum/controller/global_vars/can_vv_get(var_name)
if(var_name in gvars_datum_protected_varlist)
if(gvars_datum_protected_varlist[var_name])
return FALSE
return ..()
/datum/controller/global_vars/vv_edit_var(var_name, var_value)
if((var_name in gvars_datum_protected_varlist))
if(gvars_datum_protected_varlist[var_name])
return FALSE
return ..()
/datum/controller/global_vars/Initialize()
gvars_datum_init_order = list()
gvars_datum_protected_varlist = list("gvars_datum_protected_varlist")
gvars_datum_protected_varlist = list("gvars_datum_protected_varlist" = TRUE)
var/list/global_procs = typesof(/datum/controller/global_vars/proc)
var/expected_len = vars.len - gvars_datum_in_built_vars.len
if(global_procs.len != expected_len)
+3 -1
View File
@@ -189,10 +189,12 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
// Sort subsystems by display setting for easy access.
sortTim(subsystems, /proc/cmp_subsystem_display)
// Set world options.
world.sleep_offline = 1
world.sleep_offline = TRUE
world.fps = CONFIG_GET(number/fps)
var/initialized_tod = REALTIMEOFDAY
sleep(1)
if(CONFIG_GET(flag/resume_after_initializations))
world.sleep_offline = FALSE
initializations_finished_with_no_players_logged_in = initialized_tod < REALTIMEOFDAY - 10
// Loop.
Master.StartProcessing(0)
+11
View File
@@ -27,6 +27,7 @@ SUBSYSTEM_DEF(air)
var/list/hotspots = list()
var/list/networks = list()
var/list/obj/machinery/atmos_machinery = list()
var/list/pipe_init_dirs_cache = list()
@@ -376,6 +377,16 @@ SUBSYSTEM_DEF(air)
AM.build_network()
CHECK_TICK
/datum/controller/subsystem/air/proc/get_init_dirs(type, dir)
if(!pipe_init_dirs_cache[type])
pipe_init_dirs_cache[type] = list()
if(!pipe_init_dirs_cache[type]["[dir]"])
var/obj/machinery/atmospherics/temp = new type(null, FALSE, dir)
pipe_init_dirs_cache[type]["[dir]"] = temp.GetInitDirections()
qdel(temp)
return pipe_init_dirs_cache[type]["[dir]"]
#undef SSAIR_PIPENETS
#undef SSAIR_ATMOSMACHINERY
+1 -1
View File
@@ -186,7 +186,7 @@ Delayed insert mode was removed in mysql 7 and only works with MyISAM type table
/datum/DBQuery/proc/warn_execute()
. = Execute()
if(!.)
to_chat(usr, "<span class='danger'>A SQL error occured during this operation, check the server logs.</span>")
to_chat(usr, "<span class='danger'>A SQL error occurred during this operation, check the server logs.</span>")
/datum/DBQuery/proc/Execute(sql_query = sql, cursor_handler = default_cursor, log_error = TRUE)
Close()
+1 -1
View File
@@ -177,7 +177,7 @@ SUBSYSTEM_DEF(events)
var/YY = text2num(time2text(world.timeofday, "YY")) // get the current year
var/MM = text2num(time2text(world.timeofday, "MM")) // get the current month
var/DD = text2num(time2text(world.timeofday, "DD")) // get the current day
var/DDD = text2num(time2text(world.timeofday, "DDD")) // get the current weekday
var/DDD = time2text(world.timeofday, "DDD") // get the current weekday
var/W = weekdayofthemonth() // is this the first monday? second? etc.
for(var/H in subtypesof(/datum/holiday))
+2 -2
View File
@@ -263,7 +263,7 @@ SUBSYSTEM_DEF(garbage)
// Should be treated as a replacement for the 'del' keyword.
// Datums passed to this will be given a chance to clean up references to allow the GC to collect them.
/proc/qdel(datum/D, force=FALSE)
/proc/qdel(datum/D, force=FALSE, ...)
if(!istype(D))
del(D)
return
@@ -278,7 +278,7 @@ SUBSYSTEM_DEF(garbage)
D.gc_destroyed = GC_CURRENTLY_BEING_QDELETED
var/start_time = world.time
var/start_tick = world.tick_usage
var/hint = D.Destroy(force) // Let our friend know they're about to get fucked up.
var/hint = D.Destroy(arglist(args.Copy(2))) // Let our friend know they're about to get fucked up.
if(world.time != start_time)
I.slept_destroy++
else
+3 -1
View File
@@ -18,6 +18,8 @@ SUBSYSTEM_DEF(mapping)
var/list/shuttle_templates = list()
var/list/shelter_templates = list()
var/list/areas_in_z = list()
var/loading_ruins = FALSE
/datum/controller/subsystem/mapping/PreInit()
@@ -124,7 +126,7 @@ SUBSYSTEM_DEF(mapping)
query_round_map_name.Execute()
if(config.minetype != "lavaland")
INIT_ANNOUNCE("WARNING: A map without lavaland set as it's minetype was loaded! This is being ignored! Update the maploader code!")
INIT_ANNOUNCE("WARNING: A map without lavaland set as its minetype was loaded! This is being ignored! Update the maploader code!")
CreateSpace(ZLEVEL_SPACEMAX)
+1 -2
View File
@@ -30,8 +30,7 @@ SUBSYSTEM_DEF(ticker)
var/list/availablefactions = list() //list of factions with openings
var/list/scripture_states = list(SCRIPTURE_DRIVER = TRUE, \
SCRIPTURE_SCRIPT = FALSE, \
SCRIPTURE_APPLICATION = FALSE, \
SCRIPTURE_JUDGEMENT = FALSE) //list of clockcult scripture states for announcements
SCRIPTURE_APPLICATION = FALSE) //list of clockcult scripture states for announcements
var/delay_end = 0 //if set true, the round will not restart on it's own
+3 -3
View File
@@ -35,7 +35,7 @@ GLOBAL_LIST_INIT(lawlorify, list (
BAN_CHAPEL = "This devil avoids holy ground.",
BAN_HURTPRIEST = "The annointed clergy appear to be immune to his powers.",
BAN_AVOIDWATER = "The devil seems to have some sort of aversion to water, though it does not appear to harm him.",
BAN_STRIKEUNCONCIOUS = "This devil only shows interest in those who are awake.",
BAN_STRIKEUNCONSCIOUS = "This devil only shows interest in those who are awake.",
BAN_HURTLIZARD = "This devil will not strike a lizardman first.",
BAN_HURTANIMAL = "This devil avoids hurting animals.",
BANISH_WATER = "To banish the devil, you must infuse its body with holy water.",
@@ -59,7 +59,7 @@ GLOBAL_LIST_INIT(lawlorify, list (
BAN_CHAPEL = "You must never attempt to enter the chapel.",
BAN_HURTPRIEST = "You must never attack a priest.",
BAN_AVOIDWATER = "You must never willingly touch a wet surface.",
BAN_STRIKEUNCONCIOUS = "You must never strike an unconscious person.",
BAN_STRIKEUNCONSCIOUS = "You must never strike an unconscious person.",
BAN_HURTLIZARD = "You must never harm a lizardman outside of self defense.",
BAN_HURTANIMAL = "You must never harm a non-sentient creature or robot outside of self defense.",
BANE_SILVER = "Silver, in all of its forms shall be your downfall.",
@@ -148,7 +148,7 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master",
return pick(OBLIGATION_FOOD, OBLIGATION_FIDDLE, OBLIGATION_DANCEOFF, OBLIGATION_GREET, OBLIGATION_PRESENCEKNOWN, OBLIGATION_SAYNAME, OBLIGATION_ANNOUNCEKILL, OBLIGATION_ANSWERTONAME)
/proc/randomdevilban()
return pick(BAN_HURTWOMAN, BAN_CHAPEL, BAN_HURTPRIEST, BAN_AVOIDWATER, BAN_STRIKEUNCONCIOUS, BAN_HURTLIZARD, BAN_HURTANIMAL)
return pick(BAN_HURTWOMAN, BAN_CHAPEL, BAN_HURTPRIEST, BAN_AVOIDWATER, BAN_STRIKEUNCONSCIOUS, BAN_HURTLIZARD, BAN_HURTANIMAL)
/proc/randomdevilbane()
return pick(BANE_SALT, BANE_LIGHT, BANE_IRON, BANE_WHITECLOTHES, BANE_SILVER, BANE_HARVEST, BANE_TOOLBOX)
+13 -7
View File
@@ -26,7 +26,7 @@ Stands have a lot of procs which mimic mob procs. Rather than inserting hooks fo
### Defines
1. `COMPONENT_INCOMPATIBLE` Return this from `/datum/component/Initialize` to have the component be deleted if it's applied to an incorrect type. `parent` must not be modified if this is to be returned.
1. `COMPONENT_INCOMPATIBLE` Return this from `/datum/component/Initialize` or `datum/component/OnTransfer` to have the component be deleted if it's applied to an incorrect type. `parent` must not be modified if this is to be returned.
### Vars
@@ -42,12 +42,13 @@ Stands have a lot of procs which mimic mob procs. Rather than inserting hooks fo
* `COMPONENT_DUPE_UNIQUE`: New component will be deleted, old component will first have `/datum/component/proc/InheritComponent(datum/component/new, TRUE)` on it
1. `/datum/component/var/dupe_type` (protected, type)
* Definition of a duplicate component type
* `null` means exact match on `type`
* `null` means exact match on `type` (default)
* Any other type means that and all subtypes
1. `/datum/component/var/list/signal_procs` (private)
* Associated lazy list of signals -> `/datum/callback`s that will be run when the parent datum recieves that signal
1. `/datum/component/var/datum/parent` (protected, read-only)
* The datum this component belongs to
* Never `null` in child procs
### Procs
@@ -72,7 +73,7 @@ Stands have a lot of procs which mimic mob procs. Rather than inserting hooks fo
* Will only be called if a component's callback returns `TRUE`
1. `/datum/proc/TakeComponent(datum/component/C)` (public, final)
* Properly transfers ownership of a component from one datum to another
* Singals `COMSIG_COMPONENT_REMOVING` on the parent
* Signals `COMSIG_COMPONENT_REMOVING` on the parent
* Called on the datum you want to own the component with another datum's component
1. `/datum/proc/SendSignal(signal, ...)` (public, final)
* Call to send a signal to the components of the target datum
@@ -86,9 +87,11 @@ Stands have a lot of procs which mimic mob procs. Rather than inserting hooks fo
* Signals will not be recieved while this function is running
* Component may be deleted after this function completes without being attached
* Do not call `qdel(src)` from this function
1. `/datum/component/Destroy()` (virtual, no-sleep)
1. `/datum/component/Destroy(force(bool), silent(bool))` (virtual, no-sleep)
* Sends the `COMSIG_COMPONENT_REMOVING` signal to the parent datum if the `parent` isn't being qdeleted
* Properly removes the component from `parent` and cleans up references
* Setting `force` makes it not check for and remove the component from the parent
* Setting `silent` deletes the component without sending a `COMSIG_COMPONENT_REMOVING` signal
1. `/datum/component/proc/InheritComponent(datum/component/C, i_am_original(boolean))` (abstract, no-sleep)
* Called on a component when a component of the same type was added to the same parent
* See `/datum/component/var/dupe_mode`
@@ -96,10 +99,13 @@ Stands have a lot of procs which mimic mob procs. Rather than inserting hooks fo
1. `/datum/component/proc/AfterComponentActivated()` (abstract, async)
* Called on a component that was activated after it's `parent`'s `ComponentActivated()` is called
1. `/datum/component/proc/OnTransfer(datum/new_parent)` (abstract, no-sleep)
* Called before the new `parent` is assigned in `TakeComponent()`, after the remove signal, before the added signal
* Called before `new_parent` is assigned to `parent` in `TakeComponent()`
* Allows the component to react to ownership transfers
1. `/datum/component/proc/_RemoveNoSignal()` (private, final)
* Internal, clears the parent var and removes the component from the parents component list
1. `/datum/component/proc/_RemoveFromParent()` (private, final)
* Clears `parent` and removes the component from it's component list
1. `/datum/component/proc/_CheckDupesAndJoinParent` (private, final)
* Tries to add the component to it's `parent`s `datum_components` list
* Properly handles duplicate situations based on the `dupe_mode` var
1. `/datum/component/proc/RegisterSignal(signal(string/list of strings), proc_ref(type), override(boolean))` (protected, final) (Consider removing for performance gainz)
* If signal is a list it will be as if RegisterSignal was called for each of the entries with the same following arguments
* Makes a component listen for the specified `signal` on it's `parent` datum.
+64 -44
View File
@@ -6,35 +6,45 @@
var/datum/parent
/datum/component/New(datum/P, ...)
if(type == /datum/component)
qdel(src)
CRASH("[type] instantiated!")
parent = P
var/list/arguments = args.Copy()
arguments.Cut(1, 2)
if(Initialize(arglist(arguments)) == COMPONENT_INCOMPATIBLE)
parent = null
qdel(src)
qdel(src, TRUE, TRUE)
return
_CheckDupesAndJoinParent(P)
/datum/component/proc/_CheckDupesAndJoinParent()
var/datum/P = parent
var/dm = dupe_mode
var/datum/component/old
if(dm != COMPONENT_DUPE_ALLOWED)
var/dt = dupe_type
var/datum/component/old
if(!dt)
old = P.GetExactComponent(type)
else
old = P.GetComponent(dt)
if(old)
//One or the other has to die
switch(dm)
if(COMPONENT_DUPE_UNIQUE)
old.InheritComponent(src, TRUE)
parent = null //prevent COMPONENT_REMOVING signal
qdel(src)
qdel(src, TRUE, TRUE)
return
if(COMPONENT_DUPE_HIGHLANDER)
InheritComponent(old, FALSE)
qdel(old)
//let the others know
P.SendSignal(COMSIG_COMPONENT_ADDED, src)
qdel(old, FALSE, TRUE)
//provided we didn't eat someone
if(!old)
//let the others know
P.SendSignal(COMSIG_COMPONENT_ADDED, src)
//lazy init the parent's dc list
var/list/dc = P.datum_components
@@ -47,7 +57,7 @@
var/test = dc[I]
if(test) //already another component of this type here
var/list/components_of_type
if(!islist(test))
if(!length(test))
components_of_type = list(test)
dc[I] = components_of_type
else
@@ -70,35 +80,34 @@
/datum/component/proc/Initialize(...)
return
/datum/component/Destroy()
/datum/component/Destroy(force=FALSE, silent=FALSE)
enabled = FALSE
var/datum/P = parent
if(P)
_RemoveNoSignal()
if(!force)
_RemoveFromParent()
if(!silent)
P.SendSignal(COMSIG_COMPONENT_REMOVING, src)
parent = null
LAZYCLEARLIST(signal_procs)
return ..()
/datum/component/proc/_RemoveNoSignal()
/datum/component/proc/_RemoveFromParent()
var/datum/P = parent
if(P)
var/list/dc = P.datum_components
var/our_type = type
for(var/I in _GetInverseTypeList(our_type))
var/list/components_of_type = dc[I]
if(islist(components_of_type)) //
var/list/subtracted = components_of_type - src
if(subtracted.len == 1) //only 1 guy left
dc[I] = subtracted[1] //make him special
else
dc[I] = subtracted
else //just us
dc -= I
if(!dc.len)
P.datum_components = null
parent = null
var/list/dc = P.datum_components
for(var/I in _GetInverseTypeList())
var/list/components_of_type = dc[I]
if(length(components_of_type)) //
var/list/subtracted = components_of_type - src
if(subtracted.len == 1) //only 1 guy left
dc[I] = subtracted[1] //make him special
else
dc[I] = subtracted
else //just us
dc -= I
if(!dc.len)
P.datum_components = null
/datum/component/proc/RegisterSignal(sig_type_or_types, proc_on_self, override = FALSE)
/datum/component/proc/RegisterSignal(sig_type_or_types, proc_or_callback, override = FALSE)
if(QDELETED(src))
return
var/list/procs = signal_procs
@@ -112,8 +121,10 @@
. = procs[sig_type]
if(.)
stack_trace("[sig_type] overridden. Use override = TRUE to suppress this warning")
procs[sig_type] = CALLBACK(src, proc_on_self)
if(!istype(proc_or_callback, /datum/callback)) //if it wasnt a callback before, it is now
proc_or_callback = CALLBACK(src, proc_or_callback)
procs[sig_type] = proc_or_callback
/datum/component/proc/InheritComponent(datum/component/C, i_am_original)
return
@@ -125,8 +136,15 @@
set waitfor = FALSE
return
/datum/component/proc/_GetInverseTypeList(current_type)
. = list(current_type)
/datum/component/proc/_GetInverseTypeList(our_type = type)
#if DM_VERSION > 511
#warning Remove this hack for http://www.byond.com/forum/?post=73469
#endif
set invisibility = 101
//we can do this one simple trick
var/current_type = parent_type
. = list(our_type, current_type)
//and since most components are root level + 1, this won't even have to run
while (current_type != /datum/component)
current_type = type2parent(current_type)
. += current_type
@@ -138,7 +156,7 @@
var/list/arguments = args.Copy()
arguments.Cut(1, 2)
var/target = comps[/datum/component]
if(!islist(target))
if(!length(target))
var/datum/component/C = target
if(!C.enabled)
return FALSE
@@ -174,7 +192,7 @@
if(!dc)
return null
. = dc[c_type]
if(islist(.))
if(length(.))
return .[1]
/datum/proc/GetExactComponent(c_type)
@@ -183,7 +201,7 @@
return null
var/datum/component/C = dc[c_type]
if(C)
if(islist(C))
if(length(C))
C = C[1]
if(C.type == c_type)
return C
@@ -194,14 +212,14 @@
if(!dc)
return null
. = dc[c_type]
if(!islist(.))
if(!length(.))
return list(.)
/datum/proc/AddComponent(new_type, ...)
var/nt = new_type
args[1] = src
var/datum/component/C = new nt(arglist(args))
return QDELING(C) ? GetComponent(new_type) : C
return QDELING(C) ? GetExactComponent(new_type) : C
/datum/proc/LoadComponent(component_type, ...)
. = GetComponent(component_type)
@@ -213,13 +231,15 @@
return
var/datum/helicopter = C.parent
if(helicopter == src)
//wat
//if we're taking to the same thing no need for anything
return
C._RemoveNoSignal()
if(C.OnTransfer(src) == COMPONENT_INCOMPATIBLE)
qdel(C)
return
C._RemoveFromParent()
helicopter.SendSignal(COMSIG_COMPONENT_REMOVING, C)
C.OnTransfer(src)
C.parent = src
SendSignal(COMSIG_COMPONENT_ADDED, C)
C._CheckDupesAndJoinParent()
/datum/proc/TransferComponents(datum/target)
var/list/dc = datum_components
+53
View File
@@ -0,0 +1,53 @@
/datum/component/decal
dupe_mode = COMPONENT_DUPE_ALLOWED
var/cleanable
var/mutable_appearance/pic
/datum/component/decal/Initialize(_icon, _icon_state, _dir, _cleanable=CLEAN_GOD, _color, _layer=TURF_LAYER)
if(!isatom(parent) || !_icon || !_icon_state)
. = COMPONENT_INCOMPATIBLE
CRASH("A turf decal was applied incorrectly to [parent.type]: icon:[_icon ? _icon : "none"] icon_state:[_icon_state ? _icon_state : "none"]")
// It has to be made from an image or dir breaks because of a byond bug
var/temp_image = image(_icon, null, _icon_state, _layer, _dir)
pic = new(temp_image)
pic.color = _color
cleanable = _cleanable
apply()
if(_dir) // If no dir is assigned at start then it follows the atom's dir
RegisterSignal(COMSIG_ATOM_DIR_CHANGE, .proc/rotate_react)
if(_cleanable)
RegisterSignal(COMSIG_COMPONENT_CLEAN_ACT, .proc/clean_react)
/datum/component/decal/Destroy()
remove()
return ..()
/datum/component/decal/OnTransfer(atom/thing)
remove()
remove(thing)
apply(thing)
/datum/component/decal/proc/apply(atom/thing)
var/atom/master = thing || parent
master.add_overlay(pic, TRUE)
/datum/component/decal/proc/remove(atom/thing)
var/atom/master = thing || parent
master.cut_overlay(pic, TRUE)
/datum/component/decal/proc/rotate_react(old_dir, new_dir)
if(old_dir == new_dir)
return
remove()
var/rotation = SimplifyDegrees(dir2angle(new_dir)-dir2angle(old_dir))
pic.dir = turn(pic.dir, rotation)
apply()
/datum/component/decal/proc/clean_react(strength)
if(strength >= cleanable)
qdel(src)
+9 -5
View File
@@ -37,11 +37,15 @@
return ..()
/datum/component/radioactive/process()
if(hl3_release_date && prob(50))
radiation_pulse(parent, strength, RAD_DISTANCE_COEFFICIENT*2, FALSE, can_contaminate)
strength -= strength / hl3_release_date
if(strength <= RAD_BACKGROUND_RADIATION)
qdel(src)
if(!prob(50))
return
radiation_pulse(parent, strength, RAD_DISTANCE_COEFFICIENT*2, FALSE, can_contaminate)
if(!hl3_release_date)
return
strength -= strength / hl3_release_date
if(strength <= RAD_BACKGROUND_RADIATION)
return PROCESS_KILL
/datum/component/radioactive/InheritComponent(datum/component/C, i_am_original)
if(!i_am_original)
@@ -0,0 +1,9 @@
/datum/component/redirect
dupe_mode = COMPONENT_DUPE_ALLOWED
/datum/component/redirect/Initialize(list/signals, datum/callback/_callback)
//It's not our job to verify the right signals are registered here, just do it.
if(!LAZYLEN(signals) || !istype(_callback))
. = COMPONENT_INCOMPATIBLE
CRASH("A redirection component was initialized with incorrect args.")
RegisterSignal(signals, _callback)
+60
View File
@@ -0,0 +1,60 @@
/datum/component/spooky
var/too_spooky = TRUE //will it spawn a new instrument?
/datum/component/spooky/Initialize()
RegisterSignal(COMSIG_ITEM_ATTACK, .proc/spectral_attack)
/datum/component/spooky/proc/spectral_attack(mob/living/carbon/C, mob/user)
if(ishuman(user)) //this weapon wasn't meant for mortals.
var/mob/living/carbon/human/U = user
if(!istype(U.dna.species, /datum/species/skeleton))
U.adjustStaminaLoss(35) //Extra Damage
U.Jitter(35)
U.stuttering = 20
if(U.getStaminaLoss() > 95)
to_chat(U, "<font color ='red', size ='4'><B>Your ears weren't meant for this spectral sound.</B></font>")
spectral_change(U)
return
if(ishuman(C))
var/mob/living/carbon/human/H = C
if(istype(H.dna.species, /datum/species/skeleton))
return ..() //undeads are unaffected by the spook-pocalypse.
if(istype(H.dna.species, /datum/species/zombie))
H.adjustStaminaLoss(25)
H.Knockdown(15) //zombies can't resist the doot
C.Jitter(35)
C.stuttering = 20
if((!istype(H.dna.species, /datum/species/skeleton)) && (!istype(H.dna.species, /datum/species/golem)) && (!istype(H.dna.species, /datum/species/android)) && (!istype(H.dna.species, /datum/species/jelly)))
C.adjustStaminaLoss(25) //boneless humanoids don't lose the will to live
to_chat(C, "<font color='red' size='4'><B>DOOT</B></span>")
spectral_change(H)
else //the sound will spook monkeys.
C.Jitter(15)
C.stuttering = 20
/datum/component/spooky/proc/spectral_change(mob/living/carbon/human/H, mob/user)
if((H.getStaminaLoss() > 95) && (!istype(H.dna.species, /datum/species/skeleton)) && (!istype(H.dna.species, /datum/species/golem)) && (!istype(H.dna.species, /datum/species/android)) && (!istype(H.dna.species, /datum/species/jelly)))
H.Knockdown(20)
H.set_species(/datum/species/skeleton)
H.visible_message("<span class='warning'>[H] has given up on life as a mortal.</span>")
var/T = get_turf(H)
if(too_spooky)
if(prob(30))
new/obj/item/device/instrument/saxophone/spectral(T)
else if(prob(30))
new/obj/item/device/instrument/trumpet/spectral(T)
else if(prob(30))
new/obj/item/device/instrument/trombone/spectral(T)
else
to_chat(H, "The spooky gods forgot to ship your instrument. Better luck next unlife.")
to_chat(H, "<B>You are the spooky skeleton!</B>")
to_chat(H, "A new life and identity has begun. Help your fellow skeletons into bringing out the spooky-pocalypse. You haven't forgotten your past life, and are still beholden to past loyalties.")
change_name(H) //time for a new name!
/datum/component/spooky/proc/change_name(mob/living/carbon/human/H)
var/t = stripped_input(H, "Enter your new skeleton name", H.real_name, null, MAX_NAME_LEN)
if(!t)
t = "spooky skeleton"
H.fully_replace_character_name(H.real_name, t)
+51
View File
@@ -0,0 +1,51 @@
/datum/component/turf_decal
var/dir
var/icon
var/icon_state
var/layer
var/group
/datum/component/turf_decal/Initialize(_dir, _icon, _icon_state, _layer=TURF_DECAL_LAYER, _group=TURF_DECAL_PAINT)
if(!isturf(parent) || !_icon || !_icon_state)
WARNING("A turf decal was applied incorrectly to [parent]: icon:[_icon ? _icon : "none"] icon_state:[_icon_state ? _icon_state : "none"]")
return COMPONENT_INCOMPATIBLE
dir = _dir
icon = _icon
icon_state = _icon_state
layer = _layer
group = _group
apply_decal()
RegisterSignal(COMSIG_ATOM_ROTATE, .proc/rotate_react)
RegisterSignal(COMSIG_COMPONENT_CLEAN_ACT, .proc/clean_react)
/datum/component/turf_decal/Destroy()
remove_decal()
return ..()
/datum/component/turf_decal/OnTransfer(turf/newT)
remove_decal()
remove_decal(newT)
apply_decal(newT)
/datum/component/turf_decal/proc/get_decal()
return image(icon, null, icon_state, layer, dir)
/datum/component/turf_decal/proc/apply_decal(turf/overT)
var/turf/master = overT || parent
master.add_decal(get_decal(), group)
/datum/component/turf_decal/proc/remove_decal(turf/overT)
var/turf/master = overT || parent
master.remove_decal(group)
/datum/component/turf_decal/proc/rotate_react(rotation, params)
if(params & ROTATE_DIR)
dir = angle2dir(rotation+dir2angle(dir))
remove_decal()
apply_decal()
/datum/component/turf_decal/proc/clean_react(strength)
if(strength >= CLEAN_IMPRESSIVE)
qdel(src)
+4 -6
View File
@@ -13,7 +13,7 @@
// Default implementation of clean-up code.
// This should be overridden to remove all references pointing to the object being destroyed.
// Return the appropriate QDEL_HINT; in most cases this is QDEL_HINT_QUEUE.
/datum/proc/Destroy(force=FALSE)
/datum/proc/Destroy(force=FALSE, ...)
tag = null
var/list/timers = active_timers
active_timers = null
@@ -25,14 +25,12 @@
var/list/dc = datum_components
if(dc)
var/all_components = dc[/datum/component]
if(islist(all_components))
if(length(all_components))
for(var/I in all_components)
var/datum/component/C = I
C._RemoveNoSignal()
qdel(C)
qdel(C, FALSE, TRUE)
else
var/datum/component/C = all_components
C._RemoveNoSignal()
qdel(C)
qdel(C, FALSE, TRUE)
dc.Cut()
return QDEL_HINT_QUEUE
+19 -17
View File
@@ -1,5 +1,6 @@
#define EXPLOSION_THROW_SPEED 4
#define REEBE_HUGBOX_COEFFICIENT 0.5
#define CITYOFCOGS_CAP_MULTIPLIER 0.5
#define MINING_CAP_MULTIPLIER 3
GLOBAL_LIST_EMPTY(explosions)
//Against my better judgement, I will return the explosion datum
@@ -53,21 +54,21 @@ GLOBAL_LIST_EMPTY(explosions)
var/orig_dev_range = devastation_range
var/orig_heavy_range = heavy_impact_range
var/orig_light_range = light_impact_range
if(!ignorecap && epicenter.z != ZLEVEL_MINING)
//Clamp all values to MAX_EXPLOSION_RANGE
devastation_range = min(GLOB.MAX_EX_DEVESTATION_RANGE, devastation_range)
heavy_impact_range = min(GLOB.MAX_EX_HEAVY_RANGE, heavy_impact_range)
light_impact_range = min(GLOB.MAX_EX_LIGHT_RANGE, light_impact_range)
flash_range = min(GLOB.MAX_EX_FLASH_RANGE, flash_range)
flame_range = min(GLOB.MAX_EX_FLAME_RANGE, flame_range)
if(!ignorecap && epicenter.z == ZLEVEL_CITYOFCOGS)
devastation_range = min(GLOB.MAX_EX_DEVESTATION_RANGE * REEBE_HUGBOX_COEFFICIENT, devastation_range)
heavy_impact_range = min(GLOB.MAX_EX_HEAVY_RANGE * REEBE_HUGBOX_COEFFICIENT, heavy_impact_range)
light_impact_range = min(GLOB.MAX_EX_LIGHT_RANGE * REEBE_HUGBOX_COEFFICIENT, light_impact_range)
flash_range = min(GLOB.MAX_EX_FLASH_RANGE * REEBE_HUGBOX_COEFFICIENT, flash_range)
flame_range = min(GLOB.MAX_EX_FLAME_RANGE * REEBE_HUGBOX_COEFFICIENT, flame_range)
//Zlevel specific bomb cap multiplier
var/cap_multiplier = 1
switch(epicenter.z)
if(ZLEVEL_CITYOFCOGS)
cap_multiplier = CITYOFCOGS_CAP_MULTIPLIER
if(ZLEVEL_MINING)
cap_multiplier = MINING_CAP_MULTIPLIER
if(!ignorecap)
devastation_range = min(GLOB.MAX_EX_DEVESTATION_RANGE * cap_multiplier, devastation_range)
heavy_impact_range = min(GLOB.MAX_EX_HEAVY_RANGE * cap_multiplier, heavy_impact_range)
light_impact_range = min(GLOB.MAX_EX_LIGHT_RANGE * cap_multiplier, light_impact_range)
flash_range = min(GLOB.MAX_EX_FLASH_RANGE * cap_multiplier, flash_range)
flame_range = min(GLOB.MAX_EX_FLAME_RANGE * cap_multiplier, flame_range)
//DO NOT REMOVE THIS STOPLAG, IT BREAKS THINGS
//not sleeping causes us to ex_act() the thing that triggered the explosion
@@ -397,4 +398,5 @@ GLOBAL_LIST_EMPTY(explosions)
// 5 explosion power is a (0, 1, 3) explosion.
// 1 explosion power is a (0, 0, 1) explosion.
#undef REEBE_HUGBOX_COEFFICIENT
#undef CITYOFCOGS_CAP_MULTIPLIER
#undef MINING_CAP_MULTIPLIER
+3 -2
View File
@@ -152,13 +152,14 @@
if(istype(teleatom, /obj/item/storage/backpack/holding))
precision = rand(1,100)
var/list/bagholding = teleatom.search_contents_for(/obj/item/storage/backpack/holding)
var/static/list/bag_cache = typecacheof(/obj/item/storage/backpack/holding)
var/list/bagholding = typecache_filter_list(teleatom.GetAllContents(), bag_cache)
if(bagholding.len)
precision = max(rand(1,100)*bagholding.len,100)
if(isliving(teleatom))
var/mob/living/MM = teleatom
to_chat(MM, "<span class='warning'>The bluespace interface on your bag of holding interferes with the teleport!</span>")
return 1
return TRUE
// Safe location finder
+47
View File
@@ -0,0 +1,47 @@
/datum/looping_sound/active_outside_ashstorm
mid_sounds = list(
'sound/weather/ashstorm/outside/active_mid1.ogg'=1,
'sound/weather/ashstorm/outside/active_mid1.ogg'=1,
'sound/weather/ashstorm/outside/active_mid1.ogg'=1
)
mid_length = 80
start_sound = 'sound/weather/ashstorm/outside/active_start.ogg'
start_length = 130
end_sound = 'sound/weather/ashstorm/outside/active_end.ogg'
volume = 80
/datum/looping_sound/active_inside_ashstorm
mid_sounds = list(
'sound/weather/ashstorm/inside/active_mid1.ogg'=1,
'sound/weather/ashstorm/inside/active_mid2.ogg'=1,
'sound/weather/ashstorm/inside/active_mid3.ogg'=1
)
mid_length = 80
start_sound = 'sound/weather/ashstorm/inside/active_start.ogg'
start_length = 130
end_sound = 'sound/weather/ashstorm/inside/active_end.ogg'
volume = 80
/datum/looping_sound/weak_outside_ashstorm
mid_sounds = list(
'sound/weather/ashstorm/outside/weak_mid1.ogg'=1,
'sound/weather/ashstorm/outside/weak_mid2.ogg'=1,
'sound/weather/ashstorm/outside/weak_mid3.ogg'=1
)
mid_length = 80
start_sound = 'sound/weather/ashstorm/outside/weak_start.ogg'
start_length = 130
end_sound = 'sound/weather/ashstorm/outside/weak_end.ogg'
volume = 50
/datum/looping_sound/weak_inside_ashstorm
mid_sounds = list(
'sound/weather/ashstorm/inside/weak_mid1.ogg'=1,
'sound/weather/ashstorm/inside/weak_mid2.ogg'=1,
'sound/weather/ashstorm/inside/weak_mid3.ogg'=1
)
mid_length = 80
start_sound = 'sound/weather/ashstorm/inside/weak_start.ogg'
start_length = 130
end_sound = 'sound/weather/ashstorm/inside/weak_end.ogg'
volume = 50
+9 -14
View File
@@ -13,7 +13,6 @@
//Order matters here.
var/list/transition_config = list(CENTCOM = SELFLOOPING,
CITY_OF_COGS = SELFLOOPING,
MAIN_STATION = CROSSLINKED,
EMPTY_AREA_1 = CROSSLINKED,
EMPTY_AREA_2 = CROSSLINKED,
@@ -69,12 +68,11 @@
map_path = json["map_path"]
map_file = json["map_file"]
minetype = json["minetype"]
allow_custom_shuttles = json["allow_custom_shuttles"]
minetype = json["minetype"] || minetype
allow_custom_shuttles = json["allow_custom_shuttles"] == TRUE
var/list/jtcl = json["transition_config"]
if(jtcl != "default")
var/jtcl = json["transition_config"]
if(jtcl && jtcl != "default")
transition_config.Cut()
for(var/I in jtcl)
@@ -87,25 +85,22 @@
CHECK_EXISTS("map_name")
CHECK_EXISTS("map_path")
CHECK_EXISTS("map_file")
CHECK_EXISTS("minetype")
CHECK_EXISTS("transition_config")
CHECK_EXISTS("allow_custom_shuttles")
var/path = GetFullMapPath(json["map_path"], json["map_file"])
if(!fexists(path))
log_world("Map file ([path]) does not exist!")
return
if(json["transition_config"] != "default")
if(!islist(json["transition_config"]))
var/tc = json["transition_config"]
if(tc != null && tc != "default")
if(!islist(tc))
log_world("transition_config is not a list!")
return
var/list/jtcl = json["transition_config"]
for(var/I in jtcl)
for(var/I in tc)
if(isnull(TransitionStringToEnum(I)))
log_world("Invalid transition_config option: [I]!")
if(isnull(TransitionStringToEnum(jtcl[I])))
if(isnull(TransitionStringToEnum(tc[I])))
log_world("Invalid transition_config option: [I]!")
return TRUE
+1 -1
View File
@@ -1039,7 +1039,7 @@
remove_wizard()
log_admin("[key_name(usr)] has de-wizard'ed [current].")
if("wizard")
if(has_antag_datum(/datum/antagonist/wizard))
if(!has_antag_datum(/datum/antagonist/wizard))
special_role = "Wizard"
add_antag_datum(/datum/antagonist/wizard)
message_admins("[key_name_admin(usr)] has wizard'ed [current].")
+18
View File
@@ -0,0 +1,18 @@
//these are real globals so you can use profiling to profile early world init stuff.
GLOBAL_REAL_VAR(list/PROFILE_STORE)
GLOBAL_REAL_VAR(PROFILE_LINE)
GLOBAL_REAL_VAR(PROFILE_FILE)
GLOBAL_REAL_VAR(PROFILE_SLEEPCHECK)
GLOBAL_REAL_VAR(PROFILE_TIME)
/proc/profile_show(user, sort = /proc/cmp_profile_avg_time_dsc)
sortTim(PROFILE_STORE, sort, TRUE)
var/list/lines = list()
for (var/entry in PROFILE_STORE)
var/list/data = PROFILE_STORE[entry]
lines += "[entry] => [num2text(data[PROFILE_ITEM_TIME], 10)]ms ([data[PROFILE_ITEM_COUNT]]) (avg:[num2text(data[PROFILE_ITEM_TIME]/(data[PROFILE_ITEM_COUNT] || 1), 99)])"
user << browse("<ol><li>[lines.Join("</li><li>")]</li></ol>", "window=[url_encode(GUID())]")
+1 -1
View File
@@ -142,7 +142,7 @@
/datum/map_template/ruin/lavaland/ufo_crash
name = "UFO Crash"
id = "ufo-crash"
description = "Turns out that keeping your abductees unconcious is really important. Who knew?"
description = "Turns out that keeping your abductees unconscious is really important. Who knew?"
suffix = "lavaland_surface_ufo_crash.dmm"
cost = 5
+1 -1
View File
@@ -149,7 +149,7 @@
suffix = "mini"
name = "Ministation emergency shuttle"
credit_cost = 1000
description = "Despite it's namesake, this shuttle is actually only slightly smaller than standard, and still complete with a brig and medbay."
description = "Despite its namesake, this shuttle is actually only slightly smaller than standard, and still complete with a brig and medbay."
/datum/map_template/shuttle/emergency/scrapheap
suffix = "scrapheap"
+2
View File
@@ -40,6 +40,8 @@
var/spawner_ref = pick(GLOB.mob_spawners[params["name"]])
var/obj/effect/mob_spawn/MS = locate(spawner_ref) in GLOB.poi_list
if(!MS)
return
switch(action)
if("jump")
+47 -4
View File
@@ -5,18 +5,15 @@
telegraph_message = "<span class='boldwarning'>An eerie moan rises on the wind. Sheets of burning ash blacken the horizon. Seek shelter.</span>"
telegraph_duration = 300
telegraph_sound = 'sound/lavaland/ash_storm_windup.ogg'
telegraph_overlay = "light_ash"
weather_message = "<span class='userdanger'><i>Smoldering clouds of scorching ash billow down around you! Get inside!</i></span>"
weather_duration_lower = 600
weather_duration_upper = 1200
weather_sound = 'sound/lavaland/ash_storm_start.ogg'
weather_overlay = "ash_storm"
end_message = "<span class='boldannounce'>The shrieking wind whips away the last of the ash and falls to its usual murmur. It should be safe to go outside now.</span>"
end_duration = 300
end_sound = 'sound/lavaland/ash_storm_end.ogg'
end_overlay = "light_ash"
area_type = /area/lavaland/surface/outdoors
@@ -26,6 +23,53 @@
probability = 90
var/datum/looping_sound/active_outside_ashstorm/sound_ao = new(list(), FALSE, TRUE)
var/datum/looping_sound/active_inside_ashstorm/sound_ai = new(list(), FALSE, TRUE)
var/datum/looping_sound/weak_outside_ashstorm/sound_wo = new(list(), FALSE, TRUE)
var/datum/looping_sound/weak_inside_ashstorm/sound_wi = new(list(), FALSE, TRUE)
/datum/weather/ash_storm/telegraph()
. = ..()
var/list/inside_areas = list()
var/list/outside_areas = list()
var/list/eligible_areas = SSmapping.areas_in_z["[target_z]"]
for(var/i in 1 to eligible_areas.len)
var/area/place = eligible_areas[i]
if(place.outdoors)
outside_areas += place
else
inside_areas += place
CHECK_TICK
sound_ao.output_atoms = outside_areas
sound_ai.output_atoms = inside_areas
sound_wo.output_atoms = outside_areas
sound_wi.output_atoms = inside_areas
sound_wo.start()
sound_wi.start()
/datum/weather/ash_storm/start()
. = ..()
sound_wo.stop()
sound_wi.stop()
sound_ao.start()
sound_ai.start()
/datum/weather/ash_storm/wind_down()
. = ..()
sound_ao.stop()
sound_ai.stop()
sound_wo.start()
sound_wi.start()
/datum/weather/ash_storm/end()
. = ..()
sound_wo.stop()
sound_wi.stop()
/datum/weather/ash_storm/proc/is_ash_immune(mob/living/L)
if(ismecha(L.loc)) //Mechs are immune
return TRUE
@@ -50,7 +94,6 @@
desc = "A passing ash storm blankets the area in harmless embers."
weather_message = "<span class='notice'>Gentle embers waft down around you like grotesque snow. The storm seems to have passed you by...</span>"
weather_sound = 'sound/lavaland/ash_storm_windup.ogg'
weather_overlay = "light_ash"
end_message = "<span class='notice'>The emberfall slows, stops. Another layer of hardened soot to the basalt beneath your feet.</span>"
+4 -4
View File
@@ -74,7 +74,7 @@
"white",
"yellow"
)
var/list/my_possible_colors = possible_colors.Copy()
for(var/wire in shuffle(wires))
@@ -163,9 +163,9 @@
for(var/wire in possible_wires)
if(prob(33))
pulse(wire)
remaining_pulses--
if(remaining_pulses >= 0)
break
remaining_pulses--
if(!remaining_pulses)
break
// Overridable Procs
/datum/wires/proc/interactable(mob/user)
+21 -23
View File
@@ -41,7 +41,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
power_environ = FALSE
valid_territory = FALSE
outdoors = TRUE
ambientsounds = list('sound/ambience/ambispace.ogg','sound/ambience/title2.ogg')
ambientsounds = SPACE
blob_allowed = FALSE //Eating up space doesn't count for victory as a blob.
/area/space/nearstation
@@ -65,6 +65,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
has_gravity = TRUE
blob_allowed = FALSE //Nope, no winning on the asteroid as a blob. Gotta eat the station.
valid_territory = FALSE
ambientsounds = MINING
/area/asteroid/cave
name = "Asteroid - Underground"
@@ -75,6 +76,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/asteroid/artifactroom
name = "Asteroid - Artifact"
icon_state = "cave"
ambientsounds = RUINS
/area/asteroid/artifactroom/Initialize()
. = ..()
@@ -96,14 +98,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
//Maintenance
/area/maintenance
ambientsounds = list('sound/ambience/ambimaint1.ogg',
'sound/ambience/ambimaint2.ogg',
'sound/ambience/ambimaint3.ogg',
'sound/ambience/ambimaint4.ogg',
'sound/ambience/ambimaint5.ogg',
'sound/voice/lowHiss2.ogg', //Xeno Breathing Hisses, Hahahaha I'm not even sorry.
'sound/voice/lowHiss3.ogg',
'sound/voice/lowHiss4.ogg')
ambientsounds = MAINTENANCE
valid_territory = FALSE
@@ -647,7 +642,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/chapel
icon_state = "chapel"
ambientsounds = list('sound/ambience/ambicha1.ogg','sound/ambience/ambicha2.ogg','sound/ambience/ambicha3.ogg','sound/ambience/ambicha4.ogg')
ambientsounds = HOLY
flags_1 = NONE
clockwork_warp_allowed = FALSE
clockwork_warp_fail = "The consecration here prevents you from warping in."
@@ -678,7 +673,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
//Engineering
/area/engine
ambientsounds = list('sound/ambience/ambisin1.ogg','sound/ambience/ambisin2.ogg','sound/ambience/ambisin3.ogg','sound/ambience/ambisin4.ogg')
ambientsounds = ENGINEERING
/area/engine/engine_smes
name = "Engineering SMES"
@@ -732,6 +727,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
valid_territory = FALSE
blob_allowed = FALSE
flags_1 = NONE
ambientsounds = ENGINEERING
/area/solar/asteroid/aft
name = "Aft Asteroid Solar"
@@ -858,37 +854,36 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
name = "Teleporter Room"
icon_state = "teleporter"
music = "signal"
ambientsounds = ENGINEERING
/area/teleporter/quantum/cargo
name = "Cargo Quantum Pad"
icon_state = "teleporter"
music = "signal"
/area/teleporter/quantum/docking
name = "Docking Quantum Pad"
icon_state = "teleporter"
music = "signal"
/area/teleporter/quantum/research
name = "Research Quantum Pad"
icon_state = "teleporter"
music = "signal"
/area/teleporter/quantum/security
name = "Security Quantum Pad"
icon_state = "teleporter"
music = "signal"
/area/gateway
name = "Gateway"
icon_state = "teleporter"
music = "signal"
ambientsounds = ENGINEERING
//MedBay
/area/medical
name = "Medical"
icon_state = "medbay3"
ambientsounds = MEDICAL
/area/medical/abandoned
name = "Abandoned Medbay"
@@ -952,7 +947,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/medical/morgue
name = "Morgue"
icon_state = "morgue"
ambientsounds = list('sound/ambience/ambimo1.ogg','sound/ambience/ambimo2.ogg')
ambientsounds = SPOOKY
/area/medical/chemistry
name = "Chemistry"
@@ -988,6 +983,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/security
name = "Security"
icon_state = "security"
ambientsounds = HIGHSEC
/area/security/main
name = "Security Office"
@@ -1029,7 +1025,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/security/detectives_office/private_investigators_office
name = "Private Investigator's Office"
icon_state = "detective"
ambientsounds = list('sound/ambience/ambidet1.ogg','sound/ambience/ambidet2.ogg')
/area/security/range
name = "Firing Range"
@@ -1310,6 +1305,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/construction
name = "Construction Area"
icon_state = "yellow"
ambientsounds = ENGINEERING
/area/construction/minisat_exterior
name = "Minisat Exterior"
@@ -1361,27 +1357,32 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/ai_monitored/security/armory
name = "Armory"
icon_state = "armory"
ambientsounds = HIGHSEC
/area/ai_monitored/storage/eva
name = "EVA Storage"
icon_state = "eva"
ambientsounds = HIGHSEC
/area/ai_monitored/storage/secure
name = "AI Satellite Storage"
icon_state = "storage"
ambientsounds = HIGHSEC
/area/ai_monitored/storage/emergency
name = "Emergency Storage"
icon_state = "storage"
ambientsounds = HIGHSEC
/area/ai_monitored/storage/satellite
name = "AI Satellite Maint"
icon_state = "storage"
ambientsounds = HIGHSEC
//Turret_protected
/area/ai_monitored/turret_protected
ambientsounds = list('sound/ambience/ambimalf.ogg')
ambientsounds = list('sound/ambience/ambimalf.ogg', 'sound/ambience/ambitech.ogg', 'sound/ambience/ambitech2.ogg', 'sound/ambience/ambiatmos.ogg', 'sound/ambience/ambiatmos2.ogg')
/area/ai_monitored/turret_protected/ai_upload
name = "AI Upload Chamber"
@@ -1450,7 +1451,8 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/tcommsat
clockwork_warp_allowed = FALSE
clockwork_warp_fail = "For safety reasons, warping here is disallowed; the radio and bluespace noise could cause catastrophic results."
ambientsounds = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg')
ambientsounds = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg', 'sound/ambience/ambitech.ogg',\
'sound/ambience/ambitech2.ogg', 'sound/ambience/ambitech3.ogg', 'sound/ambience/ambimystery.ogg')
/area/tcommsat/entrance
name = "Telecomms Teleporter"
@@ -1463,22 +1465,18 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/ai_monitored/turret_protected/tcomsat
name = "Telecomms Satellite"
icon_state = "tcomsatlob"
ambientsounds = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg')
/area/ai_monitored/turret_protected/tcomfoyer
name = "Telecomms Foyer"
icon_state = "tcomsatentrance"
ambientsounds = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg')
/area/ai_monitored/turret_protected/tcomwest
name = "Telecommunications Satellite West Wing"
icon_state = "tcomsatwest"
ambientsounds = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg')
/area/ai_monitored/turret_protected/tcomeast
name = "Telecommunications Satellite East Wing"
icon_state = "tcomsateast"
ambientsounds = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg')
/area/tcommsat/computer
name = "Telecomms Control Room"
+23 -9
View File
@@ -54,12 +54,7 @@
var/global/global_uid = 0
var/uid
var/list/ambientsounds = list('sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg',\
'sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg',\
'sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg',\
'sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg',\
'sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg',\
'sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg')
var/list/ambientsounds = GENERIC
flags_1 = CAN_BE_DIRTY_1
var/list/firedoors
@@ -107,7 +102,7 @@ GLOBAL_LIST_EMPTY(teleportlocs)
uid = ++global_uid
related = list(src)
map_name = name // Save the initial (the name set in the map) name of the area.
if(requires_power)
luminosity = 0
else
@@ -125,13 +120,32 @@ GLOBAL_LIST_EMPTY(teleportlocs)
. = ..()
power_change() // all machines set to current power level, also updates icon
blend_mode = BLEND_MULTIPLY // Putting this in the constructor so that it stops the icons being screwed up in the map editor.
if(!IS_DYNAMIC_LIGHTING(src))
add_overlay(/obj/effect/fullbright)
if(contents.len)
var/list/areas_in_z = SSmapping.areas_in_z
var/z
for(var/i in 1 to contents.len)
var/atom/thing = contents[i]
if(!thing)
continue
z = thing.z
break
if(!z)
WARNING("No z found for [src]")
return
if(!areas_in_z["[z]"])
areas_in_z["[z]"] = list()
areas_in_z["[z]"] += src
return INITIALIZE_HINT_LATELOAD
/area/LateInitialize()
power_change() // all machines set to current power level, also updates icon
/area/Destroy()
STOP_PROCESSING(SSobj, src)
return ..()
+2 -1
View File
@@ -8,6 +8,7 @@ Unused icons for new areas are "awaycontent1" ~ "awaycontent30"
name = "Strange Location"
icon_state = "away"
has_gravity = TRUE
ambientsounds = AWAY_MISSION
/area/awaymission/beach
name = "Beach"
@@ -15,7 +16,7 @@ Unused icons for new areas are "awaycontent1" ~ "awaycontent30"
dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
requires_power = FALSE
has_gravity = TRUE
ambientsounds = list('sound/ambience/shore.ogg', 'sound/ambience/seag1.ogg','sound/ambience/seag2.ogg','sound/ambience/seag2.ogg')
ambientsounds = list('sound/ambience/shore.ogg', 'sound/ambience/seag1.ogg','sound/ambience/seag2.ogg','sound/ambience/seag2.ogg','sound/ambience/ambiodd.ogg','sound/ambience/ambinice.ogg')
/area/awaymission/errorroom
name = "Super Secret Room"
+1
View File
@@ -96,6 +96,7 @@
noteleport = TRUE
blob_allowed = FALSE //Not... entirely sure this will ever come up... but if the bus makes blobs AND ops, it shouldn't aim for the ops to win.
flags_1 = NONE
ambientsounds = HIGHSEC
/area/syndicate_mothership/control
name = "Syndicate Control Room"

Some files were not shown because too many files have changed in this diff Show More