Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into IHAVENOIDEAWHATTHEFUCKIMDOING

This commit is contained in:
deathride58
2017-11-20 00:21:38 -05:00
1218 changed files with 80559 additions and 76738 deletions
+3
View File
@@ -192,3 +192,6 @@ Temporary Items
#Visual studio stuff
*.vscode/*
#GitHub Atom
.atom-build.json
+1 -1
View File
@@ -3,7 +3,7 @@ sudo: false
env:
global:
- BYOND_MAJOR="511"
- BYOND_MINOR="1380"
- BYOND_MINOR="1385"
- NODE_VERSION="4"
- BUILD_TOOLS=false
- BUILD_TESTING=false
View File
@@ -4,33 +4,25 @@
/area/template_noop)
"am" = (
/obj/structure/disposalpipe/segment{
dir = 4;
icon_state = "pipe-c";
invisibility = 101
dir = 6
},
/turf/closed/wall/r_wall,
/area/ruin/powered/clownplanet)
"an" = (
/obj/structure/disposalpipe/segment{
dir = 2;
icon_state = "pipe-c";
invisibility = 101
dir = 10
},
/turf/closed/wall/r_wall,
/area/ruin/powered/clownplanet)
"ao" = (
/obj/structure/disposalpipe/segment{
dir = 4;
icon_state = "pipe-c";
invisibility = 101
dir = 6
},
/turf/open/floor/plating,
/area/ruin/powered/clownplanet)
"ap" = (
/obj/structure/disposalpipe/segment{
dir = 2;
icon_state = "pipe-c";
invisibility = 101
dir = 10
},
/turf/open/floor/plating,
/area/ruin/powered/clownplanet)
@@ -63,9 +55,7 @@
/area/ruin/powered/clownplanet)
"at" = (
/obj/structure/disposalpipe/segment{
dir = 4;
icon_state = "pipe-c";
invisibility = 101
dir = 6
},
/turf/open/indestructible{
icon_state = "darkyellowfull";
@@ -79,10 +69,8 @@
/turf/open/floor/plating,
/area/ruin/powered/clownplanet)
"av" = (
/obj/structure/disposalpipe/sortjunction{
/obj/structure/disposalpipe/sorting/mail/flip{
dir = 1;
icon_state = "pipe-j2s";
invisibility = 101;
sortType = 3
},
/turf/closed/wall/r_wall,
@@ -106,9 +94,7 @@
/area/ruin/powered/clownplanet)
"ay" = (
/obj/structure/disposalpipe/segment{
dir = 1;
icon_state = "pipe-c";
invisibility = 101
dir = 5
},
/obj/effect/decal/cleanable/dirt,
/turf/open/indestructible{
@@ -139,9 +125,7 @@
/area/ruin/powered/clownplanet)
"aB" = (
/obj/structure/disposalpipe/segment{
dir = 8;
icon_state = "pipe-c";
invisibility = 101
dir = 9
},
/turf/open/indestructible{
icon_state = "darkyellowfull";
@@ -183,9 +167,7 @@
/area/ruin/powered/clownplanet)
"aG" = (
/obj/structure/disposalpipe/segment{
dir = 1;
icon_state = "pipe-c";
invisibility = 101
dir = 5
},
/turf/open/indestructible{
icon_state = "darkyellowfull";
@@ -194,9 +176,7 @@
/area/ruin/powered/clownplanet)
"aH" = (
/obj/structure/disposalpipe/segment{
dir = 8;
icon_state = "pipe-c";
invisibility = 101
dir = 9
},
/obj/effect/decal/cleanable/dirt,
/turf/open/indestructible{
@@ -206,9 +186,7 @@
/area/ruin/powered/clownplanet)
"aI" = (
/obj/structure/disposalpipe/segment{
dir = 1;
icon_state = "pipe-c";
invisibility = 101
dir = 5
},
/obj/item/bikehorn,
/turf/open/indestructible{
@@ -218,9 +196,7 @@
/area/ruin/powered/clownplanet)
"aJ" = (
/obj/structure/disposalpipe/segment{
dir = 1;
icon_state = "pipe-c";
invisibility = 101
dir = 5
},
/turf/closed/wall/r_wall,
/area/ruin/powered/clownplanet)
@@ -244,9 +220,7 @@
/area/ruin/powered/clownplanet)
"aM" = (
/obj/structure/disposalpipe/segment{
dir = 2;
icon_state = "pipe-c";
invisibility = 101
dir = 10
},
/turf/open/indestructible{
icon_state = "darkyellowfull";
@@ -273,9 +247,7 @@
/area/ruin/powered/clownplanet)
"aS" = (
/obj/structure/disposalpipe/segment{
dir = 8;
icon_state = "pipe-c";
invisibility = 101
dir = 9
},
/turf/open/floor/plating,
/area/ruin/powered/clownplanet)
@@ -295,9 +267,7 @@
/area/ruin/powered/clownplanet)
"aV" = (
/obj/structure/disposalpipe/segment{
dir = 2;
icon_state = "pipe-c";
invisibility = 101
dir = 10
},
/obj/effect/decal/cleanable/dirt,
/turf/open/indestructible{
@@ -362,9 +332,7 @@
/area/ruin/powered/clownplanet)
"bc" = (
/obj/structure/disposalpipe/segment{
dir = 4;
icon_state = "pipe-c";
invisibility = 101
dir = 6
},
/obj/effect/decal/cleanable/dirt,
/turf/open/indestructible{
@@ -397,9 +365,7 @@
/area/ruin/powered/clownplanet)
"bf" = (
/obj/structure/disposalpipe/segment{
dir = 2;
icon_state = "pipe-c";
invisibility = 101
dir = 10
},
/obj/effect/decal/cleanable/pie_smudge,
/turf/open/indestructible{
@@ -419,9 +385,7 @@
/area/ruin/powered/clownplanet)
"bh" = (
/obj/structure/disposalpipe/segment{
dir = 4;
icon_state = "pipe-c";
invisibility = 101
dir = 6
},
/turf/open/indestructible{
icon_state = "white"
@@ -429,9 +393,7 @@
/area/ruin/powered/clownplanet)
"bi" = (
/obj/structure/disposalpipe/segment{
dir = 2;
icon_state = "pipe-c";
invisibility = 101
dir = 10
},
/turf/open/indestructible{
icon_state = "white"
@@ -465,9 +427,7 @@
/area/ruin/powered/clownplanet)
"bm" = (
/obj/structure/disposalpipe/segment{
dir = 1;
icon_state = "pipe-c";
invisibility = 101
dir = 5
},
/turf/open/indestructible{
icon_state = "white"
@@ -475,9 +435,7 @@
/area/ruin/powered/clownplanet)
"bn" = (
/obj/structure/disposalpipe/segment{
dir = 8;
icon_state = "pipe-c";
invisibility = 101
dir = 9
},
/turf/open/indestructible{
icon_state = "white"
@@ -499,9 +457,7 @@
/area/ruin/powered/clownplanet)
"bs" = (
/obj/structure/disposalpipe/segment{
dir = 4;
icon_state = "pipe-c";
invisibility = 101
dir = 6
},
/turf/open/indestructible{
icon_state = "darkredfull"
@@ -509,18 +465,14 @@
/area/ruin/powered/clownplanet)
"bt" = (
/obj/structure/disposalpipe/segment{
dir = 1;
icon_state = "pipe-c";
invisibility = 101
dir = 5
},
/turf/open/floor/plating,
/area/ruin/powered/clownplanet)
"bu" = (
/obj/item/bikehorn,
/obj/structure/disposalpipe/segment{
dir = 2;
icon_state = "pipe-c";
invisibility = 101
dir = 10
},
/turf/open/indestructible{
icon_state = "darkyellowfull";
@@ -565,9 +517,8 @@
},
/area/ruin/powered/clownplanet)
"bC" = (
/obj/structure/disposalpipe/junction{
/obj/structure/disposalpipe/junction/yjunction{
dir = 1;
icon_state = "pipe-y";
invisibility = 101
},
/obj/effect/decal/cleanable/dirt,
@@ -587,9 +538,7 @@
"bE" = (
/obj/effect/decal/cleanable/oil,
/obj/structure/disposalpipe/segment{
dir = 2;
icon_state = "pipe-c";
invisibility = 101
dir = 10
},
/turf/open/floor/plating,
/area/ruin/powered/clownplanet)
@@ -633,9 +582,7 @@
/area/ruin/powered/clownplanet)
"bK" = (
/obj/structure/disposalpipe/segment{
dir = 8;
icon_state = "pipe-c";
invisibility = 101
dir = 9
},
/turf/open/indestructible{
icon_state = "darkredfull";
@@ -781,9 +728,7 @@
/area/ruin/powered/clownplanet)
"dD" = (
/obj/structure/disposalpipe/segment{
dir = 2;
icon_state = "pipe-c";
invisibility = 101
dir = 10
},
/obj/machinery/light/small{
dir = 4
@@ -795,9 +740,7 @@
/area/ruin/powered/clownplanet)
"dE" = (
/obj/structure/disposalpipe/segment{
dir = 2;
icon_state = "pipe-c";
invisibility = 101
dir = 10
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small{
@@ -835,9 +778,7 @@
/area/ruin/powered/clownplanet)
"dH" = (
/obj/structure/disposalpipe/segment{
dir = 8;
icon_state = "pipe-c";
invisibility = 101
dir = 9
},
/obj/machinery/light/small{
dir = 4
@@ -152,7 +152,9 @@
/turf/open/floor/plasteel/white,
/area/ruin/powered/animal_hospital)
"aB" = (
/obj/machinery/computer/operating,
/obj/machinery/computer/operating{
dir = 4
},
/turf/open/floor/plasteel/white,
/area/ruin/powered/animal_hospital)
"aC" = (
@@ -628,7 +630,7 @@
/area/lavaland/surface/outdoors)
"ca" = (
/obj/machinery/atmospherics/components/unary/tank/air{
dir = 4
dir = 1
},
/turf/open/floor/grass{
initial_gas_mix = "o2=14;n2=23;TEMP=300"
@@ -1,4 +1,4 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"aa" = (
/turf/template_noop,
/area/template_noop)
@@ -412,7 +412,9 @@
/turf/open/floor/pod/dark,
/area/ruin/powered/snow_biodome)
"UM" = (
/obj/machinery/computer/monitor,
/obj/machinery/computer/monitor{
dir = 1
},
/turf/open/floor/pod/dark,
/area/ruin/powered/snow_biodome)
"Wg" = (
@@ -201,8 +201,7 @@
/area/ruin/powered/seedvault)
"L" = (
/obj/structure/disposalpipe/segment{
dir = 1;
icon_state = "pipe-c"
dir = 5
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
@@ -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
+14 -76
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,18 +228,17 @@
/area/ruin/space/has_grav/abandonedzoo)
"aH" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel/darkgreen,
/area/ruin/space/has_grav/abandonedzoo)
"aI" = (
/obj/structure/table/reinforced,
/obj/machinery/computer/med_data/laptop,
/obj/machinery/computer/med_data/laptop{
dir = 8;
pixel_y = 1
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel{
@@ -278,17 +252,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 +275,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 +325,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 +336,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 +425,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 +432,6 @@
"bd" = (
/obj/machinery/power/terminal,
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel/darkgreen,
@@ -491,8 +449,6 @@
},
/obj/structure/cable,
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel{
@@ -542,7 +498,9 @@
},
/area/ruin/space/has_grav/abandonedzoo)
"bl" = (
/obj/machinery/computer/operating,
/obj/machinery/computer/operating{
dir = 8
},
/turf/open/floor/plasteel{
icon_state = "dark"
},
@@ -568,19 +526,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 +558,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 +566,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 +579,6 @@
/area/ruin/space/has_grav/abandonedzoo)
"bt" = (
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
},
/obj/machinery/shieldwallgen,
@@ -660,16 +604,14 @@
/area/ruin/space/has_grav/abandonedzoo)
"by" = (
/obj/structure/disposalpipe/segment{
dir = 4;
icon_state = "pipe-c"
dir = 6
},
/turf/closed/wall/r_wall,
/area/ruin/space/has_grav/abandonedzoo)
"bz" = (
/obj/machinery/space_heater,
/obj/structure/disposalpipe/segment{
dir = 8;
icon_state = "pipe-c"
dir = 9
},
/obj/machinery/light{
dir = 8
@@ -764,8 +706,6 @@
power = 1
},
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/obj/structure/cable,
@@ -780,8 +720,6 @@
/area/space)
"bS" = (
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/obj/structure/cable,
+5 -96
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,
@@ -610,7 +597,9 @@
/turf/open/floor/mineral/titanium/blue,
/area/ruin/space/has_grav/derelictoutpost/dockedship)
"bM" = (
/obj/machinery/computer,
/obj/machinery/computer{
dir = 1
},
/turf/open/floor/mineral/titanium/blue,
/area/ruin/space/has_grav/derelictoutpost/dockedship)
"bN" = (
@@ -736,13 +725,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 +741,6 @@
pixel_y = 2
},
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
},
/turf/open/floor/plasteel,
@@ -790,8 +774,6 @@
name = "gelatinous floor"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel,
@@ -837,8 +819,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 +831,6 @@
pixel_y = -24
},
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
},
/turf/open/floor/plasteel,
@@ -892,8 +871,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 +878,6 @@
"cq" = (
/obj/structure/barricade/wooden,
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel,
@@ -914,24 +889,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 +932,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 +946,6 @@
name = "gelatinous floor"
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel,
@@ -994,8 +957,6 @@
name = "checkpoint security doors"
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/door/firedoor,
@@ -1003,8 +964,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 +975,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 +1059,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 +1077,6 @@
name = "gelatinous floor"
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/item/mop,
@@ -1145,8 +1094,6 @@
name = "gelatinous floor"
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel,
@@ -1163,8 +1110,6 @@
name = "gelatinous floor"
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel,
@@ -1177,8 +1122,6 @@
},
/obj/structure/glowshroom/single,
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel,
@@ -1190,13 +1133,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 +1295,6 @@
},
/obj/machinery/light,
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/turf/open/floor/plasteel,
@@ -1374,8 +1311,6 @@
name = "gelatinous floor"
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel,
@@ -1397,8 +1332,6 @@
name = "pried-open airlock"
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plating,
@@ -1418,8 +1351,6 @@
name = "gelatinous floor"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/turf/open/floor/plating,
@@ -1515,8 +1446,6 @@
name = "gelatinous floor"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plating,
@@ -1639,8 +1568,6 @@
name = "gelatinous floor"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plating,
@@ -1725,8 +1652,6 @@
name = "gelatinous floor"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plating,
@@ -1777,8 +1702,6 @@
dir = 9
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plating,
@@ -1947,8 +1870,6 @@
name = "dried blood trail"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plating,
@@ -2012,9 +1933,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 +1991,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 +2037,6 @@
dir = 5
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel,
@@ -2186,8 +2101,6 @@
dir = 10
},
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/turf/open/floor/plasteel,
@@ -2204,8 +2117,6 @@
dir = 4
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plating,
@@ -2217,8 +2128,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)
+24 -4
View File
@@ -610,7 +610,9 @@
/turf/open/floor/mineral/titanium/blue/airless,
/area/ruin/unpowered)
"bZ" = (
/obj/machinery/computer,
/obj/machinery/computer{
dir = 8
},
/turf/open/floor/mineral/titanium/blue/airless,
/area/ruin/unpowered)
"ca" = (
@@ -1156,6 +1158,24 @@
},
/turf/open/floor/plating/asteroid/airless,
/area/ruin/unpowered/no_grav)
"dA" = (
/obj/machinery/computer{
dir = 1
},
/turf/open/floor/plasteel,
/area/ruin/powered)
"dB" = (
/obj/machinery/computer{
dir = 8
},
/turf/open/floor/mineral/plastitanium,
/area/ruin/powered)
"dC" = (
/obj/machinery/computer{
dir = 8
},
/turf/open/floor/mineral/plastitanium,
/area/ruin/powered)
(1,1,1) = {"
aa
@@ -1847,7 +1867,7 @@ aa
aa
ab
ce
cf
dB
ce
ab
aa
@@ -4269,7 +4289,7 @@ ab
ay
aG
aM
ay
dA
ab
aa
aa
@@ -4486,7 +4506,7 @@ aa
aa
ab
ce
cf
dC
ce
ab
aa
File diff suppressed because it is too large Load Diff
+21 -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{
@@ -3124,6 +2935,7 @@
/area/ruin/space/has_grav/deepstorage/power)
"fJ" = (
/obj/machinery/computer/atmos_control/tank{
dir = 8;
frequency = 1441;
input_tag = "o2_in_bunker";
name = "Oxygen Supply Control";
@@ -3246,8 +3058,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 +3069,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 +3086,6 @@
dir = 4
},
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
@@ -3294,8 +3100,6 @@
dir = 4
},
/obj/structure/cable/yellow{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/turf/open/floor/plasteel/floorgrime{
@@ -3374,14 +3178,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 +3198,6 @@
dir = 4
},
/obj/structure/cable/yellow{
d2 = 4;
icon_state = "0-4"
},
/turf/open/floor/plating{
@@ -3408,8 +3207,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 +3267,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 +3276,6 @@
"gr" = (
/obj/machinery/power/smes/engineering,
/obj/structure/cable/yellow{
d2 = 8;
icon_state = "0-8"
},
/obj/structure/sign/electricshock{
@@ -3496,8 +3290,6 @@
dir = 4
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel/floorgrime{
@@ -3507,13 +3299,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 +3372,6 @@
dir = 8
},
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel/floorgrime{
@@ -3602,6 +3388,7 @@
/area/ruin/space/has_grav/deepstorage/power)
"gC" = (
/obj/machinery/computer/atmos_control/tank{
dir = 8;
frequency = 1441;
input_tag = "n2_in_bunker";
name = "Nitrogen Supply Control";
@@ -3663,8 +3450,6 @@
dir = 8
},
/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/turf/open/floor/plating{
@@ -3673,13 +3458,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 +3473,6 @@
req_access_txt = "200"
},
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plating{
@@ -3703,8 +3482,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 +3527,6 @@
"gR" = (
/obj/structure/grille,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plating{
@@ -3761,13 +3536,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 +3594,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 +3693,6 @@
dir = 4
},
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/effect/turf_decal/stripes/corner{
@@ -3940,8 +3707,6 @@
dir = 4
},
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/firealarm{
@@ -3962,8 +3727,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 +3765,6 @@
"hp" = (
/obj/machinery/power/smes/engineering,
/obj/structure/cable/yellow{
d2 = 8;
icon_state = "0-8"
},
/turf/open/floor/plating{
@@ -55,7 +55,9 @@
/turf/open/floor/plating/asteroid/airless,
/area/ruin/unpowered/no_grav)
"m" = (
/obj/machinery/computer/message_monitor,
/obj/machinery/computer/message_monitor{
dir = 4
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/powered/listeningstation)
"n" = (
@@ -101,8 +103,7 @@
/area/ruin/space/has_grav/powered/listeningstation)
"s" = (
/obj/structure/disposalpipe/segment{
dir = 4;
icon_state = "pipe-c"
dir = 6
},
/turf/closed/mineral,
/area/ruin/unpowered/no_grav)
@@ -180,8 +181,7 @@
/area/ruin/space/has_grav/powered/listeningstation)
"F" = (
/obj/structure/disposalpipe/segment{
dir = 8;
icon_state = "pipe-c"
dir = 9
},
/turf/closed/mineral,
/area/ruin/unpowered/no_grav)
@@ -38,7 +38,9 @@
/turf/open/floor/mineral/titanium/blue,
/area/ruin/space/has_grav/powered/mechtransport)
"j" = (
/obj/machinery/computer/shuttle,
/obj/machinery/computer/shuttle{
dir = 8
},
/turf/open/floor/mineral/titanium/blue,
/area/ruin/space/has_grav/powered/mechtransport)
"k" = (
@@ -146,7 +148,9 @@
/turf/template_noop,
/area/template_noop)
"J" = (
/obj/machinery/computer/mecha,
/obj/machinery/computer/mecha{
dir = 8
},
/turf/open/floor/mineral/titanium/blue,
/area/ruin/space/has_grav/powered/mechtransport)
"K" = (
+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
@@ -29,7 +29,9 @@
},
/area/ruin/space/oldteleporter)
"h" = (
/obj/machinery/computer/teleporter,
/obj/machinery/computer/teleporter{
dir = 1
},
/turf/open/floor/plasteel/airless,
/area/ruin/space/oldteleporter)
"i" = (
+13 -118
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{
@@ -452,7 +426,6 @@
/area/ruin/space/has_grav/onehalf/hallway)
"bg" = (
/obj/structure/disposalpipe/broken{
icon_state = "pipe-b";
dir = 4
},
/obj/item/stack/cable_coil/cut{
@@ -470,13 +443,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 +457,6 @@
dir = 4
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel/airless{
@@ -501,25 +468,18 @@
dir = 4
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel/airless,
/area/ruin/space/has_grav/onehalf/hallway)
"bk" = (
/obj/structure/disposalpipe/junction{
icon_state = "pipe-j1";
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,25 +491,18 @@
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,
/area/ruin/space/has_grav/onehalf/hallway)
"bm" = (
/obj/structure/disposalpipe/junction{
icon_state = "pipe-j1";
dir = 4
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel/airless,
@@ -560,8 +513,6 @@
},
/obj/machinery/door/airlock/glass,
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel,
@@ -571,8 +522,6 @@
dir = 4
},
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/turf/open/floor/plasteel,
@@ -609,8 +558,7 @@
},
/area/ruin/space/has_grav/onehalf/drone_bay)
"bt" = (
/obj/structure/disposalpipe/junction{
icon_state = "pipe-y";
/obj/structure/disposalpipe/junction/yjunction{
dir = 1
},
/turf/open/floor/plasteel{
@@ -626,7 +574,6 @@
/area/ruin/space/has_grav/onehalf/drone_bay)
"bv" = (
/obj/structure/disposalpipe/broken{
icon_state = "pipe-b";
dir = 4
},
/turf/open/floor/plating/airless{
@@ -692,8 +639,7 @@
/area/ruin/space/has_grav/onehalf/drone_bay)
"bD" = (
/obj/structure/disposalpipe/junction{
dir = 8;
icon_state = "pipe-j1"
dir = 8
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/onehalf/drone_bay)
@@ -706,8 +652,7 @@
/area/ruin/space/has_grav/onehalf/drone_bay)
"bF" = (
/obj/structure/disposalpipe/segment{
dir = 8;
icon_state = "pipe-c"
dir = 9
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/onehalf/drone_bay)
@@ -843,8 +788,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 +799,6 @@
/area/ruin/space/has_grav/onehalf/bridge)
"cg" = (
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/obj/structure/table/reinforced,
@@ -868,7 +810,6 @@
/area/ruin/space/has_grav/onehalf/bridge)
"ch" = (
/obj/structure/disposalpipe/junction{
icon_state = "pipe-j1";
dir = 1
},
/obj/item/shard,
@@ -880,11 +821,9 @@
"ci" = (
/obj/structure/lattice,
/obj/structure/disposalpipe/broken{
icon_state = "pipe-b";
dir = 4
},
/obj/structure/disposalpipe/broken{
icon_state = "pipe-b";
dir = 8
},
/obj/item/stack/rods,
@@ -913,8 +852,7 @@
/area/ruin/space/has_grav/onehalf/bridge)
"cl" = (
/obj/structure/disposalpipe/segment{
dir = 2;
icon_state = "pipe-c"
dir = 10
},
/obj/structure/table/reinforced,
/obj/item/paper_bin{
@@ -939,13 +877,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 +889,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 +951,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 +969,6 @@
"cC" = (
/obj/structure/lattice,
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/turf/open/space,
@@ -1050,11 +976,9 @@
"cD" = (
/obj/structure/lattice,
/obj/structure/disposalpipe/broken{
icon_state = "pipe-b";
dir = 8
},
/obj/structure/disposalpipe/broken{
icon_state = "pipe-b";
dir = 1
},
/turf/template_noop,
@@ -1129,8 +1053,6 @@
"cO" = (
/obj/structure/lattice,
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/space,
@@ -1169,8 +1091,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 +1102,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 +1112,6 @@
/area/template_noop)
"cX" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel/airless{
@@ -1227,8 +1142,6 @@
"dc" = (
/obj/structure/grille/broken,
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plating/airless{
@@ -1246,13 +1159,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 +1173,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 +1187,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 +1205,6 @@
/area/template_noop)
"di" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/item/shard{
@@ -1312,13 +1215,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 +1226,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
@@ -52,6 +52,7 @@
/area/ruin/space/has_grav/whiteship/box)
"ak" = (
/obj/machinery/computer/pod{
dir = 8;
id = "oldship_ruin_gun"
},
/turf/open/floor/mineral/titanium,
@@ -211,7 +212,9 @@
/turf/open/floor/mineral/titanium,
/area/ruin/space/has_grav/whiteship/box)
"aM" = (
/obj/machinery/computer/shuttle/white_ship/ruin,
/obj/machinery/computer/shuttle/white_ship/ruin{
dir = 8
},
/turf/open/floor/mineral/titanium,
/area/ruin/space/has_grav/whiteship/box)
"aN" = (
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,
+82 -69
View File
@@ -626,8 +626,7 @@
/area/awaymission/centcomAway/cafe)
"cq" = (
/obj/structure/disposalpipe/segment{
dir = 1;
icon_state = "pipe-c"
dir = 5
},
/turf/open/floor/plasteel/grimy,
/area/awaymission/centcomAway/cafe)
@@ -751,8 +750,7 @@
/area/awaymission/centcomAway/hangar)
"cS" = (
/obj/structure/disposalpipe/segment{
dir = 4;
icon_state = "pipe-c"
dir = 6
},
/turf/open/floor/plasteel/grimy,
/area/awaymission/centcomAway/cafe)
@@ -764,7 +762,9 @@
},
/area/awaymission/centcomAway/general)
"cU" = (
/obj/machinery/computer/secure_data,
/obj/machinery/computer/secure_data{
dir = 4
},
/turf/open/floor/mineral/titanium/yellow,
/area/awaymission/centcomAway/hangar)
"cV" = (
@@ -1350,7 +1350,9 @@
/turf/open/floor/mineral/titanium/blue,
/area/awaymission/centcomAway/hangar)
"fb" = (
/obj/structure/frame/computer,
/obj/structure/frame/computer{
dir = 1
},
/turf/open/floor/mineral/titanium/blue,
/area/awaymission/centcomAway/hangar)
"fc" = (
@@ -1554,15 +1556,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 +1570,6 @@
/obj/machinery/power/smes,
/obj/structure/cable,
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
},
/turf/open/floor/plating,
@@ -1852,7 +1850,9 @@
/turf/open/floor/plating,
/area/awaymission/centcomAway/general)
"gN" = (
/obj/machinery/computer/robotics,
/obj/machinery/computer/robotics{
dir = 4
},
/turf/open/floor/plasteel{
icon_state = "floor"
},
@@ -1874,7 +1874,9 @@
},
/area/awaymission/centcomAway/general)
"gQ" = (
/obj/machinery/computer/med_data,
/obj/machinery/computer/med_data{
dir = 8
},
/turf/open/floor/plasteel{
icon_state = "floor"
},
@@ -1914,7 +1916,9 @@
/turf/open/floor/plating,
/area/awaymission/centcomAway/general)
"gY" = (
/obj/machinery/computer/card,
/obj/machinery/computer/card{
dir = 4
},
/turf/open/floor/plasteel{
icon_state = "floor"
},
@@ -1926,7 +1930,9 @@
},
/area/awaymission/centcomAway/general)
"ha" = (
/obj/machinery/computer/crew,
/obj/machinery/computer/crew{
dir = 8
},
/turf/open/floor/plasteel{
icon_state = "floor"
},
@@ -1984,19 +1990,25 @@
},
/area/awaymission/centcomAway/general)
"hl" = (
/obj/machinery/computer/secure_data,
/obj/machinery/computer/secure_data{
dir = 1
},
/turf/open/floor/plasteel{
icon_state = "floor"
},
/area/awaymission/centcomAway/general)
"hm" = (
/obj/machinery/computer/communications,
/obj/machinery/computer/communications{
dir = 1
},
/turf/open/floor/plasteel{
icon_state = "floor"
},
/area/awaymission/centcomAway/general)
"hn" = (
/obj/machinery/computer/security,
/obj/machinery/computer/security{
dir = 1
},
/turf/open/floor/plasteel{
icon_state = "floor"
},
@@ -2165,9 +2177,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 +2259,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)
@@ -2588,11 +2597,15 @@
/turf/open/floor/plasteel/black,
/area/awaymission/centcomAway/general)
"jo" = (
/obj/machinery/computer/secure_data,
/obj/machinery/computer/secure_data{
dir = 1
},
/turf/open/floor/plasteel/black,
/area/awaymission/centcomAway/general)
"jp" = (
/obj/machinery/computer/card,
/obj/machinery/computer/card{
dir = 1
},
/turf/open/floor/plasteel/black,
/area/awaymission/centcomAway/general)
"jq" = (
@@ -2615,12 +2628,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" = (
@@ -2959,7 +2968,9 @@
/turf/open/floor/plasteel/black,
/area/awaymission/centcomAway/general)
"kt" = (
/obj/machinery/computer/secure_data,
/obj/machinery/computer/secure_data{
dir = 8
},
/turf/open/floor/plasteel/vault{
dir = 1
},
@@ -2991,7 +3002,9 @@
},
/area/awaymission/centcomAway/general)
"ky" = (
/obj/machinery/computer/card,
/obj/machinery/computer/card{
dir = 8
},
/turf/open/floor/plasteel/vault{
dir = 1
},
@@ -3545,8 +3558,7 @@
/area/awaymission/centcomAway/thunderdome)
"ml" = (
/obj/structure/disposalpipe/segment{
dir = 8;
icon_state = "pipe-c"
dir = 9
},
/turf/open/floor/plasteel/vault{
dir = 8
@@ -3568,7 +3580,9 @@
},
/area/awaymission/centcomAway/thunderdome)
"mo" = (
/obj/structure/frame/computer,
/obj/structure/frame/computer{
dir = 1
},
/turf/open/floor/plasteel/redyellow{
dir = 5
},
@@ -3644,8 +3658,7 @@
/area/awaymission/centcomAway/maint)
"my" = (
/obj/structure/disposalpipe/segment{
dir = 2;
icon_state = "pipe-c"
dir = 10
},
/turf/open/floor/plasteel/vault{
dir = 8
@@ -10523,12 +10536,12 @@ hG
hG
aV
aa
iC
fw
ev
gW
gW
ev
iC
fw
aa
aV
aV
@@ -11189,7 +11202,7 @@ jW
fv
eD
ff
iC
fw
aa
aa
aa
@@ -11314,9 +11327,9 @@ hW
eu
hI
eD
iC
fw
jD
iC
fw
eD
ff
eu
@@ -11543,7 +11556,7 @@ aG
ak
dq
aG
dS
ad
ed
eu
eD
@@ -11673,7 +11686,7 @@ aG
ak
aH
aG
dT
af
ee
eu
cs
@@ -12193,7 +12206,7 @@ ai
aI
aI
ai
dS
ad
eg
eu
bN
@@ -12323,7 +12336,7 @@ ai
aJ
aJ
ai
dU
ae
ee
eu
cd
@@ -12367,7 +12380,7 @@ eV
kF
kG
eu
kM
gM
gX
jK
eu
@@ -12453,7 +12466,7 @@ ai
dC
aJ
ai
dT
af
eh
eu
cs
@@ -12462,7 +12475,7 @@ dw
fw
eF
ff
ge
fw
gs
eD
gN
@@ -12489,7 +12502,7 @@ eV
eu
mO
eu
kk
eV
eu
ku
kz
@@ -12739,7 +12752,7 @@ eD
eD
eD
fY
fx
fw
eD
eD
eD
@@ -12750,7 +12763,7 @@ eD
eD
eD
ff
fx
fw
kw
kw
kw
@@ -12844,7 +12857,7 @@ ai
ai
ai
ai
ei
aK
gW
gW
eV
@@ -12852,7 +12865,7 @@ eD
eD
eD
ff
gg
fv
gv
gG
eD
@@ -12890,7 +12903,7 @@ hz
gW
gW
gW
kM
gM
jK
kS
lc
@@ -12982,7 +12995,7 @@ dJ
eD
eD
ff
ge
fw
gw
eD
eD
@@ -13248,7 +13261,7 @@ eD
gQ
ha
lM
fx
fw
hI
eD
eu
@@ -13407,7 +13420,7 @@ eV
gc
fP
eu
kM
gM
gX
jK
eu
@@ -13499,7 +13512,7 @@ eu
eJ
eJ
eJ
fx
fw
fi
fY
gi
@@ -14041,7 +14054,7 @@ aa
aa
eu
jG
iC
fw
eD
eD
eD
@@ -14173,11 +14186,11 @@ eu
eu
eu
jP
jT
fu
jU
eu
jU
kb
fu
jP
gf
jP
@@ -14309,7 +14322,7 @@ aa
aa
fv
fr
gg
fv
fr
fv
aa
@@ -14431,17 +14444,17 @@ aa
aa
aa
aa
iC
fw
jP
iC
fw
aa
aa
aa
iC
fw
jP
km
fw
jP
iC
fw
aa
aa
aa
+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,
+25 -200
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.";
@@ -3459,8 +3336,7 @@
"gv" = (
/obj/structure/disposalpipe/segment{
desc = "An underfloor disposal pipe. This one has been applied with an acid-proof coating.";
dir = 2;
icon_state = "pipe-c";
dir = 10;
name = "Acid-Proof disposal pipe"
},
/obj/structure/alien/weeds,
@@ -3500,7 +3376,9 @@
},
/area/awaymission/moonoutpost19/research)
"gA" = (
/obj/machinery/computer/monitor,
/obj/machinery/computer/monitor{
dir = 1
},
/obj/structure/cable,
/turf/open/floor/plating{
heat_capacity = 1e+006
@@ -3633,8 +3511,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 +3528,6 @@
/area/awaymission/moonoutpost19/research)
"gN" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/item/stack/rods,
@@ -3674,6 +3549,7 @@
},
/obj/machinery/computer/security{
desc = "Used to access the various cameras on the outpost.";
dir = 4;
network = list("MO19R","MO19")
},
/turf/open/floor/plasteel/red/side{
@@ -3731,7 +3607,9 @@
},
/area/awaymission/moonoutpost19/research)
"gU" = (
/obj/machinery/computer/operating,
/obj/machinery/computer/operating{
dir = 8
},
/obj/structure/alien/weeds,
/turf/open/floor/plasteel/white/side{
dir = 1;
@@ -3824,8 +3702,6 @@
/area/awaymission/moonoutpost19/research)
"hd" = (
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/obj/effect/decal/cleanable/cobweb,
@@ -3835,8 +3711,6 @@
/area/awaymission/moonoutpost19/research)
"he" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
@@ -3846,8 +3720,6 @@
/area/awaymission/moonoutpost19/research)
"hf" = (
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/obj/effect/decal/cleanable/dirt,
@@ -3941,8 +3813,6 @@
/area/awaymission/moonoutpost19/research)
"hp" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/effect/decal/cleanable/oil,
@@ -4278,8 +4148,6 @@
/area/awaymission/moonoutpost19/arrivals)
"hW" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plating{
@@ -4635,8 +4503,6 @@
/area/awaymission/moonoutpost19/arrivals)
"iE" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
@@ -4971,8 +4837,6 @@
/area/awaymission/moonoutpost19/arrivals)
"jp" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/effect/decal/cleanable/oil,
@@ -5117,8 +4981,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 +5087,6 @@
/area/awaymission/moonoutpost19/arrivals)
"jS" = (
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/turf/open/floor/plating{
@@ -5236,8 +5097,6 @@
/area/awaymission/moonoutpost19/research)
"jT" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/light/small{
@@ -5250,8 +5109,6 @@
/area/awaymission/moonoutpost19/arrivals)
"jU" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel{
@@ -5260,8 +5117,6 @@
/area/awaymission/moonoutpost19/arrivals)
"jV" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel/floorgrime{
@@ -5271,8 +5126,6 @@
/area/awaymission/moonoutpost19/arrivals)
"jW" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
@@ -5282,8 +5135,6 @@
/area/awaymission/moonoutpost19/arrivals)
"jX" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/item/cigbutt,
@@ -5297,8 +5148,6 @@
dir = 1
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/airalarm{
@@ -5314,8 +5163,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 +5172,6 @@
/area/awaymission/moonoutpost19/arrivals)
"ka" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
@@ -5337,8 +5182,6 @@
/area/awaymission/moonoutpost19/arrivals)
"kb" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/door/firedoor{
@@ -5352,8 +5195,6 @@
/area/awaymission/moonoutpost19/arrivals)
"kc" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel{
@@ -5367,8 +5208,6 @@
/area/awaymission/moonoutpost19/arrivals)
"kd" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel{
@@ -5382,8 +5221,6 @@
/area/awaymission/moonoutpost19/arrivals)
"ke" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
@@ -5399,8 +5236,6 @@
dir = 1
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel/floorgrime{
@@ -5412,8 +5247,6 @@
/area/awaymission/moonoutpost19/arrivals)
"kg" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel{
@@ -5427,8 +5260,6 @@
/area/awaymission/moonoutpost19/arrivals)
"kh" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plating{
@@ -5441,8 +5272,6 @@
/area/awaymission/moonoutpost19/arrivals)
"ki" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel{
@@ -5456,8 +5285,6 @@
/area/awaymission/moonoutpost19/arrivals)
"kj" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
@@ -5474,8 +5301,6 @@
"kk" = (
/obj/machinery/light/small,
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel/floorgrime{
@@ -5485,8 +5310,6 @@
/area/awaymission/moonoutpost19/arrivals)
"kl" = (
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/obj/effect/decal/cleanable/dirt,
@@ -6548,7 +6371,9 @@
/turf/open/floor/plasteel/black,
/area/awaymission/moonoutpost19/arrivals)
"mG" = (
/obj/machinery/computer/shuttle,
/obj/machinery/computer/shuttle{
dir = 4
},
/turf/open/floor/mineral/titanium/blue,
/area/awaymission/moonoutpost19/arrivals)
"mH" = (
File diff suppressed because it is too large Load Diff
+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,
+39 -12
View File
@@ -184,7 +184,9 @@
/turf/open/floor/mineral/plastitanium,
/area/awaymission/spacebattle/syndicate3)
"aK" = (
/obj/machinery/computer/shuttle,
/obj/machinery/computer/shuttle{
dir = 1
},
/turf/open/floor/mineral/plastitanium,
/area/awaymission/spacebattle/syndicate2)
"aL" = (
@@ -327,6 +329,7 @@
/area/awaymission/spacebattle/syndicate3)
"bj" = (
/obj/machinery/computer/pod{
dir = 1;
id = "spacebattlepod3";
name = "Hull Door Control"
},
@@ -388,7 +391,9 @@
/turf/open/floor/mineral/plastitanium,
/area/awaymission/spacebattle/syndicate1)
"bu" = (
/obj/machinery/computer/shuttle,
/obj/machinery/computer/shuttle{
dir = 1
},
/turf/open/floor/mineral/plastitanium,
/area/awaymission/spacebattle/syndicate3)
"bv" = (
@@ -436,7 +441,9 @@
},
/area/awaymission/spacebattle/syndicate1)
"bC" = (
/obj/machinery/computer/shuttle,
/obj/machinery/computer/shuttle{
dir = 1
},
/turf/open/floor/mineral/plastitanium,
/area/awaymission/spacebattle/syndicate1)
"bD" = (
@@ -564,7 +571,9 @@
/turf/open/floor/engine,
/area/awaymission/spacebattle/cruiser)
"bZ" = (
/obj/machinery/computer/telecomms/monitor,
/obj/machinery/computer/telecomms/monitor{
dir = 4
},
/turf/open/floor/plasteel,
/area/awaymission/spacebattle/cruiser)
"ca" = (
@@ -574,6 +583,7 @@
/area/awaymission/spacebattle/cruiser)
"cb" = (
/obj/machinery/computer/pod{
dir = 1;
id = "spacebattlepod";
name = "Hull Door Control"
},
@@ -861,6 +871,7 @@
/area/awaymission/spacebattle/syndicate3)
"dc" = (
/obj/machinery/computer/pod{
dir = 1;
id = "spacebattlepod2";
name = "Hull Door Control"
},
@@ -1357,7 +1368,9 @@
/turf/open/floor/plasteel,
/area/awaymission/spacebattle/cruiser)
"eP" = (
/obj/machinery/computer/med_data,
/obj/machinery/computer/med_data{
dir = 8
},
/turf/open/floor/plasteel/blue,
/area/awaymission/spacebattle/cruiser)
"eQ" = (
@@ -1412,7 +1425,9 @@
/turf/open/floor/plasteel,
/area/awaymission/spacebattle/cruiser)
"eZ" = (
/obj/machinery/computer/crew,
/obj/machinery/computer/crew{
dir = 8
},
/turf/open/floor/plasteel/blue,
/area/awaymission/spacebattle/cruiser)
"fa" = (
@@ -1548,7 +1563,9 @@
/turf/open/floor/plasteel,
/area/awaymission/spacebattle/cruiser)
"fv" = (
/obj/machinery/computer/shuttle,
/obj/machinery/computer/shuttle{
dir = 8
},
/turf/open/floor/plasteel/blue,
/area/awaymission/spacebattle/cruiser)
"fw" = (
@@ -1670,7 +1687,9 @@
},
/area/awaymission/spacebattle/cruiser)
"fP" = (
/obj/machinery/computer/communications,
/obj/machinery/computer/communications{
dir = 8
},
/turf/open/floor/plasteel/blue,
/area/awaymission/spacebattle/cruiser)
"fQ" = (
@@ -1944,7 +1963,9 @@
/turf/open/floor/mineral/plastitanium,
/area/awaymission/spacebattle/cruiser)
"gK" = (
/obj/machinery/computer/security,
/obj/machinery/computer/security{
dir = 8
},
/turf/open/floor/plasteel/blue,
/area/awaymission/spacebattle/cruiser)
"gL" = (
@@ -1957,7 +1978,9 @@
/turf/open/floor/wood,
/area/awaymission/spacebattle/cruiser)
"gN" = (
/obj/machinery/computer/secure_data,
/obj/machinery/computer/secure_data{
dir = 8
},
/turf/open/floor/plasteel/blue,
/area/awaymission/spacebattle/cruiser)
"gO" = (
@@ -2269,7 +2292,9 @@
/turf/open/floor/plasteel,
/area/awaymission/spacebattle/cruiser)
"hS" = (
/obj/machinery/computer/shuttle,
/obj/machinery/computer/shuttle{
dir = 4
},
/turf/open/floor/mineral/plastitanium,
/area/awaymission/spacebattle/syndicate7)
"hT" = (
@@ -2961,7 +2986,9 @@
/turf/open/floor/plating,
/area/awaymission/spacebattle/cruiser)
"kn" = (
/obj/machinery/computer/mech_bay_power_console,
/obj/machinery/computer/mech_bay_power_console{
dir = 8
},
/turf/open/floor/plating,
/area/awaymission/spacebattle/cruiser)
"ko" = (
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+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,
+177 -119
View File
@@ -677,7 +677,9 @@
/obj/structure/cable/white{
icon_state = "0-2"
},
/obj/machinery/modular_computer/console/preset/command,
/obj/machinery/modular_computer/console/preset/command{
dir = 4
},
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -2981,7 +2983,9 @@
},
/area/crew_quarters/heads/hop)
"afA" = (
/obj/machinery/computer/secure_data,
/obj/machinery/computer/secure_data{
dir = 8
},
/obj/machinery/ai_status_display{
pixel_x = 32
},
@@ -3052,7 +3056,9 @@
pixel_x = 24;
pixel_y = -8
},
/obj/machinery/computer/cargo,
/obj/machinery/computer/cargo{
dir = 8
},
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/quartermaster/storage)
@@ -3144,7 +3150,9 @@
/turf/open/floor/plasteel/grimy,
/area/security/detectives_office)
"afT" = (
/obj/machinery/computer/med_data,
/obj/machinery/computer/med_data{
dir = 8
},
/obj/machinery/requests_console{
department = "Detective's Office";
departmentType = 0;
@@ -3421,7 +3429,9 @@
},
/area/crew_quarters/heads/hop)
"agt" = (
/obj/machinery/computer/card,
/obj/machinery/computer/card{
dir = 8
},
/obj/machinery/status_display{
pixel_x = 32
},
@@ -3610,7 +3620,9 @@
/turf/open/floor/plasteel/grimy,
/area/security/detectives_office)
"agM" = (
/obj/machinery/computer/secure_data,
/obj/machinery/computer/secure_data{
dir = 8
},
/obj/machinery/light{
dir = 4
},
@@ -4180,7 +4192,9 @@
/turf/open/floor/plasteel,
/area/crew_quarters/heads/captain/private)
"ahI" = (
/obj/machinery/computer/communications,
/obj/machinery/computer/communications{
dir = 1
},
/obj/machinery/status_display{
pixel_y = -32
},
@@ -4191,7 +4205,9 @@
/turf/open/floor/carpet,
/area/crew_quarters/heads/captain/private)
"ahJ" = (
/obj/machinery/computer/card,
/obj/machinery/computer/card{
dir = 1
},
/obj/machinery/ai_status_display{
pixel_y = -32
},
@@ -6702,15 +6718,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{
@@ -6804,7 +6814,9 @@
/turf/open/floor/plasteel/brown,
/area/quartermaster/storage)
"amx" = (
/obj/machinery/computer/cargo,
/obj/machinery/computer/cargo{
dir = 8
},
/turf/open/floor/plasteel/brown,
/area/quartermaster/storage)
"amy" = (
@@ -7821,7 +7833,9 @@
/turf/open/floor/plasteel/red/side,
/area/security/brig)
"aou" = (
/obj/machinery/computer/security,
/obj/machinery/computer/security{
dir = 1
},
/obj/structure/cable/white{
icon_state = "4-8"
},
@@ -7976,7 +7990,9 @@
/turf/open/floor/plasteel,
/area/teleporter)
"aoI" = (
/obj/machinery/computer/teleporter,
/obj/machinery/computer/teleporter{
dir = 8
},
/obj/machinery/newscaster{
pixel_x = 32
},
@@ -8871,7 +8887,9 @@
/turf/open/floor/plasteel/brown/corner,
/area/hallway/primary/central)
"aqj" = (
/obj/machinery/computer/cargo/request,
/obj/machinery/computer/cargo/request{
dir = 1
},
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
@@ -8964,7 +8982,9 @@
},
/area/quartermaster/miningdock)
"aqs" = (
/obj/machinery/computer/shuttle/mining,
/obj/machinery/computer/shuttle/mining{
dir = 8
},
/turf/open/floor/plasteel/brown{
dir = 4
},
@@ -9050,10 +9070,10 @@
/turf/closed/wall/r_wall,
/area/engine/atmos)
"aqE" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/effect/spawner/structure/window/plasma/reinforced,
/turf/open/floor/plating,
/area/engine/atmos)
"aqF" = (
@@ -9393,7 +9413,9 @@
},
/area/quartermaster/miningdock)
"arm" = (
/obj/machinery/computer/security/mining,
/obj/machinery/computer/security/mining{
dir = 8
},
/obj/machinery/status_display{
pixel_x = 32
},
@@ -10384,7 +10406,9 @@
/turf/open/floor/plasteel,
/area/security/brig)
"asR" = (
/obj/machinery/computer/security,
/obj/machinery/computer/security{
dir = 1
},
/obj/machinery/firealarm{
dir = 1;
pixel_x = -26;
@@ -10406,7 +10430,9 @@
},
/area/security/brig)
"asS" = (
/obj/machinery/computer/secure_data,
/obj/machinery/computer/secure_data{
dir = 1
},
/obj/machinery/light/small,
/obj/machinery/newscaster/security_unit{
pixel_y = -32
@@ -10695,8 +10721,8 @@
/turf/open/floor/engine/n2,
/area/engine/atmos)
"aty" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/cyan/visible,
/obj/effect/spawner/structure/window/plasma/reinforced,
/turf/open/floor/plating,
/area/engine/atmos)
"atz" = (
@@ -10711,6 +10737,7 @@
/area/engine/atmos)
"atA" = (
/obj/machinery/computer/atmos_control/tank{
dir = 4;
frequency = 1441;
input_tag = "n2_in";
name = "Nitrogen Supply Control";
@@ -12627,6 +12654,7 @@
/area/engine/atmos)
"axk" = (
/obj/machinery/computer/atmos_control/tank{
dir = 4;
frequency = 1441;
input_tag = "o2_in";
name = "Oxygen Supply Control";
@@ -12772,12 +12800,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 +12814,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{
@@ -13734,7 +13754,9 @@
/turf/open/floor/plasteel/neutral,
/area/engine/atmos)
"azz" = (
/obj/machinery/computer/atmos_alert,
/obj/machinery/computer/atmos_alert{
dir = 8
},
/obj/structure/cable/white{
icon_state = "1-8"
},
@@ -14203,7 +14225,9 @@
/turf/open/floor/plasteel/neutral,
/area/engine/atmos)
"aAB" = (
/obj/machinery/computer/station_alert,
/obj/machinery/computer/station_alert{
dir = 8
},
/obj/structure/cable/white{
icon_state = "1-4"
},
@@ -14477,7 +14501,9 @@
},
/area/hallway/primary/central)
"aBc" = (
/obj/machinery/computer/security,
/obj/machinery/computer/security{
dir = 4
},
/obj/machinery/newscaster/security_unit{
pixel_x = -32
},
@@ -14490,7 +14516,9 @@
/turf/open/floor/plasteel/red/side,
/area/hallway/secondary/exit)
"aBe" = (
/obj/machinery/computer/secure_data,
/obj/machinery/computer/secure_data{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/red/side,
/area/hallway/secondary/exit)
@@ -14561,7 +14589,9 @@
},
/area/shuttle/escape)
"aBn" = (
/obj/machinery/computer/crew,
/obj/machinery/computer/crew{
dir = 8
},
/obj/machinery/ai_status_display{
pixel_x = 32
},
@@ -14585,6 +14615,7 @@
/area/engine/atmos)
"aBq" = (
/obj/machinery/computer/atmos_control/tank{
dir = 4;
frequency = 1441;
input_tag = "air_in";
name = "Mixed Air Supply Control";
@@ -14737,7 +14768,9 @@
/turf/open/floor/plasteel/caution,
/area/engine/atmos)
"aBI" = (
/obj/machinery/computer/atmos_control,
/obj/machinery/computer/atmos_control{
dir = 1
},
/obj/machinery/light_switch{
pixel_x = 38;
pixel_y = -24
@@ -18280,9 +18313,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{
@@ -18601,17 +18632,13 @@
/turf/open/floor/plasteel,
/area/crew_quarters/kitchen)
"aIW" = (
/obj/structure/sink/kitchen{
desc = "A sink used for washing one's hands and face. It looks rusty and home-made";
name = "sink";
pixel_y = 28
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/effect/turf_decal/stripes/line{
dir = 6
},
/obj/structure/reagent_dispensers/cooking_oil,
/turf/open/floor/plasteel,
/area/crew_quarters/kitchen)
"aIX" = (
@@ -18900,18 +18927,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,
@@ -18964,7 +18983,9 @@
/obj/structure/cable/white{
icon_state = "2-4"
},
/obj/machinery/computer/apc_control,
/obj/machinery/computer/apc_control{
dir = 8
},
/turf/open/floor/plasteel/yellow/side{
dir = 4
},
@@ -19561,7 +19582,9 @@
/turf/open/floor/plasteel/neutral,
/area/engine/engineering)
"aKO" = (
/obj/machinery/computer/station_alert,
/obj/machinery/computer/station_alert{
dir = 8
},
/obj/structure/cable/white{
icon_state = "1-8"
},
@@ -19920,9 +19943,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 +20678,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;
@@ -21143,7 +21162,9 @@
/turf/open/floor/plasteel/grimy,
/area/tcommsat/server)
"aNX" = (
/obj/machinery/computer/telecomms/monitor,
/obj/machinery/computer/telecomms/monitor{
dir = 8
},
/obj/item/device/radio/intercom{
name = "Station Intercom";
pixel_y = 24
@@ -21357,7 +21378,9 @@
/turf/open/floor/plasteel,
/area/maintenance/starboard/central)
"aOv" = (
/obj/machinery/computer/message_monitor,
/obj/machinery/computer/message_monitor{
dir = 4
},
/obj/machinery/newscaster{
pixel_x = -32
},
@@ -21383,7 +21406,9 @@
/turf/open/floor/plasteel/grimy,
/area/tcommsat/server)
"aOy" = (
/obj/machinery/computer/telecomms/server,
/obj/machinery/computer/telecomms/server{
dir = 8
},
/obj/machinery/newscaster{
pixel_x = 32
},
@@ -22096,9 +22121,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)
@@ -24151,7 +24174,9 @@
},
/area/medical/medbay/zone3)
"aUq" = (
/obj/machinery/computer/cloning,
/obj/machinery/computer/cloning{
dir = 8
},
/turf/open/floor/plasteel/whiteblue/corner{
dir = 4
},
@@ -24606,7 +24631,9 @@
/turf/open/floor/plasteel/neutral,
/area/hallway/primary/central)
"aVt" = (
/obj/machinery/computer/rdconsole/core,
/obj/machinery/computer/rdconsole/core{
dir = 4
},
/obj/machinery/power/apc{
dir = 8;
name = "Research and Development Lab APC";
@@ -25012,12 +25039,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{
@@ -26093,7 +26116,9 @@
},
/area/science/research)
"aYs" = (
/obj/machinery/computer/rdservercontrol,
/obj/machinery/computer/rdservercontrol{
dir = 8
},
/obj/machinery/light,
/obj/structure/cable/white{
icon_state = "0-8"
@@ -26948,18 +26973,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,
@@ -27848,7 +27865,9 @@
dir = 8
},
/obj/effect/turf_decal/bot,
/obj/machinery/computer/rdconsole,
/obj/machinery/computer/rdconsole{
dir = 8
},
/turf/open/floor/plasteel,
/area/science/robotics/lab)
"bbP" = (
@@ -27987,7 +28006,9 @@
/turf/open/floor/plasteel/blue,
/area/medical/medbay/zone3)
"bcf" = (
/obj/machinery/computer/operating,
/obj/machinery/computer/operating{
dir = 8
},
/turf/open/floor/plasteel/neutral,
/area/medical/medbay/zone3)
"bcg" = (
@@ -28081,7 +28102,9 @@
/obj/machinery/status_display{
pixel_x = 32
},
/obj/machinery/computer/card,
/obj/machinery/computer/card{
dir = 8
},
/turf/open/floor/plasteel/red/side{
dir = 6
},
@@ -28367,7 +28390,9 @@
},
/area/medical/medbay/zone3)
"bda" = (
/obj/machinery/computer/med_data,
/obj/machinery/computer/med_data{
dir = 4
},
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -28444,7 +28469,9 @@
/turf/open/floor/plasteel/neutral,
/area/security/checkpoint)
"bdg" = (
/obj/machinery/computer/security,
/obj/machinery/computer/security{
dir = 8
},
/obj/machinery/light{
dir = 4
},
@@ -28868,7 +28895,9 @@
},
/area/medical/medbay/zone3)
"bdX" = (
/obj/machinery/computer/crew,
/obj/machinery/computer/crew{
dir = 4
},
/obj/machinery/newscaster{
pixel_y = -32
},
@@ -28940,7 +28969,9 @@
/turf/open/floor/plasteel/neutral,
/area/security/checkpoint)
"bee" = (
/obj/machinery/computer/secure_data,
/obj/machinery/computer/secure_data{
dir = 8
},
/obj/machinery/ai_status_display{
pixel_x = 32
},
@@ -28973,7 +29004,9 @@
/turf/open/floor/plasteel,
/area/science/robotics/mechbay)
"beh" = (
/obj/machinery/computer/mech_bay_power_console,
/obj/machinery/computer/mech_bay_power_console{
dir = 1
},
/obj/machinery/ai_status_display{
pixel_y = -32
},
@@ -29049,7 +29082,9 @@
/turf/open/floor/plasteel,
/area/science/robotics/lab)
"bep" = (
/obj/machinery/computer/operating,
/obj/machinery/computer/operating{
dir = 4
},
/obj/machinery/newscaster{
pixel_y = -32
},
@@ -31877,7 +31912,9 @@
/turf/open/floor/plasteel,
/area/science/xenobiology)
"bjR" = (
/obj/machinery/computer/camera_advanced/xenobio,
/obj/machinery/computer/camera_advanced/xenobio{
dir = 1
},
/obj/machinery/light,
/obj/machinery/requests_console{
department = "Xenobiology Lab";
@@ -32466,11 +32503,15 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"bld" = (
/obj/structure/frame/computer,
/obj/structure/frame/computer{
dir = 1
},
/turf/open/floor/plasteel/blue,
/area/shuttle/arrival)
"ble" = (
/obj/structure/frame/computer,
/obj/structure/frame/computer{
dir = 1
},
/turf/open/floor/plasteel/blue/side,
/area/shuttle/arrival)
"blf" = (
@@ -33329,7 +33370,9 @@
/obj/structure/cable/white{
icon_state = "0-2"
},
/obj/machinery/modular_computer/console/preset/research,
/obj/machinery/modular_computer/console/preset/research{
dir = 8
},
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -33458,7 +33501,9 @@
/turf/open/floor/pod/light,
/area/shuttle/transport)
"bwv" = (
/obj/machinery/computer/shuttle/ferry/request,
/obj/machinery/computer/shuttle/ferry/request{
dir = 8
},
/turf/open/floor/pod/dark,
/area/shuttle/transport)
"bwz" = (
@@ -33943,6 +33988,19 @@
},
/turf/open/space/basic,
/area/space)
"sws" = (
/obj/docking_port/stationary{
dheight = 9;
dir = 2;
dwidth = 5;
height = 24;
id = "syndicate_sw";
name = "southwest of station";
turf_type = /turf/open/space;
width = 18
},
/turf/open/space,
/area/space)
(1,1,1) = {"
aaa
@@ -57619,7 +57677,7 @@ aaa
aaa
aaa
aaa
swr
aaa
aaa
aaa
aaa
@@ -62375,7 +62433,7 @@ aaa
aaa
aaa
aaa
aaa
sws
aaa
aaa
aaa
@@ -62884,7 +62942,7 @@ aaa
aaa
aaa
aaa
aab
aaa
aaa
aaa
aaa
@@ -64679,7 +64737,7 @@ aaa
aaa
aaa
aaa
aaa
aab
aaa
aaa
aaa
@@ -76233,7 +76291,7 @@ bdh
byo
byo
byo
bfM
bfK
avV
bgV
bhG
File diff suppressed because it is too large Load Diff
+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)
+162 -62
View File
@@ -590,7 +590,9 @@
},
/area/holodeck/rec_center/medical)
"bV" = (
/obj/machinery/computer/operating,
/obj/machinery/computer/operating{
dir = 8
},
/turf/open/floor/holofloor{
icon_state = "white"
},
@@ -1593,7 +1595,9 @@
/turf/open/floor/holofloor/asteroid,
/area/holodeck/rec_center/thunderdome1218)
"eI" = (
/obj/machinery/modular_computer/console/preset/civilian,
/obj/machinery/modular_computer/console/preset/civilian{
dir = 4
},
/turf/open/floor/holofloor/plating,
/area/holodeck/rec_center/kobayashi)
"eJ" = (
@@ -1609,7 +1613,9 @@
/turf/open/floor/holofloor/plating,
/area/holodeck/rec_center/kobayashi)
"eL" = (
/obj/machinery/computer/station_alert,
/obj/machinery/computer/station_alert{
dir = 8
},
/turf/open/floor/holofloor/plating,
/area/holodeck/rec_center/kobayashi)
"eM" = (
@@ -1637,12 +1643,16 @@
/turf/open/floor/holofloor,
/area/holodeck/rec_center/school)
"eP" = (
/obj/machinery/modular_computer/console/preset/civilian,
/obj/machinery/modular_computer/console/preset/civilian{
dir = 4
},
/obj/structure/window/reinforced,
/turf/open/floor/holofloor/plating,
/area/holodeck/rec_center/kobayashi)
"eQ" = (
/obj/machinery/computer/atmos_alert,
/obj/machinery/computer/atmos_alert{
dir = 8
},
/obj/structure/window/reinforced,
/turf/open/floor/holofloor/plating,
/area/holodeck/rec_center/kobayashi)
@@ -3200,7 +3210,9 @@
pixel_x = -27;
pixel_y = 5
},
/obj/machinery/computer/cargo,
/obj/machinery/computer/cargo{
dir = 4
},
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/centcom/supply)
@@ -4291,7 +4303,9 @@
},
/area/centcom/control)
"mm" = (
/obj/machinery/computer/secure_data,
/obj/machinery/computer/secure_data{
dir = 8
},
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -4400,7 +4414,9 @@
/turf/closed/indestructible/riveted,
/area/centcom/supply)
"mG" = (
/obj/machinery/computer/cargo,
/obj/machinery/computer/cargo{
dir = 4
},
/obj/effect/turf_decal/stripes/line{
dir = 5
},
@@ -4641,7 +4657,9 @@
/turf/open/floor/plasteel/white,
/area/centcom/ferry)
"nl" = (
/obj/machinery/computer/security/mining,
/obj/machinery/computer/security/mining{
dir = 4
},
/obj/effect/turf_decal/stripes/line{
dir = 6
},
@@ -4786,14 +4804,18 @@
/obj/machinery/newscaster/security_unit{
pixel_y = -32
},
/obj/machinery/computer/cargo,
/obj/machinery/computer/cargo{
dir = 1
},
/obj/effect/turf_decal/stripes/line{
dir = 9
},
/turf/open/floor/plasteel,
/area/centcom/supply)
"nG" = (
/obj/machinery/computer/security/mining,
/obj/machinery/computer/security/mining{
dir = 1
},
/obj/effect/turf_decal/stripes/line{
dir = 5
},
@@ -4936,21 +4958,27 @@
},
/area/centcom/control)
"nY" = (
/obj/machinery/computer/prisoner,
/obj/machinery/computer/prisoner{
dir = 1
},
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/turf/open/floor/plasteel,
/area/centcom/control)
"nZ" = (
/obj/machinery/computer/security,
/obj/machinery/computer/security{
dir = 1
},
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/turf/open/floor/plasteel,
/area/centcom/control)
"oa" = (
/obj/machinery/computer/secure_data,
/obj/machinery/computer/secure_data{
dir = 1
},
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -5121,7 +5149,9 @@
/turf/open/floor/plasteel,
/area/centcom/supply)
"ov" = (
/obj/machinery/computer/cargo,
/obj/machinery/computer/cargo{
dir = 8
},
/obj/effect/turf_decal/stripes/line{
dir = 9
},
@@ -5254,7 +5284,9 @@
/turf/open/floor/plasteel/grimy,
/area/centcom/ferry)
"oL" = (
/obj/machinery/modular_computer/console/preset/command,
/obj/machinery/modular_computer/console/preset/command{
dir = 8
},
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -5273,7 +5305,9 @@
},
/area/centcom/supply)
"oO" = (
/obj/machinery/computer/security/mining,
/obj/machinery/computer/security/mining{
dir = 8
},
/obj/effect/turf_decal/stripes/line{
dir = 10
},
@@ -6351,12 +6385,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 +6395,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 +6470,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 +6480,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,
@@ -7339,7 +7361,9 @@
/turf/open/floor/plasteel,
/area/centcom/ferry)
"tE" = (
/obj/machinery/computer/monitor,
/obj/machinery/computer/monitor{
dir = 1
},
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
},
@@ -7618,7 +7642,9 @@
},
/area/centcom/ferry)
"ul" = (
/obj/machinery/computer/emergency_shuttle,
/obj/machinery/computer/emergency_shuttle{
dir = 1
},
/obj/machinery/newscaster/security_unit{
pixel_y = -32
},
@@ -7628,7 +7654,9 @@
/turf/open/floor/plasteel,
/area/centcom/ferry)
"um" = (
/obj/machinery/computer/communications,
/obj/machinery/computer/communications{
dir = 1
},
/obj/effect/turf_decal/stripes/line{
dir = 5
},
@@ -7697,7 +7725,9 @@
},
/area/centcom/control)
"uv" = (
/obj/machinery/computer/security,
/obj/machinery/computer/security{
dir = 4
},
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -7707,7 +7737,9 @@
/turf/open/floor/plasteel/darkred/side,
/area/centcom/control)
"ux" = (
/obj/machinery/computer/card/centcom,
/obj/machinery/computer/card/centcom{
dir = 1
},
/obj/machinery/button/door{
id = "XCCcustoms1";
layer = 3.5;
@@ -7725,7 +7757,9 @@
/turf/open/floor/plasteel/darkred/side,
/area/centcom/control)
"uy" = (
/obj/machinery/computer/security,
/obj/machinery/computer/security{
dir = 8
},
/obj/machinery/airalarm{
dir = 8;
pixel_x = 24
@@ -8702,7 +8736,9 @@
},
/area/shuttle/syndicate/airlock)
"wV" = (
/obj/machinery/computer/telecrystals/boss,
/obj/machinery/computer/telecrystals/boss{
dir = 1
},
/turf/open/floor/plasteel/podhatch{
dir = 5
},
@@ -8834,13 +8870,17 @@
},
/area/centcom/control)
"xm" = (
/obj/machinery/computer/med_data,
/obj/machinery/computer/med_data{
dir = 4
},
/turf/open/floor/plasteel/vault{
dir = 8
},
/area/centcom/control)
"xn" = (
/obj/machinery/computer/card/centcom,
/obj/machinery/computer/card/centcom{
dir = 8
},
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -9047,7 +9087,9 @@
},
/area/centcom/control)
"xU" = (
/obj/machinery/computer/crew,
/obj/machinery/computer/crew{
dir = 4
},
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -9065,7 +9107,9 @@
/turf/open/floor/wood,
/area/centcom/control)
"xX" = (
/obj/machinery/computer/communications,
/obj/machinery/computer/communications{
dir = 8
},
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -9216,14 +9260,18 @@
},
/area/centcom/control)
"yv" = (
/obj/machinery/computer/prisoner,
/obj/machinery/computer/prisoner{
dir = 1
},
/obj/machinery/light,
/turf/open/floor/plasteel/vault{
dir = 8
},
/area/centcom/control)
"yw" = (
/obj/machinery/computer/secure_data,
/obj/machinery/computer/secure_data{
dir = 1
},
/obj/machinery/light,
/turf/open/floor/plasteel/vault{
dir = 8
@@ -9759,7 +9807,9 @@
/turf/open/floor/plasteel/cmo,
/area/centcom/control)
"zK" = (
/obj/machinery/computer/med_data,
/obj/machinery/computer/med_data{
dir = 8
},
/obj/machinery/firealarm{
dir = 4;
pixel_x = 24
@@ -9984,7 +10034,9 @@
/turf/open/floor/plasteel/blue,
/area/centcom/control)
"As" = (
/obj/machinery/computer/communications,
/obj/machinery/computer/communications{
dir = 8
},
/obj/structure/extinguisher_cabinet{
pixel_x = 24
},
@@ -10150,7 +10202,9 @@
/turf/closed/indestructible/riveted,
/area/centcom/control)
"AU" = (
/obj/machinery/computer/operating,
/obj/machinery/computer/operating{
dir = 4
},
/turf/open/floor/plasteel/cmo,
/area/centcom/control)
"AV" = (
@@ -10355,7 +10409,9 @@
},
/area/centcom/ferry)
"Bv" = (
/obj/machinery/computer/card/centcom,
/obj/machinery/computer/card/centcom{
dir = 1
},
/turf/open/floor/plasteel/grimy,
/area/centcom/ferry)
"Bw" = (
@@ -10699,7 +10755,9 @@
},
/area/centcom/evac)
"Ch" = (
/obj/machinery/computer/secure_data,
/obj/machinery/computer/secure_data{
dir = 8
},
/obj/machinery/button/door{
id = "XCCcustoms1";
layer = 3;
@@ -11020,7 +11078,9 @@
},
/area/centcom/evac)
"CR" = (
/obj/machinery/computer/security,
/obj/machinery/computer/security{
dir = 8
},
/obj/machinery/newscaster{
pixel_x = 32
},
@@ -11451,7 +11511,9 @@
},
/area/centcom/control)
"DU" = (
/obj/machinery/computer/security,
/obj/machinery/computer/security{
dir = 1
},
/obj/machinery/newscaster{
pixel_y = -32
},
@@ -11477,7 +11539,9 @@
/obj/machinery/newscaster{
pixel_y = -32
},
/obj/machinery/computer/med_data,
/obj/machinery/computer/med_data{
dir = 1
},
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -13775,7 +13839,9 @@
/turf/open/floor/mineral/plastitanium,
/area/shuttle/escape)
"Kf" = (
/obj/machinery/computer/emergency_shuttle,
/obj/machinery/computer/emergency_shuttle{
dir = 8
},
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"Kg" = (
@@ -14177,7 +14243,9 @@
/turf/open/floor/mineral/titanium/blue,
/area/centcom/evac)
"Lj" = (
/obj/machinery/computer/secure_data,
/obj/machinery/computer/secure_data{
dir = 4
},
/turf/open/floor/mineral/plastitanium,
/area/centcom/evac)
"Lk" = (
@@ -14441,6 +14509,38 @@
/obj/structure/lattice,
/turf/open/space,
/area/space)
"Md" = (
/obj/machinery/computer/secure_data{
dir = 4
},
/turf/open/floor/plasteel/vault{
dir = 8
},
/area/centcom/control)
"Me" = (
/obj/machinery/computer/security{
dir = 1
},
/turf/open/floor/plasteel/vault{
dir = 8
},
/area/centcom/control)
"Mf" = (
/obj/machinery/computer/secure_data{
dir = 1
},
/turf/open/floor/plasteel/vault{
dir = 8
},
/area/centcom/control)
"Mg" = (
/obj/machinery/computer/crew{
dir = 1
},
/turf/open/floor/plasteel/vault{
dir = 8
},
/area/centcom/control)
(1,1,1) = {"
aa
@@ -56777,7 +56877,7 @@ CH
vM
Ds
DG
mm
Mf
im
Eu
EM
@@ -57794,7 +57894,7 @@ vL
wE
km
km
uv
Me
iu
nq
nq
@@ -58833,7 +58933,7 @@ CM
Da
Dv
DJ
xU
Mg
im
Eu
EP
@@ -60871,7 +60971,7 @@ qv
iu
rN
sK
mm
Md
uv
iu
vR
+15 -7
View File
@@ -209,7 +209,9 @@
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"aR" = (
/obj/machinery/computer/station_alert,
/obj/machinery/computer/station_alert{
dir = 4
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aS" = (
@@ -267,7 +269,9 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"bb" = (
/obj/machinery/computer/security,
/obj/machinery/computer/security{
dir = 4
},
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"bc" = (
@@ -309,7 +313,9 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"bj" = (
/obj/machinery/computer/communications,
/obj/machinery/computer/communications{
dir = 4
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"bk" = (
@@ -344,7 +350,9 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"bp" = (
/obj/machinery/computer/crew,
/obj/machinery/computer/crew{
dir = 4
},
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"bq" = (
@@ -585,7 +593,7 @@ aU
bd
bl
ac
bO
bN
bu
bE
ad
@@ -759,7 +767,7 @@ aa
ah
ah
aB
bL
bK
at
aZ
ah
@@ -780,7 +788,7 @@ aZ
ah
aK
at
bQ
bP
ac
aa
aa
+12 -4
View File
@@ -52,7 +52,9 @@
/turf/open/floor/plasteel/freezer,
/area/shuttle/escape)
"al" = (
/obj/machinery/computer/atmos_alert,
/obj/machinery/computer/atmos_alert{
dir = 4
},
/turf/open/floor/carpet,
/area/shuttle/escape)
"am" = (
@@ -71,11 +73,15 @@
/turf/open/floor/carpet,
/area/shuttle/escape)
"ap" = (
/obj/machinery/computer/security,
/obj/machinery/computer/security{
dir = 8
},
/turf/open/floor/carpet,
/area/shuttle/escape)
"aq" = (
/obj/machinery/computer/crew,
/obj/machinery/computer/crew{
dir = 4
},
/turf/open/floor/carpet,
/area/shuttle/escape)
"ar" = (
@@ -107,7 +113,9 @@
/turf/open/floor/carpet,
/area/shuttle/escape)
"au" = (
/obj/machinery/computer/communications,
/obj/machinery/computer/communications{
dir = 8
},
/turf/open/floor/carpet,
/area/shuttle/escape)
"av" = (
+3 -1
View File
@@ -81,7 +81,9 @@
/turf/open/floor/plating/airless,
/area/shuttle/escape)
"aq" = (
/obj/machinery/computer/communications,
/obj/machinery/computer/communications{
dir = 4
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"ar" = (
+12 -4
View File
@@ -51,7 +51,9 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"al" = (
/obj/machinery/computer/atmos_alert,
/obj/machinery/computer/atmos_alert{
dir = 4
},
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"am" = (
@@ -70,11 +72,15 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"ap" = (
/obj/machinery/computer/security,
/obj/machinery/computer/security{
dir = 8
},
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"aq" = (
/obj/machinery/computer/crew,
/obj/machinery/computer/crew{
dir = 4
},
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"ar" = (
@@ -103,7 +109,9 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"au" = (
/obj/machinery/computer/communications,
/obj/machinery/computer/communications{
dir = 8
},
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"av" = (
+28 -8
View File
@@ -90,7 +90,9 @@
/turf/open/floor/plasteel/darkpurple,
/area/shuttle/escape)
"as" = (
/obj/machinery/computer/station_alert,
/obj/machinery/computer/station_alert{
dir = 4
},
/obj/structure/window/reinforced{
dir = 8
},
@@ -104,7 +106,9 @@
/turf/open/floor/plasteel/black,
/area/shuttle/escape)
"au" = (
/obj/machinery/computer/communications,
/obj/machinery/computer/communications{
dir = 8
},
/obj/structure/window/reinforced{
dir = 4
},
@@ -128,7 +132,9 @@
/turf/open/floor/plasteel/darkred,
/area/shuttle/escape)
"az" = (
/obj/machinery/computer/med_data,
/obj/machinery/computer/med_data{
dir = 4
},
/turf/open/floor/plasteel/darkblue,
/area/shuttle/escape)
"aA" = (
@@ -159,11 +165,15 @@
},
/area/shuttle/escape)
"aF" = (
/obj/machinery/computer/security,
/obj/machinery/computer/security{
dir = 8
},
/turf/open/floor/plasteel/darkred,
/area/shuttle/escape)
"aG" = (
/obj/machinery/computer/crew,
/obj/machinery/computer/crew{
dir = 4
},
/turf/open/floor/plasteel/darkblue,
/area/shuttle/escape)
"aH" = (
@@ -189,7 +199,9 @@
/turf/open/floor/plasteel/darkred,
/area/shuttle/escape)
"aL" = (
/obj/machinery/computer/secure_data,
/obj/machinery/computer/secure_data{
dir = 8
},
/turf/open/floor/plasteel/darkred,
/area/shuttle/escape)
"aM" = (
@@ -915,7 +927,9 @@
},
/area/shuttle/escape)
"cH" = (
/obj/machinery/computer/operating,
/obj/machinery/computer/operating{
dir = 4
},
/turf/open/floor/plasteel/whiteblue,
/area/shuttle/escape)
"cI" = (
@@ -1191,6 +1205,12 @@
/obj/structure/shuttle/engine/propulsion,
/turf/open/floor/plating/airless,
/area/shuttle/escape)
"dA" = (
/obj/machinery/computer/mech_bay_power_console{
dir = 8
},
/turf/open/floor/plasteel,
/area/shuttle/escape)
(1,1,1) = {"
aa
@@ -1996,7 +2016,7 @@ ab
ab
bb
bj
bo
dA
bu
bD
bD
+12 -4
View File
@@ -38,7 +38,9 @@
/turf/open/floor/noslip,
/area/shuttle/escape)
"ai" = (
/obj/machinery/computer/atmos_alert,
/obj/machinery/computer/atmos_alert{
dir = 4
},
/turf/open/floor/noslip,
/area/shuttle/escape)
"aj" = (
@@ -58,11 +60,15 @@
/turf/open/floor/bluespace,
/area/shuttle/escape)
"am" = (
/obj/machinery/computer/security,
/obj/machinery/computer/security{
dir = 8
},
/turf/open/floor/noslip,
/area/shuttle/escape)
"an" = (
/obj/machinery/computer/crew,
/obj/machinery/computer/crew{
dir = 4
},
/turf/open/floor/noslip,
/area/shuttle/escape)
"ao" = (
@@ -88,7 +94,9 @@
/turf/open/floor/bluespace,
/area/shuttle/escape)
"ar" = (
/obj/machinery/computer/communications,
/obj/machinery/computer/communications{
dir = 8
},
/turf/open/floor/noslip,
/area/shuttle/escape)
"as" = (
+3 -1
View File
@@ -23,7 +23,9 @@
/turf/open/floor/plasteel/black,
/area/shuttle/escape)
"f" = (
/obj/machinery/computer/emergency_shuttle,
/obj/machinery/computer/emergency_shuttle{
dir = 8
},
/turf/open/floor/plasteel/black,
/area/shuttle/escape)
"g" = (
+27 -9
View File
@@ -262,7 +262,9 @@
/turf/open/floor/grass,
/area/shuttle/escape)
"ay" = (
/obj/machinery/computer/med_data,
/obj/machinery/computer/med_data{
dir = 4
},
/turf/open/floor/plasteel/whiteblue/side{
dir = 1
},
@@ -903,7 +905,9 @@
},
/area/shuttle/escape)
"ce" = (
/obj/machinery/computer/security,
/obj/machinery/computer/security{
dir = 4
},
/turf/open/floor/plasteel/darkred/side{
dir = 9
},
@@ -935,13 +939,17 @@
},
/area/shuttle/escape)
"ci" = (
/obj/machinery/computer/station_alert,
/obj/machinery/computer/station_alert{
dir = 8
},
/turf/open/floor/plasteel/darkyellow/side{
dir = 5
},
/area/shuttle/escape)
"cj" = (
/obj/machinery/computer/secure_data,
/obj/machinery/computer/secure_data{
dir = 4
},
/turf/open/floor/plasteel/darkred/side{
dir = 10
},
@@ -974,7 +982,9 @@
/turf/open/floor/plasteel/vault,
/area/shuttle/escape)
"cp" = (
/obj/machinery/computer/atmos_alert,
/obj/machinery/computer/atmos_alert{
dir = 8
},
/turf/open/floor/plasteel/darkyellow/side{
dir = 6
},
@@ -995,23 +1005,31 @@
/turf/open/floor/plasteel/vault,
/area/shuttle/escape)
"cs" = (
/obj/machinery/computer/crew,
/obj/machinery/computer/crew{
dir = 1
},
/turf/open/floor/plasteel/darkblue/side,
/area/shuttle/escape)
"ct" = (
/obj/machinery/computer/med_data,
/obj/machinery/computer/med_data{
dir = 1
},
/turf/open/floor/plasteel/darkblue/side{
dir = 6
},
/area/shuttle/escape)
"cu" = (
/obj/machinery/computer/emergency_shuttle,
/obj/machinery/computer/emergency_shuttle{
dir = 1
},
/turf/open/floor/plasteel/darkblue/side{
dir = 10
},
/area/shuttle/escape)
"cv" = (
/obj/machinery/computer/communications,
/obj/machinery/computer/communications{
dir = 1
},
/turf/open/floor/plasteel/darkblue/side,
/area/shuttle/escape)
"cw" = (
+3 -1
View File
@@ -168,7 +168,9 @@
/turf/open/floor/mineral/titanium/yellow,
/area/shuttle/escape)
"G" = (
/obj/machinery/computer/emergency_shuttle,
/obj/machinery/computer/emergency_shuttle{
dir = 8
},
/obj/structure/window/reinforced{
dir = 4
},
@@ -155,7 +155,9 @@
/turf/open/floor/wood,
/area/shuttle/escape)
"D" = (
/obj/machinery/computer/emergency_shuttle,
/obj/machinery/computer/emergency_shuttle{
dir = 8
},
/turf/open/floor/carpet,
/area/shuttle/escape)
"E" = (
+16 -8
View File
@@ -124,7 +124,9 @@
/turf/open/floor/mineral/gold,
/area/shuttle/escape/luxury)
"aw" = (
/obj/machinery/computer/communications,
/obj/machinery/computer/communications{
dir = 8
},
/turf/open/floor/mineral/gold,
/area/shuttle/escape/luxury)
"ax" = (
@@ -203,7 +205,9 @@
/turf/open/floor/carpet,
/area/shuttle/escape/luxury)
"aM" = (
/obj/machinery/computer/emergency_shuttle,
/obj/machinery/computer/emergency_shuttle{
dir = 8
},
/turf/open/floor/mineral/gold,
/area/shuttle/escape/luxury)
"aN" = (
@@ -282,7 +286,9 @@
/turf/open/floor/carpet,
/area/shuttle/escape/luxury)
"bc" = (
/obj/machinery/computer/station_alert,
/obj/machinery/computer/station_alert{
dir = 8
},
/turf/open/floor/mineral/gold,
/area/shuttle/escape/luxury)
"bd" = (
@@ -292,7 +298,9 @@
/turf/open/floor/carpet,
/area/shuttle/escape/luxury)
"be" = (
/obj/machinery/computer/crew,
/obj/machinery/computer/crew{
dir = 8
},
/turf/open/floor/mineral/gold,
/area/shuttle/escape/luxury)
"bf" = (
@@ -432,7 +440,7 @@ aj
aj
aj
aj
bn
bj
aj
aj
ak
@@ -691,7 +699,7 @@ bd
aj
aj
bg
bq
bp
ab
"}
(21,1,1) = {"
@@ -747,12 +755,12 @@ ab
al
aj
aq
bm
bk
aw
aM
bc
be
bo
bk
aj
aj
ak
+11 -7
View File
@@ -230,7 +230,9 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"aB" = (
/obj/machinery/computer/communications,
/obj/machinery/computer/communications{
dir = 4
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aC" = (
@@ -247,7 +249,9 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"aF" = (
/obj/machinery/computer/emergency_shuttle,
/obj/machinery/computer/emergency_shuttle{
dir = 4
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aG" = (
@@ -279,7 +283,9 @@
/turf/closed/wall/mineral/plastitanium,
/area/shuttle/escape)
"aL" = (
/obj/machinery/computer/station_alert,
/obj/machinery/computer/station_alert{
dir = 4
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aM" = (
@@ -669,9 +675,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,
@@ -1042,7 +1046,7 @@ bX
aq
aq
aq
bZ
bX
ap
ad
bh
+2 -1
View File
@@ -1,4 +1,4 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/open/space,
/area/space)
@@ -23,6 +23,7 @@
})
"e" = (
/obj/machinery/computer/emergency_shuttle{
dir = 4;
use_power = 0
},
/turf/open/floor/plating/asteroid,
+16 -6
View File
@@ -222,7 +222,9 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"J" = (
/obj/machinery/computer/atmos_alert,
/obj/machinery/computer/atmos_alert{
dir = 4
},
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"K" = (
@@ -246,15 +248,21 @@
/area/shuttle/escape)
"N" = (
/turf/closed/wall/mineral/titanium,
/obj/machinery/computer/security,
/obj/machinery/computer/security{
dir = 8
},
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"O" = (
/obj/machinery/computer/crew,
/obj/machinery/computer/crew{
dir = 4
},
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"P" = (
/obj/machinery/computer/communications,
/obj/machinery/computer/communications{
dir = 8
},
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"Q" = (
@@ -268,7 +276,9 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"S" = (
/obj/machinery/computer/emergency_shuttle,
/obj/machinery/computer/emergency_shuttle{
dir = 1
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"T" = (
@@ -481,7 +491,7 @@ b
B
b
b
G
b
b
b
b
+12 -4
View File
@@ -34,7 +34,9 @@
/turf/open/floor/plasteel/cult,
/area/shuttle/escape)
"h" = (
/obj/machinery/computer/atmos_alert,
/obj/machinery/computer/atmos_alert{
dir = 4
},
/turf/open/floor/plasteel/cult,
/area/shuttle/escape)
"i" = (
@@ -53,11 +55,15 @@
/turf/open/floor/plasteel/cult,
/area/shuttle/escape)
"l" = (
/obj/machinery/computer/security,
/obj/machinery/computer/security{
dir = 8
},
/turf/open/floor/plasteel/cult,
/area/shuttle/escape)
"m" = (
/obj/machinery/computer/crew,
/obj/machinery/computer/crew{
dir = 4
},
/turf/open/floor/plasteel/cult,
/area/shuttle/escape)
"n" = (
@@ -77,7 +83,9 @@
/turf/open/floor/plasteel/cult,
/area/shuttle/escape)
"p" = (
/obj/machinery/computer/communications,
/obj/machinery/computer/communications{
dir = 8
},
/turf/open/floor/plasteel/cult,
/area/shuttle/escape)
"q" = (
+17 -9
View File
@@ -60,7 +60,9 @@
/turf/open/floor/mineral/titanium/yellow,
/area/shuttle/escape)
"am" = (
/obj/machinery/computer/atmos_alert,
/obj/machinery/computer/atmos_alert{
dir = 4
},
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"an" = (
@@ -79,7 +81,9 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aq" = (
/obj/machinery/computer/security,
/obj/machinery/computer/security{
dir = 8
},
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"ar" = (
@@ -99,11 +103,15 @@
/turf/open/floor/mineral/titanium/yellow,
/area/shuttle/escape)
"au" = (
/obj/machinery/computer/crew,
/obj/machinery/computer/crew{
dir = 4
},
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"av" = (
/obj/machinery/computer/communications,
/obj/machinery/computer/communications{
dir = 8
},
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"aw" = (
@@ -427,13 +435,13 @@ ab
ab
ab
ab
bf
bd
aI
aL
aL
aL
aT
bh
bd
ab
ab
ab
@@ -523,7 +531,7 @@ bc
(10,1,1) = {"
ab
ab
be
bd
aq
av
aA
@@ -547,13 +555,13 @@ ab
ab
ab
ab
bg
bd
aI
aK
aK
aK
aT
bi
bd
ab
ab
ab
File diff suppressed because it is too large Load Diff
+6 -2
View File
@@ -37,7 +37,9 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"ai" = (
/obj/machinery/computer/crew,
/obj/machinery/computer/crew{
dir = 4
},
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"aj" = (
@@ -63,7 +65,9 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"an" = (
/obj/machinery/computer/security,
/obj/machinery/computer/security{
dir = 4
},
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"ao" = (
+6 -2
View File
@@ -34,7 +34,9 @@
/turf/open/floor/carpet,
/area/shuttle/escape)
"ai" = (
/obj/machinery/computer/atmos_alert,
/obj/machinery/computer/atmos_alert{
dir = 4
},
/turf/open/floor/carpet,
/area/shuttle/escape)
"aj" = (
@@ -57,7 +59,9 @@
/turf/open/floor/carpet,
/area/shuttle/escape)
"am" = (
/obj/machinery/computer/crew,
/obj/machinery/computer/crew{
dir = 4
},
/turf/open/floor/carpet,
/area/shuttle/escape)
"an" = (
+3 -1
View File
@@ -295,7 +295,9 @@
/turf/open/floor/plating/airless,
/area/shuttle/escape)
"bd" = (
/obj/machinery/computer/emergency_shuttle,
/obj/machinery/computer/emergency_shuttle{
dir = 1
},
/turf/open/floor/plating/airless,
/area/shuttle/escape)
"be" = (
+3 -1
View File
@@ -128,7 +128,9 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"az" = (
/obj/machinery/computer/emergency_shuttle,
/obj/machinery/computer/emergency_shuttle{
dir = 1
},
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"aA" = (
+3 -1
View File
@@ -34,7 +34,9 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/transport)
"i" = (
/obj/machinery/computer/shuttle/ferry/request,
/obj/machinery/computer/shuttle/ferry/request{
dir = 8
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/transport)
"j" = (
+3 -1
View File
@@ -42,7 +42,9 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/transport)
"al" = (
/obj/machinery/computer/shuttle/ferry/request,
/obj/machinery/computer/shuttle/ferry/request{
dir = 8
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/transport)
"am" = (
+3 -1
View File
@@ -25,7 +25,9 @@
/turf/open/floor/plasteel/freezer,
/area/shuttle/transport)
"g" = (
/obj/machinery/computer/shuttle/ferry/request,
/obj/machinery/computer/shuttle/ferry/request{
dir = 8
},
/turf/open/floor/plasteel/freezer,
/area/shuttle/transport)
"h" = (
+8 -3
View File
@@ -90,6 +90,7 @@
/area/shuttle/abandoned)
"ar" = (
/obj/machinery/computer/pod{
dir = 8;
id = "oldship_gun"
},
/turf/open/floor/mineral/titanium,
@@ -168,7 +169,8 @@
/area/shuttle/abandoned)
"aH" = (
/obj/structure/frame/computer{
anchored = 1
anchored = 1;
dir = 1
},
/obj/structure/light_construct,
/turf/open/floor/mineral/titanium,
@@ -230,7 +232,9 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
"aT" = (
/obj/machinery/computer/shuttle/white_ship,
/obj/machinery/computer/shuttle/white_ship{
dir = 8
},
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
"aU" = (
@@ -272,7 +276,8 @@
/area/shuttle/abandoned)
"bb" = (
/obj/structure/frame/computer{
anchored = 1
anchored = 1;
dir = 8
},
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
+9 -3
View File
@@ -130,7 +130,9 @@
/turf/open/floor/mech_bay_recharge_floor,
/area/shuttle/abandoned)
"ao" = (
/obj/machinery/computer/mech_bay_power_console,
/obj/machinery/computer/mech_bay_power_console{
dir = 4
},
/obj/effect/decal/cleanable/dirt{
desc = "A thin layer of dust coating the floor.";
name = "dust"
@@ -138,7 +140,9 @@
/turf/open/floor/mineral/titanium/yellow,
/area/shuttle/abandoned)
"ap" = (
/obj/machinery/computer/mech_bay_power_console,
/obj/machinery/computer/mech_bay_power_console{
dir = 8
},
/turf/open/floor/mineral/titanium/yellow,
/area/shuttle/abandoned)
"aq" = (
@@ -596,7 +600,9 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/abandoned)
"ba" = (
/obj/machinery/computer/shuttle/white_ship,
/obj/machinery/computer/shuttle/white_ship{
dir = 1
},
/obj/effect/decal/cleanable/dirt{
desc = "A thin layer of dust coating the floor.";
name = "dust"
File diff suppressed because it is too large Load Diff
+14 -20
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)
@@ -1008,7 +999,9 @@
desc = "A thin layer of dust coating the floor.";
name = "dust"
},
/obj/machinery/computer/shuttle/white_ship,
/obj/machinery/computer/shuttle/white_ship{
dir = 8
},
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
"bJ" = (
@@ -1057,7 +1050,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)
@@ -1124,6 +1117,7 @@
name = "dust"
},
/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship{
dir = 1;
station_lock_override = 1;
view_range = 15;
x_offset = -3;
@@ -1460,7 +1454,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)
File diff suppressed because it is too large Load Diff
+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)
+12 -12
View File
@@ -116,17 +116,17 @@
#define R_MAXPERMISSION 4096 //This holds the maximum value for a permission. It is used in iteration, so keep it updated.
#define ADMIN_QUE(user) "(<a href='?_src_=holder;[HrefToken(TRUE)];adminmoreinfo=\ref[user]'>?</a>)"
#define ADMIN_FLW(user) "(<a href='?_src_=holder;[HrefToken(TRUE)];adminplayerobservefollow=\ref[user]'>FLW</a>)"
#define ADMIN_PP(user) "(<a href='?_src_=holder;[HrefToken(TRUE)];adminplayeropts=\ref[user]'>PP</a>)"
#define ADMIN_VV(atom) "(<a href='?_src_=vars;[HrefToken(TRUE)];Vars=\ref[atom]'>VV</a>)"
#define ADMIN_SM(user) "(<a href='?_src_=holder;[HrefToken(TRUE)];subtlemessage=\ref[user]'>SM</a>)"
#define ADMIN_TP(user) "(<a href='?_src_=holder;[HrefToken(TRUE)];traitor=\ref[user]'>TP</a>)"
#define ADMIN_KICK(user) "(<a href='?_src_=holder;[HrefToken(TRUE)];boot2=\ref[user]'>KICK</a>)"
#define ADMIN_CENTCOM_REPLY(user) "(<a href='?_src_=holder;[HrefToken(TRUE)];CentComReply=\ref[user]'>RPLY</a>)"
#define ADMIN_SYNDICATE_REPLY(user) "(<a href='?_src_=holder;[HrefToken(TRUE)];SyndicateReply=\ref[user]'>RPLY</a>)"
#define ADMIN_SC(user) "(<a href='?_src_=holder;[HrefToken(TRUE)];adminspawncookie=\ref[user]'>SC</a>)"
#define ADMIN_SMITE(user) "(<a href='?_src_=holder;[HrefToken(TRUE)];adminsmite=\ref[user]'>SMITE</a>)"
#define ADMIN_QUE(user) "(<a href='?_src_=holder;[HrefToken(TRUE)];adminmoreinfo=[REF(user)]'>?</a>)"
#define ADMIN_FLW(user) "(<a href='?_src_=holder;[HrefToken(TRUE)];adminplayerobservefollow=[REF(user)]'>FLW</a>)"
#define ADMIN_PP(user) "(<a href='?_src_=holder;[HrefToken(TRUE)];adminplayeropts=[REF(user)]'>PP</a>)"
#define ADMIN_VV(atom) "(<a href='?_src_=vars;[HrefToken(TRUE)];Vars=[REF(atom)]'>VV</a>)"
#define ADMIN_SM(user) "(<a href='?_src_=holder;[HrefToken(TRUE)];subtlemessage=[REF(user)]'>SM</a>)"
#define ADMIN_TP(user) "(<a href='?_src_=holder;[HrefToken(TRUE)];traitor=[REF(user)]'>TP</a>)"
#define ADMIN_KICK(user) "(<a href='?_src_=holder;[HrefToken(TRUE)];boot2=[REF(user)]'>KICK</a>)"
#define ADMIN_CENTCOM_REPLY(user) "(<a href='?_src_=holder;[HrefToken(TRUE)];CentComReply=[REF(user)]'>RPLY</a>)"
#define ADMIN_SYNDICATE_REPLY(user) "(<a href='?_src_=holder;[HrefToken(TRUE)];SyndicateReply=[REF(user)]'>RPLY</a>)"
#define ADMIN_SC(user) "(<a href='?_src_=holder;[HrefToken(TRUE)];adminspawncookie=[REF(user)]'>SC</a>)"
#define ADMIN_SMITE(user) "(<a href='?_src_=holder;[HrefToken(TRUE)];adminsmite=[REF(user)]'>SMITE</a>)"
#define ADMIN_LOOKUP(user) "[key_name_admin(user)][ADMIN_QUE(user)]"
#define ADMIN_LOOKUPFLW(user) "[key_name_admin(user)][ADMIN_QUE(user)] [ADMIN_FLW(user)]"
#define ADMIN_SET_SD_CODE "(<a href='?_src_=holder;[HrefToken(TRUE)];set_selfdestruct_code=1'>SETCODE</a>)"
@@ -135,7 +135,7 @@
#define ADMIN_JMP(src) "(<a href='?_src_=holder;[HrefToken(TRUE)];adminplayerobservecoodjump=1;X=[src.x];Y=[src.y];Z=[src.z]'>JMP</a>)"
#define COORD(src) "[src ? "([src.x],[src.y],[src.z])" : "nonexistent location"]"
#define ADMIN_COORDJMP(src) "[src ? "[COORD(src)] [ADMIN_JMP(src)]" : "nonexistent location"]"
#define ADMIN_INDIVIDUALLOG(user) "(<a href='?_src_=holder;[HrefToken(TRUE)];individuallog=\ref[user]'>LOGS</a>)"
#define ADMIN_INDIVIDUALLOG(user) "(<a href='?_src_=holder;[HrefToken(TRUE)];individuallog=[REF(user)]'>LOGS</a>)"
#define ADMIN_PUNISHMENT_LIGHTNING "Lightning bolt"
#define ADMIN_PUNISHMENT_BRAINDAMAGE "Brain damage"
+2 -1
View File
@@ -28,6 +28,7 @@
#define NORMPIPERATE 30 //pipe-insulation rate divisor
#define HEATPIPERATE 8 //heat-exch pipe insulation
#define FLOWFRAC 0.99 //fraction of gas transfered per process
#define TANK_MELT_TEMPERATURE 1000000
#define TANK_LEAK_PRESSURE (30.*ONE_ATMOSPHERE) //Tank starts leaking
#define TANK_RUPTURE_PRESSURE (35.*ONE_ATMOSPHERE) //Tank spills all contents into atmosphere
#define TANK_FRAGMENT_PRESSURE (40.*ONE_ATMOSPHERE) //Boom 3x3 base explosion
@@ -109,7 +110,7 @@
#define PRESSURE_DAMAGE_COEFFICIENT 4 //The amount of pressure damage someone takes is equal to (pressure / HAZARD_HIGH_PRESSURE)*PRESSURE_DAMAGE_COEFFICIENT, with the maximum of MAX_PRESSURE_DAMAGE
#define MAX_HIGH_PRESSURE_DAMAGE 4
#define LOW_PRESSURE_DAMAGE 2 //The amount of damage someone takes when in a low pressure area (The pressure threshold is so low that it doesn't make sense to do any calculations, so it just applies this flat value).
#define LOW_PRESSURE_DAMAGE 4 //The amount of damage someone takes when in a low pressure area (The pressure threshold is so low that it doesn't make sense to do any calculations, so it just applies this flat value).
#define COLD_SLOWDOWN_FACTOR 20 //Humans are slowed by the difference between bodytemp and BODYTEMP_COLD_DAMAGE_LIMIT divided by this
+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"
+2 -1
View File
@@ -74,7 +74,8 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
#define PASSGRILLE 4
#define PASSBLOB 8
#define PASSMOB 16
#define LETPASSTHROW 32
#define PASSCLOSEDTURF 32
#define LETPASSTHROW 64
//Movement Types
+41
View File
@@ -0,0 +1,41 @@
#define IC_INPUT "input"
#define IC_OUTPUT "output"
#define IC_ACTIVATOR "activator"
// Pin functionality.
#define DATA_CHANNEL "data channel"
#define PULSE_CHANNEL "pulse channel"
// Methods of obtaining a circuit.
#define IC_SPAWN_DEFAULT 1 // If the circuit comes in the default circuit box and able to be printed in the IC printer.
#define IC_SPAWN_RESEARCH 2 // If the circuit design will be available in the IC printer after upgrading it.
// Displayed along with the pin name to show what type of pin it is.
#define IC_FORMAT_ANY "\<ANY\>"
#define IC_FORMAT_STRING "\<TEXT\>"
#define IC_FORMAT_CHAR "\<CHAR\>"
#define IC_FORMAT_COLOR "\<COLOR\>"
#define IC_FORMAT_NUMBER "\<NUM\>"
#define IC_FORMAT_DIR "\<DIR\>"
#define IC_FORMAT_BOOLEAN "\<BOOL\>"
#define IC_FORMAT_REF "\<REF\>"
#define IC_FORMAT_LIST "\<LIST\>"
#define IC_FORMAT_PULSE "\<PULSE\>"
// Used inside input/output list to tell the constructor what pin to make.
#define IC_PINTYPE_ANY /datum/integrated_io
#define IC_PINTYPE_STRING /datum/integrated_io/string
#define IC_PINTYPE_CHAR /datum/integrated_io/char
#define IC_PINTYPE_COLOR /datum/integrated_io/color
#define IC_PINTYPE_NUMBER /datum/integrated_io/number
#define IC_PINTYPE_DIR /datum/integrated_io/dir
#define IC_PINTYPE_BOOLEAN /datum/integrated_io/boolean
#define IC_PINTYPE_REF /datum/integrated_io/ref
#define IC_PINTYPE_LIST /datum/integrated_io/lists
#define IC_PINTYPE_PULSE_IN /datum/integrated_io/activate
#define IC_PINTYPE_PULSE_OUT /datum/integrated_io/activate/out
// Data limits.
#define IC_MAX_LIST_LENGTH 500
+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)))
+4 -2
View File
@@ -8,7 +8,9 @@
#define ismovableatom(A) (istype(A, /atom/movable))
#define isatom(A) (istype(A, /atom))
#define isatom(A) (isloc(A))
#define isweakref(D) (istype(D, /datum/weakref))
//Turfs
//#define isturf(A) (istype(A, /turf)) This is actually a byond built-in. Added here for completeness sake.
@@ -183,4 +185,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
+18 -16
View File
@@ -1,20 +1,22 @@
//Investigate logging defines
#define INVESTIGATE_ATMOS "atmos"
#define INVESTIGATE_BOTANY "botany"
#define INVESTIGATE_CARGO "cargo"
#define INVESTIGATE_EXPERIMENTOR "experimentor"
#define INVESTIGATE_GRAVITY "gravity"
#define INVESTIGATE_RECORDS "records"
#define INVESTIGATE_SINGULO "singulo"
#define INVESTIGATE_SUPERMATTER "supermatter"
#define INVESTIGATE_TELESCI "telesci"
#define INVESTIGATE_WIRES "wires"
#define INVESTIGATE_ATMOS "atmos"
#define INVESTIGATE_BOTANY "botany"
#define INVESTIGATE_CARGO "cargo"
#define INVESTIGATE_EXPERIMENTOR "experimentor"
#define INVESTIGATE_GRAVITY "gravity"
#define INVESTIGATE_RECORDS "records"
#define INVESTIGATE_SINGULO "singulo"
#define INVESTIGATE_SUPERMATTER "supermatter"
#define INVESTIGATE_TELESCI "telesci"
#define INVESTIGATE_WIRES "wires"
#define INVESTIGATE_PORTAL "portals"
#define INVESTIGATE_HALLUCINATIONS "hallucinations"
#define INVESTIGATE_HALLUCINATIONS "hallucinations"
#define INVESTIGATE_RADIATION "radiation"
#define INVESTIGATE_EXONET "exonet"
//Individual logging defines
#define INDIVIDUAL_ATTACK_LOG "Attack log"
#define INDIVIDUAL_SAY_LOG "Say log"
#define INDIVIDUAL_EMOTE_LOG "Emote log"
#define INDIVIDUAL_OOC_LOG "OOC log"
#define INDIVIDUAL_SHOW_ALL_LOG "All logs"
#define INDIVIDUAL_ATTACK_LOG "Attack log"
#define INDIVIDUAL_SAY_LOG "Say log"
#define INDIVIDUAL_EMOTE_LOG "Emote log"
#define INDIVIDUAL_OOC_LOG "OOC log"
#define INDIVIDUAL_SHOW_ALL_LOG "All logs"
+3
View File
@@ -84,3 +84,6 @@
#define SUPERMATTER_DANGER 4 // Integrity < 50%
#define SUPERMATTER_EMERGENCY 5 // Integrity < 25%
#define SUPERMATTER_DELAMINATING 6 // Pretty obvious.
//R&D Snowflakes
#define RD_CONSOLE_LOCKED_SCREEN 0.2
+7 -1
View File
@@ -466,9 +466,15 @@ GLOBAL_LIST_INIT(ghost_others_options, list(GHOST_OTHERS_SIMPLE, GHOST_OTHERS_DE
//Dummy mob reserve slots
#define DUMMY_HUMAN_SLOT_PREFERENCES "dummy_preference_preview"
#define DUMMY_HUMAN_SLOT_MANIFEST "dummy_manifest_generation"
#define PR_ANNOUNCEMENTS_PER_ROUND 5 //The number of unique PR announcements allowed per round
//This makes sure that a single person can only spam 3 reopens and 3 closes before being ignored
#define MAX_PROC_DEPTH 195 // 200 proc calls deep and shit breaks, this is a bit lower to give some safety room
#define MAX_PROC_DEPTH 195 // 200 proc calls deep and shit breaks, this is a bit lower to give some safety room
#define DUMMY_HUMAN_SLOT_MANIFEST "dummy_manifest_generation"
#define SYRINGE_DRAW 0
#define SYRINGE_INJECT 1
+8 -14
View File
@@ -1,23 +1,17 @@
//Construction Categories
#define PIPE_BINARY 0 //2 directions: N/S, E/W
#define PIPE_STRAIGHT 0 //2 directions: N/S, E/W
#define PIPE_BENDABLE 1 //6 directions: N/S, E/W, N/E, N/W, S/E, S/W
#define PIPE_TRINARY 2 //4 directions: N/E/S, E/S/W, S/W/N, W/N/E
#define PIPE_TRIN_M 3 //8 directions: N->S+E, S->N+E, N->S+W, S->N+W, E->W+S, W->E+S, E->W+N, W->E+N
#define PIPE_UNARY 4 //4 directions: N, S, E, W
#define PIPE_QUAD 5 //1 directions: N/S/E/W
#define PIPE_ONEDIR 5 //1 direction: N/S/E/W
//Disposal piping numbers - do NOT hardcode these, use the defines
#define DISP_PIPE_STRAIGHT 0
#define DISP_PIPE_BENT 1
#define DISP_JUNCTION 2
#define DISP_JUNCTION_FLIP 3
#define DISP_YJUNCTION 4
#define DISP_END_TRUNK 5
#define DISP_END_BIN 6
#define DISP_END_OUTLET 7
#define DISP_END_CHUTE 8
#define DISP_SORTJUNCTION 9
#define DISP_SORTJUNCTION_FLIP 10
//Disposal pipe relative connection directions
#define DISP_DIR_BASE 0
#define DISP_DIR_LEFT 1
#define DISP_DIR_RIGHT 2
#define DISP_DIR_FLIP 4
#define DISP_DIR_NONE 8
//Transit tubes
#define TRANSIT_TUBE_STRAIGHT 0
+3 -3
View File
@@ -37,9 +37,9 @@
#define EAVESDROP_EXTRA_RANGE 1 //how much past the specified message_range does the message get starred, whispering only
// A link given to ghost alice to follow bob
#define FOLLOW_LINK(alice, bob) "<a href=?src=\ref[alice];follow=\ref[bob]>(F)</a>"
#define TURF_LINK(alice, turfy) "<a href=?src=\ref[alice];x=[turfy.x];y=[turfy.y];z=[turfy.z]>(T)</a>"
#define FOLLOW_OR_TURF_LINK(alice, bob, turfy) "<a href=?src=\ref[alice];follow=\ref[bob];x=[turfy.x];y=[turfy.y];z=[turfy.z]>(F)</a>"
#define FOLLOW_LINK(alice, bob) "<a href=?src=[REF(alice)];follow=[REF(bob)]>(F)</a>"
#define TURF_LINK(alice, turfy) "<a href=?src=[REF(alice)];x=[turfy.x];y=[turfy.y];z=[turfy.z]>(T)</a>"
#define FOLLOW_OR_TURF_LINK(alice, bob, turfy) "<a href=?src=[REF(alice)];follow=[REF(bob)];x=[turfy.x];y=[turfy.y];z=[turfy.z]>(F)</a>"
#define LOGSAY "say"
#define LOGWHISPER "whisper"
+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
+71 -23
View File
@@ -1,23 +1,71 @@
//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')
#define REEBE list('sound/ambience/ambireebe1.ogg', 'sound/ambience/ambireebe2.ogg', 'sound/ambience/ambireebe3.ogg')
+17
View File
@@ -0,0 +1,17 @@
#define STAT_ENTRY_TIME 1
#define STAT_ENTRY_COUNT 2
#define STAT_ENTRY_LENGTH 2
#define STAT_START_STOPWATCH var/STAT_STOP_WATCH = TICK_USAGE
#define STAT_STOP_STOPWATCH var/STAT_TIME = TICK_USAGE_TO_MS(STAT_STOP_WATCH)
#define STAT_LOG_ENTRY(entrylist, entryname) \
var/list/STAT_ENTRY = entrylist[entryname] || (entrylist[entryname] = new /list(STAT_ENTRY_LENGTH));\
STAT_ENTRY[STAT_ENTRY_TIME] += STAT_TIME;\
var/STAT_INCR_AMOUNT = min(1, 2**round((STAT_ENTRY[STAT_ENTRY_COUNT] || 0)/SHORT_REAL_LIMIT));\
if (STAT_INCR_AMOUNT == 1 || prob(100/STAT_INCR_AMOUNT)) {\
STAT_ENTRY[STAT_ENTRY_COUNT] += STAT_INCR_AMOUNT;\
};\
+25
View File
@@ -53,6 +53,7 @@
#define INIT_ORDER_ATOMS 11
#define INIT_ORDER_LANGUAGE 10
#define INIT_ORDER_MACHINES 9
#define INIT_ORDER_CIRCUIT 8
#define INIT_ORDER_TIMER 1
#define INIT_ORDER_DEFAULT 0
#define INIT_ORDER_AIR -1
@@ -76,3 +77,27 @@
#define RUNLEVEL_POSTGAME 8
#define RUNLEVELS_DEFAULT (RUNLEVEL_SETUP | RUNLEVEL_GAME | RUNLEVEL_POSTGAME)
#define COMPILE_OVERLAYS(A)\
if (TRUE) {\
var/list/oo = A.our_overlays;\
var/list/po = A.priority_overlays;\
if(LAZYLEN(po)){\
if(LAZYLEN(oo)){\
A.overlays = oo + po;\
}\
else{\
A.overlays = po;\
}\
}\
else if(LAZYLEN(oo)){\
A.overlays = oo;\
}\
else{\
A.overlays.Cut();\
}\
A.flags_1 &= ~OVERLAY_QUEUED_1;\
}
+6
View File
@@ -0,0 +1,6 @@
#define TOOL_NONE 0
#define TOOL_CROWBAR 1
#define TOOL_MULTITOOL 2
#define TOOL_SCREWDRIVER 3
#define TOOL_WIRECUTTER 4
#define TOOL_WRENCH 5
+2
View File
@@ -0,0 +1,2 @@
#define WALL_DENT_HIT 1
#define WALL_DENT_SHOT 2
+93
View File
@@ -0,0 +1,93 @@
#define BP_MAX_ROOM_SIZE 300
// Gets an atmos isolated contained space
// Returns an associative list of turf|dirs pairs
// The dirs are connected turfs in the same space
// break_if_found is a typecache of turf types to return false if found
/proc/detect_room(turf/origin, list/break_if_found)
if(origin.blocks_air)
return list(origin)
. = list()
var/list/checked_turfs = list()
var/list/found_turfs = list(origin)
while(found_turfs.len)
var/turf/sourceT = found_turfs[1]
if(break_if_found[sourceT.type])
return FALSE
found_turfs.Cut(1, 2)
var/dir_flags = checked_turfs[sourceT]
for(var/dir in GLOB.alldirs)
if(dir_flags & dir) // This means we've checked this dir before, probably from the other turf
continue
var/turf/checkT = get_step(sourceT, dir)
if(!checkT)
continue
checked_turfs[sourceT] |= dir
checked_turfs[checkT] |= turn(dir, 180)
.[sourceT] |= dir
.[checkT] |= turn(dir, 180)
var/static/list/cardinal_cache = list("[NORTH]"=TRUE, "[EAST]"=TRUE, "[SOUTH]"=TRUE, "[WEST]"=TRUE)
if(!cardinal_cache["[dir]"] || checkT.blocks_air || !CANATMOSPASS(sourceT, checkT))
continue
found_turfs += checkT // Since checkT is connected, add it to the list to be processed
/proc/create_area(mob/creator)
var/static/blacklisted_turfs = typecacheof(/turf/open/space)
var/static/blacklisted_areas = typecacheof(/area/space)
var/list/turfs = detect_room(get_turf(creator), blacklisted_turfs)
if(!turfs)
to_chat(creator, "<span class='warning'>The new area must be completely airtight.</span>")
return
if(turfs.len > BP_MAX_ROOM_SIZE)
to_chat(creator, "<span class='warning'>The room you're in is too big. It is [((turfs.len / BP_MAX_ROOM_SIZE)-1)*100]% larger than allowed.</span>")
return
// This will fuck up shuttles that use the base area type but we need to fix those anyway
var/list/areas = list("New Area" = /area, "New Shuttle Area" = /area/shuttle/custom)
for(var/i in 1 to turfs.len)
var/area/place = get_area(turfs[i])
if(blacklisted_areas[place.type])
continue
areas[place.name] = place
var/area_choice = input(creator, "Choose an area to expand or make a new area.", "Area Expansion") as null|anything in areas
area_choice = areas[area_choice]
if(!area_choice)
to_chat(creator, "<span class='warning'>No choice selected. The area remains undefined.</span>")
return
var/area/newA
var/area/oldA = get_area(get_turf(creator))
if(!isarea(area_choice))
var/str = trim(stripped_input(creator,"New area name:", "Blueprint Editing", "", MAX_NAME_LEN))
if(!str || !length(str)) //cancel
return
if(length(str) > 50)
to_chat(creator, "<span class='warning'>The given name is too long. The area remains undefined.</span>")
return
newA = new area_choice
newA.setup(str)
newA.set_dynamic_lighting()
newA.has_gravity = oldA.has_gravity
else
newA = area_choice
for(var/i in 1 to turfs.len)
var/turf/thing = turfs[i]
var/area/old_area = thing.loc
newA.contents += thing
thing.change_area(old_area, newA)
var/list/related_areas = oldA.related
for(var/i in 1 to related_areas.len)
var/area/place = related_areas[i]
var/list/firedoors = place.firedoors
if(!LAZYLEN(firedoors))
continue
for(var/k in 1 to firedoors.len)
var/obj/machinery/door/firedoor/FD = firedoors[k]
FD.CalculateAffectingAreas()
to_chat(creator, "<span class='notice'>You have created a new area, named [newA.name]. It is now weather proof, and constructing an APC will allow it to be powered.</span>")
return TRUE
#undef BP_MAX_ROOM_SIZE
+6 -1
View File
@@ -58,7 +58,12 @@ GLOBAL_VAR_INIT(cmp_field, "name")
. = B.failures - A.failures
if (!.)
. = B.qdels - A.qdels
/proc/cmp_generic_stat_item_time(list/A, list/B)
. = B[STAT_ENTRY_TIME] - A[STAT_ENTRY_TIME]
if (!.)
. = B[STAT_ENTRY_COUNT] - A[STAT_ENTRY_COUNT]
/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))
+21 -9
View File
@@ -77,7 +77,7 @@
/proc/alone_in_area(area/the_area, mob/must_be_alone, check_type = /mob/living/carbon)
var/area/our_area = get_area(the_area)
for(var/C in GLOB.living_mob_list)
for(var/C in GLOB.alive_mob_list)
if(!istype(C, check_type))
continue
if(C == must_be_alone)
@@ -214,17 +214,28 @@
/proc/get_hearers_in_view(R, atom/source)
// Returns a list of hearers in view(R) from source (ignoring luminosity). Used in saycode.
var/turf/T = get_turf(source)
var/list/hear = list()
. = list()
if(!T)
return hear
return
var/list/range = get_hear(R, T)
for(var/atom/movable/A in range)
hear |= recursive_hear_check(A)
return hear
var/list/processing_list = list()
if (R == 0) // if the range is zero, we know exactly where to look for, we can skip view
processing_list += T.contents // We can shave off one iteration by assuming turfs cannot hear
else // A variation of get_hear inlined here to take advantage of the compiler's fastpath for obj/mob in view
var/lum = T.luminosity
T.luminosity = 6 // This is the maximum luminosity
processing_list = viewers(R, T)
for(var/obj/O in view(R, T))
processing_list += O
T.luminosity = lum
while(processing_list.len) // recursive_hear_check inlined here
var/atom/A = processing_list[1]
if(A.flags_1 & HEAR_1)
. += A
processing_list.Cut(1, 2)
processing_list += A.contents
/proc/get_mobs_in_radio_ranges(list/obj/item/device/radio/radios)
@@ -307,7 +318,8 @@
break
/proc/get_mob_by_key(key)
for(var/mob/M in GLOB.mob_list)
for(var/i in GLOB.player_list)
var/mob/M = i
if(M.ckey == lowertext(key))
return M
return null
+4
View File
@@ -179,6 +179,10 @@
underlay_appearance.icon_state = DEFAULT_UNDERLAY_ICON_STATE
underlays = U
// Drop posters which were previously placed on this wall.
for(var/obj/structure/sign/poster/P in src)
P.roll_and_drop(src)
/proc/cardinal_smooth(atom/A, adjacencies)
//NW CORNER
+7 -4
View File
@@ -178,7 +178,7 @@ mob
// Send the icon to src's local cache
src<<browse_rsc(I, iconName)
// Update the label to show it
winset(src,"imageLabel","image='\ref[I]'");
winset(src,"imageLabel","image='[REF(I)]'");
Add_Overlay()
set name = "4. Add Overlay"
@@ -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.
@@ -1006,23 +1006,26 @@ GLOBAL_LIST_EMPTY(friendly_animal_types)
if(J)
J.equip(body, TRUE, FALSE)
SSoverlays.Flush()
var/icon/out_icon = icon('icons/effects/effects.dmi', "nothing")
body.setDir(NORTH)
COMPILE_OVERLAYS(body)
var/icon/partial = getFlatIcon(body)
out_icon.Insert(partial,dir=NORTH)
body.setDir(SOUTH)
COMPILE_OVERLAYS(body)
partial = getFlatIcon(body)
out_icon.Insert(partial,dir=SOUTH)
body.setDir(WEST)
COMPILE_OVERLAYS(body)
partial = getFlatIcon(body)
out_icon.Insert(partial,dir=WEST)
body.setDir(EAST)
COMPILE_OVERLAYS(body)
partial = getFlatIcon(body)
out_icon.Insert(partial,dir=EAST)
@@ -1140,7 +1143,7 @@ GLOBAL_LIST_INIT(freon_color_matrix, list("#2E5E69", "#60A2A8", "#A1AFB1", rgb(0
// Either an atom or somebody fucked up and is gonna get a runtime, which I'm fine with.
var/atom/A = thing
var/key = "[istype(A.icon, /icon) ? "\ref[A.icon]" : A.icon]:[A.icon_state]"
var/key = "[istype(A.icon, /icon) ? "[REF(A.icon)]" : A.icon]:[A.icon_state]"
if (!bicon_cache[key]) // Doesn't exist, make it.
+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)
+16 -14
View File
@@ -1,4 +1,4 @@
/proc/priority_announce(text, title = "", sound = 'sound/ai/attention.ogg', type)
/proc/priority_announce(text, title = "", sound = 'sound/ai/attention.ogg', type , sender_override)
if(!text)
return
@@ -13,13 +13,18 @@
GLOB.news_network.SubmitArticle(text, "Captain's Announcement", "Station Announcements", null)
else
announcement += "<h1 class='alert'>[command_name()] Update</h1>"
if(!sender_override)
announcement += "<h1 class='alert'>[command_name()] Update</h1>"
else
announcement += "<h1 class='alert'>[sender_override]</h1>"
if (title && length(title) > 0)
announcement += "<br><h2 class='alert'>[html_encode(title)]</h2>"
if(title == "")
GLOB.news_network.SubmitArticle(text, "Central Command Update", "Station Announcements", null)
else
GLOB.news_network.SubmitArticle(title + "<br><br>" + text, "Central Command", "Station Announcements", null)
if(!sender_override)
if(title == "")
GLOB.news_network.SubmitArticle(text, "Central Command Update", "Station Announcements", null)
else
GLOB.news_network.SubmitArticle(title + "<br><br>" + text, "Central Command", "Station Announcements", null)
announcement += "<br><span class='alert'>[html_encode(text)]</span><br>"
announcement += "<br>"
@@ -38,14 +43,11 @@
if(announce)
priority_announce("A report has been downloaded and printed out at all communications consoles.", "Incoming Classified Message", 'sound/ai/commandreport.ogg')
for(var/obj/machinery/computer/communications/C in GLOB.machines)
if(!(C.stat & (BROKEN|NOPOWER)) && (C.z in GLOB.station_z_levels))
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)
P.update_icon()
var/datum/comm_message/M = new
M.title = title
M.content = text
SScommunications.send_message(M)
/proc/minor_announce(message, title = "Attention:", alert)
if(!message)

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