Merge pull request #3575 from deathride58/mapsyncs1
Map Syncs - TG-gnawed-on-too-many-cables Edition
This commit is contained in:
LetterJay
@@ -1691,7 +1691,6 @@
|
||||
/obj/structure/grille/broken,
|
||||
/obj/effect/decal/remains/human{
|
||||
desc = "This guy seemed to have died in terrible way! Half his remains are dust.";
|
||||
icon_state = "remains";
|
||||
name = "Syndicate agent remains"
|
||||
},
|
||||
/turf/open/floor/plasteel/airless{
|
||||
@@ -4665,7 +4664,6 @@
|
||||
"oi" = (
|
||||
/obj/effect/decal/remains/human{
|
||||
desc = "This guy seemed to have died in terrible way! Half his remains are dust.";
|
||||
icon_state = "remains";
|
||||
name = "Syndicate agent remains"
|
||||
},
|
||||
/turf/open/floor/plasteel/airless,
|
||||
|
||||
@@ -3305,7 +3305,7 @@
|
||||
"ga" = (
|
||||
/obj/machinery/atmospherics/components/trinary/filter{
|
||||
dir = 1;
|
||||
filter_type = /datum/gas/oxygen;
|
||||
filter_type = "o2";
|
||||
on = 1
|
||||
},
|
||||
/turf/open/floor/plasteel/floorgrime{
|
||||
@@ -3719,7 +3719,7 @@
|
||||
"gO" = (
|
||||
/obj/machinery/atmospherics/components/trinary/filter{
|
||||
dir = 1;
|
||||
filter_type = /datum/gas/nitrous_oxide;
|
||||
filter_type = "n2o";
|
||||
on = 1
|
||||
},
|
||||
/turf/open/floor/plasteel/floorgrime{
|
||||
|
||||
@@ -10975,7 +10975,7 @@
|
||||
"um" = (
|
||||
/obj/machinery/atmospherics/components/trinary/filter{
|
||||
dir = 4;
|
||||
filter_type = /datum/gas/nitrogen;
|
||||
filter_type = "n2";
|
||||
on = 1
|
||||
},
|
||||
/turf/open/floor/plasteel/red/side{
|
||||
@@ -11015,7 +11015,7 @@
|
||||
"up" = (
|
||||
/obj/machinery/atmospherics/components/trinary/filter{
|
||||
dir = 4;
|
||||
filter_type = /datum/gas/oxygen;
|
||||
filter_type = "o2";
|
||||
on = 1
|
||||
},
|
||||
/turf/open/floor/plasteel/blue/side{
|
||||
|
||||
+5164
-6566
File diff suppressed because it is too large
Load Diff
+168187
-174996
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -459,16 +459,12 @@
|
||||
/area/mine/laborcamp)
|
||||
"by" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 2;
|
||||
d2 = 4;
|
||||
icon_state = "2-4"
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/mine/laborcamp)
|
||||
"bz" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 4;
|
||||
d2 = 8;
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
@@ -479,8 +475,6 @@
|
||||
req_access_txt = "2"
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d1 = 4;
|
||||
d2 = 8;
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
@@ -492,13 +486,10 @@
|
||||
pixel_y = 24
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d1 = 2;
|
||||
d2 = 8;
|
||||
icon_state = "2-8"
|
||||
},
|
||||
/obj/structure/cable{
|
||||
icon_state = "0-2";
|
||||
d2 = 2
|
||||
icon_state = "0-2"
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/mine/laborcamp)
|
||||
@@ -571,8 +562,6 @@
|
||||
req_access_txt = "2"
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
@@ -583,8 +572,6 @@
|
||||
req_access_txt = "2"
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 10;
|
||||
icon_state = "1-10"
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
@@ -608,8 +595,6 @@
|
||||
/area/mine/production)
|
||||
"bQ" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 2;
|
||||
d2 = 4;
|
||||
icon_state = "2-4"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
|
||||
@@ -622,8 +607,6 @@
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d1 = 4;
|
||||
d2 = 8;
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/turf/open/floor/plasteel/brown{
|
||||
@@ -632,8 +615,6 @@
|
||||
/area/mine/production)
|
||||
"bS" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 4;
|
||||
d2 = 8;
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/obj/machinery/door/airlock/glass_mining{
|
||||
@@ -647,16 +628,12 @@
|
||||
/area/mine/eva)
|
||||
"bT" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 2;
|
||||
d2 = 8;
|
||||
icon_state = "2-8"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d1 = 4;
|
||||
d2 = 8;
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/turf/open/floor/plasteel/brown{
|
||||
@@ -668,8 +645,6 @@
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d1 = 2;
|
||||
d2 = 8;
|
||||
icon_state = "2-8"
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
@@ -716,8 +691,6 @@
|
||||
"cc" = (
|
||||
/obj/structure/chair/office/dark,
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 4;
|
||||
icon_state = "1-4"
|
||||
},
|
||||
/mob/living/simple_animal/bot/secbot/beepsky{
|
||||
@@ -743,20 +716,15 @@
|
||||
network = list("Labor")
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d2 = 8;
|
||||
icon_state = "0-8"
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/mine/laborcamp/security)
|
||||
"ce" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 2;
|
||||
d2 = 4;
|
||||
icon_state = "2-4"
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d1 = 5;
|
||||
d2 = 6;
|
||||
icon_state = "5-6"
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
@@ -764,7 +732,6 @@
|
||||
"cf" = (
|
||||
/obj/machinery/power/terminal,
|
||||
/obj/structure/cable{
|
||||
d2 = 8;
|
||||
icon_state = "0-8"
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
@@ -803,8 +770,6 @@
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
@@ -888,12 +853,9 @@
|
||||
charge = 5e+006
|
||||
},
|
||||
/obj/structure/cable{
|
||||
icon_state = "0-4";
|
||||
d2 = 4
|
||||
icon_state = "0-4"
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d1 = 0;
|
||||
d2 = 9;
|
||||
icon_state = "0-9"
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
@@ -914,8 +876,6 @@
|
||||
"cE" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
@@ -997,15 +957,12 @@
|
||||
charge = 5e+006
|
||||
},
|
||||
/obj/structure/cable{
|
||||
icon_state = "0-4";
|
||||
d2 = 4
|
||||
icon_state = "0-4"
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/mine/living_quarters)
|
||||
"cT" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 4;
|
||||
d2 = 8;
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/obj/machinery/light/small{
|
||||
@@ -1017,8 +974,6 @@
|
||||
"cU" = (
|
||||
/obj/machinery/portable_atmospherics/canister/oxygen,
|
||||
/obj/structure/cable{
|
||||
d1 = 2;
|
||||
d2 = 8;
|
||||
icon_state = "2-8"
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
@@ -1038,8 +993,7 @@
|
||||
pixel_y = 2
|
||||
},
|
||||
/obj/structure/cable{
|
||||
icon_state = "0-4";
|
||||
d2 = 4
|
||||
icon_state = "0-4"
|
||||
},
|
||||
/obj/machinery/light{
|
||||
dir = 8
|
||||
@@ -1051,13 +1005,9 @@
|
||||
"cY" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d1 = 2;
|
||||
d2 = 8;
|
||||
icon_state = "2-8"
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
@@ -1114,9 +1064,7 @@
|
||||
/area/mine/maintenance)
|
||||
"dh" = (
|
||||
/obj/structure/cable{
|
||||
icon_state = "0-2";
|
||||
pixel_y = 1;
|
||||
d2 = 2
|
||||
icon_state = "0-2"
|
||||
},
|
||||
/obj/machinery/power/apc{
|
||||
dir = 1;
|
||||
@@ -1178,15 +1126,12 @@
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/cable{
|
||||
icon_state = "0-2";
|
||||
d2 = 2
|
||||
icon_state = "0-2"
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/mine/living_quarters)
|
||||
"dp" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
|
||||
@@ -1234,8 +1179,6 @@
|
||||
/area/mine/production)
|
||||
"dx" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 4;
|
||||
icon_state = "1-4"
|
||||
},
|
||||
/obj/effect/baseturf_helper/lava_land/surface,
|
||||
@@ -1243,8 +1186,6 @@
|
||||
/area/mine/maintenance)
|
||||
"dy" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 2;
|
||||
d2 = 8;
|
||||
icon_state = "2-8"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
|
||||
@@ -1317,8 +1258,6 @@
|
||||
"dF" = (
|
||||
/obj/structure/cable,
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 4;
|
||||
icon_state = "1-4"
|
||||
},
|
||||
/obj/machinery/power/port_gen/pacman{
|
||||
@@ -1331,15 +1270,12 @@
|
||||
anchored = 1
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d2 = 8;
|
||||
icon_state = "0-8"
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/mine/living_quarters)
|
||||
"dH" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
|
||||
@@ -1420,8 +1356,6 @@
|
||||
req_access_txt = "48"
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
|
||||
@@ -1442,8 +1376,6 @@
|
||||
/area/mine/living_quarters)
|
||||
"dS" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/machinery/door/airlock/maintenance{
|
||||
@@ -1451,8 +1383,6 @@
|
||||
req_access_txt = "48"
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
|
||||
@@ -1504,8 +1434,6 @@
|
||||
"eb" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/turf/open/floor/plasteel/brown{
|
||||
@@ -1545,9 +1473,7 @@
|
||||
pixel_y = 25
|
||||
},
|
||||
/obj/structure/cable{
|
||||
icon_state = "0-2";
|
||||
pixel_y = 1;
|
||||
d2 = 2
|
||||
icon_state = "0-2"
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/mine/living_quarters)
|
||||
@@ -1560,8 +1486,6 @@
|
||||
/area/mine/living_quarters)
|
||||
"ei" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
|
||||
@@ -1619,8 +1543,6 @@
|
||||
"eq" = (
|
||||
/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 4;
|
||||
icon_state = "1-4"
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
@@ -1630,8 +1552,6 @@
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d1 = 4;
|
||||
d2 = 8;
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
@@ -1639,8 +1559,6 @@
|
||||
"es" = (
|
||||
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
|
||||
/obj/structure/cable{
|
||||
d1 = 4;
|
||||
d2 = 8;
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
@@ -1650,26 +1568,18 @@
|
||||
dir = 1
|
||||
},
|
||||
/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,
|
||||
/area/mine/living_quarters)
|
||||
"eu" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 4;
|
||||
icon_state = "1-4"
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 8;
|
||||
icon_state = "1-8"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
|
||||
@@ -1677,8 +1587,6 @@
|
||||
/area/mine/living_quarters)
|
||||
"ev" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 4;
|
||||
d2 = 8;
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
|
||||
@@ -1691,8 +1599,6 @@
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d1 = 4;
|
||||
d2 = 8;
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/turf/open/floor/plasteel/brown{
|
||||
@@ -1701,8 +1607,6 @@
|
||||
/area/mine/living_quarters)
|
||||
"ex" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 4;
|
||||
d2 = 8;
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/obj/machinery/door/airlock/glass_mining{
|
||||
@@ -1719,8 +1623,6 @@
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d1 = 4;
|
||||
d2 = 8;
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/turf/open/floor/plasteel/brown{
|
||||
@@ -1732,16 +1634,12 @@
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d1 = 4;
|
||||
d2 = 8;
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/mine/production)
|
||||
"eA" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 4;
|
||||
d2 = 8;
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/obj/machinery/door/airlock/glass_mining{
|
||||
@@ -1755,8 +1653,6 @@
|
||||
/area/mine/production)
|
||||
"eB" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 4;
|
||||
d2 = 8;
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
|
||||
@@ -1769,8 +1665,6 @@
|
||||
"eC" = (
|
||||
/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 8;
|
||||
icon_state = "1-8"
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -53,8 +53,6 @@
|
||||
"an" = (
|
||||
/obj/structure/lattice/catwalk,
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 4;
|
||||
icon_state = "1-4"
|
||||
},
|
||||
/turf/open/space,
|
||||
@@ -62,13 +60,9 @@
|
||||
"ao" = (
|
||||
/obj/structure/lattice/catwalk,
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d1 = 2;
|
||||
d2 = 8;
|
||||
icon_state = "2-8"
|
||||
},
|
||||
/turf/open/space,
|
||||
@@ -85,16 +79,13 @@
|
||||
},
|
||||
/obj/structure/closet/secure_closet/engineering_electrical,
|
||||
/obj/structure/cable{
|
||||
icon_state = "0-4";
|
||||
d2 = 4
|
||||
icon_state = "0-4"
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/engine/engineering)
|
||||
"aq" = (
|
||||
/obj/machinery/computer/monitor,
|
||||
/obj/structure/cable{
|
||||
d1 = 2;
|
||||
d2 = 8;
|
||||
icon_state = "2-8"
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
@@ -113,8 +104,7 @@
|
||||
pixel_y = 23
|
||||
},
|
||||
/obj/structure/cable{
|
||||
icon_state = "0-4";
|
||||
d2 = 4
|
||||
icon_state = "0-4"
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
@@ -128,12 +118,10 @@
|
||||
pixel_y = 25
|
||||
},
|
||||
/obj/structure/cable{
|
||||
icon_state = "0-8";
|
||||
d2 = 8
|
||||
icon_state = "0-8"
|
||||
},
|
||||
/obj/structure/cable{
|
||||
icon_state = "0-2";
|
||||
d2 = 2
|
||||
icon_state = "0-2"
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
@@ -176,18 +164,12 @@
|
||||
"aA" = (
|
||||
/obj/structure/lattice/catwalk,
|
||||
/obj/structure/cable{
|
||||
d1 = 4;
|
||||
d2 = 8;
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 4;
|
||||
icon_state = "1-4"
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d1 = 2;
|
||||
d2 = 4;
|
||||
icon_state = "2-4"
|
||||
},
|
||||
/turf/open/space,
|
||||
@@ -195,8 +177,6 @@
|
||||
"aB" = (
|
||||
/obj/structure/lattice/catwalk,
|
||||
/obj/structure/cable{
|
||||
d1 = 4;
|
||||
d2 = 8;
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/turf/open/space,
|
||||
@@ -204,29 +184,21 @@
|
||||
"aC" = (
|
||||
/obj/machinery/door/airlock,
|
||||
/obj/structure/cable{
|
||||
d1 = 4;
|
||||
d2 = 8;
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/engine/engineering)
|
||||
"aD" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 4;
|
||||
d2 = 8;
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/engine/engineering)
|
||||
"aE" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d1 = 2;
|
||||
d2 = 8;
|
||||
icon_state = "2-8"
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
@@ -248,8 +220,6 @@
|
||||
/area/engine/gravity_generator)
|
||||
"aH" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
@@ -308,8 +278,6 @@
|
||||
"aQ" = (
|
||||
/obj/structure/lattice/catwalk,
|
||||
/obj/structure/cable{
|
||||
d1 = 2;
|
||||
d2 = 4;
|
||||
icon_state = "2-4"
|
||||
},
|
||||
/turf/open/space,
|
||||
@@ -320,8 +288,6 @@
|
||||
icon_state = "1-8"
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/turf/open/space,
|
||||
@@ -336,13 +302,9 @@
|
||||
/area/engine/engineering)
|
||||
"aT" = (
|
||||
/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/plating,
|
||||
@@ -354,16 +316,12 @@
|
||||
req_one_access_txt = "0"
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d1 = 4;
|
||||
d2 = 8;
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/engine/gravity_generator)
|
||||
"aV" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 4;
|
||||
d2 = 8;
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
@@ -430,8 +388,6 @@
|
||||
/area/engine/engineering)
|
||||
"be" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
@@ -464,9 +420,7 @@
|
||||
pixel_x = -24
|
||||
},
|
||||
/obj/structure/cable{
|
||||
icon_state = "0-2";
|
||||
pixel_y = 1;
|
||||
d2 = 2
|
||||
icon_state = "0-2"
|
||||
},
|
||||
/obj/machinery/light,
|
||||
/obj/structure/table,
|
||||
@@ -528,8 +482,6 @@
|
||||
/area/engine/gravity_generator)
|
||||
"bs" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/turf/closed/wall/r_wall,
|
||||
@@ -553,8 +505,6 @@
|
||||
"bx" = (
|
||||
/obj/machinery/door/airlock,
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
@@ -578,9 +528,7 @@
|
||||
},
|
||||
/obj/structure/cable,
|
||||
/obj/structure/cable{
|
||||
icon_state = "0-2";
|
||||
pixel_y = 1;
|
||||
d2 = 2
|
||||
icon_state = "0-2"
|
||||
},
|
||||
/obj/machinery/airalarm{
|
||||
frequency = 1439;
|
||||
@@ -620,9 +568,7 @@
|
||||
pixel_x = -24
|
||||
},
|
||||
/obj/structure/cable{
|
||||
icon_state = "0-2";
|
||||
pixel_y = 1;
|
||||
d2 = 2
|
||||
icon_state = "0-2"
|
||||
},
|
||||
/obj/structure/closet/secure_closet/captains,
|
||||
/turf/open/floor/plasteel/blue/side{
|
||||
@@ -669,8 +615,6 @@
|
||||
/area/hallway/primary/central)
|
||||
"bO" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
@@ -706,9 +650,7 @@
|
||||
pixel_x = -24
|
||||
},
|
||||
/obj/structure/cable{
|
||||
icon_state = "0-2";
|
||||
pixel_y = 1;
|
||||
d2 = 2
|
||||
icon_state = "0-2"
|
||||
},
|
||||
/obj/structure/closet/firecloset/full,
|
||||
/turf/open/floor/plasteel/arrival{
|
||||
@@ -746,21 +688,15 @@
|
||||
/area/hallway/primary/central)
|
||||
"ca" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 4;
|
||||
icon_state = "1-4"
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d1 = 2;
|
||||
d2 = 4;
|
||||
icon_state = "2-4"
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/hallway/primary/central)
|
||||
"cb" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 4;
|
||||
d2 = 8;
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
|
||||
@@ -768,8 +704,6 @@
|
||||
/area/hallway/primary/central)
|
||||
"cc" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 4;
|
||||
d2 = 8;
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
@@ -777,21 +711,15 @@
|
||||
"cd" = (
|
||||
/obj/effect/spawner/structure/window/reinforced,
|
||||
/obj/structure/cable{
|
||||
d1 = 4;
|
||||
d2 = 8;
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/bridge)
|
||||
"ce" = (
|
||||
/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/blue/side{
|
||||
@@ -800,16 +728,12 @@
|
||||
/area/bridge)
|
||||
"cf" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 4;
|
||||
d2 = 8;
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/bridge)
|
||||
"cg" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 4;
|
||||
d2 = 8;
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/turf/open/floor/plasteel/blue/side{
|
||||
@@ -819,13 +743,9 @@
|
||||
"ch" = (
|
||||
/obj/effect/spawner/structure/window/reinforced,
|
||||
/obj/structure/cable{
|
||||
d1 = 4;
|
||||
d2 = 8;
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d1 = 2;
|
||||
d2 = 4;
|
||||
icon_state = "2-4"
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
@@ -833,16 +753,12 @@
|
||||
"ci" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
|
||||
/obj/structure/cable{
|
||||
d1 = 4;
|
||||
d2 = 8;
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/hallway/primary/central)
|
||||
"cj" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 4;
|
||||
d2 = 8;
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/obj/structure/cable{
|
||||
@@ -852,16 +768,12 @@
|
||||
/area/hallway/primary/central)
|
||||
"ck" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 4;
|
||||
d2 = 8;
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/turf/closed/wall/r_wall,
|
||||
/area/hallway/secondary/entry)
|
||||
"cl" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 8;
|
||||
icon_state = "1-8"
|
||||
},
|
||||
/turf/open/floor/plasteel/arrival{
|
||||
@@ -899,8 +811,6 @@
|
||||
/area/bridge)
|
||||
"cs" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/turf/closed/wall/r_wall,
|
||||
@@ -970,8 +880,6 @@
|
||||
/area/hallway/primary/central)
|
||||
"cE" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
|
||||
@@ -1047,8 +955,6 @@
|
||||
/area/construction)
|
||||
"cO" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/turf/closed/wall/r_wall,
|
||||
@@ -1070,8 +976,6 @@
|
||||
/area/storage/primary)
|
||||
"cT" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/turf/closed/wall/r_wall,
|
||||
|
||||
+25510
-25564
File diff suppressed because it is too large
Load Diff
@@ -539,6 +539,7 @@
|
||||
name = "Cere emergency shuttle";
|
||||
port_direction = 4;
|
||||
preferred_direction = 2;
|
||||
timid = 1;
|
||||
width = 42
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
|
||||
@@ -442,7 +442,8 @@
|
||||
name = "Delta emergency shuttle";
|
||||
width = 30;
|
||||
preferred_direction = 2;
|
||||
port_direction = 4
|
||||
port_direction = 4;
|
||||
timid = 1
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/shuttle/escape)
|
||||
|
||||
@@ -34,6 +34,7 @@
|
||||
dwidth = 5;
|
||||
height = 14;
|
||||
name = "Meta emergency shuttle";
|
||||
timid = 1;
|
||||
width = 25
|
||||
},
|
||||
/turf/open/floor/mineral/titanium/blue,
|
||||
|
||||
@@ -280,6 +280,7 @@
|
||||
height = 15;
|
||||
name = "Pubby emergency shuttle";
|
||||
port_direction = 4;
|
||||
timid = 1;
|
||||
width = 18
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
|
||||
@@ -50,7 +50,9 @@
|
||||
/turf/open/floor/noslip,
|
||||
/area/shuttle/escape)
|
||||
"am" = (
|
||||
/obj/structure/reflector/single/anchored,
|
||||
/obj/structure/reflector/single/anchored{
|
||||
dir = 6
|
||||
},
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 8
|
||||
},
|
||||
@@ -62,9 +64,8 @@
|
||||
/area/shuttle/escape)
|
||||
"ao" = (
|
||||
/obj/structure/reflector/single{
|
||||
icon_state = "reflector";
|
||||
dir = 8;
|
||||
anchored = 1
|
||||
anchored = 1;
|
||||
dir = 10
|
||||
},
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 4
|
||||
@@ -196,26 +197,28 @@
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/shuttle/escape)
|
||||
"aN" = (
|
||||
/obj/structure/reflector/single/anchored,
|
||||
/obj/structure/reflector/single/anchored{
|
||||
dir = 6
|
||||
},
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/shuttle/escape)
|
||||
"aO" = (
|
||||
/obj/structure/reflector/double/anchored,
|
||||
/obj/structure/reflector/double/anchored{
|
||||
dir = 6
|
||||
},
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/shuttle/escape)
|
||||
"aP" = (
|
||||
/obj/structure/reflector/double{
|
||||
icon_state = "reflector_double";
|
||||
dir = 1;
|
||||
anchored = 1
|
||||
anchored = 1;
|
||||
dir = 10
|
||||
},
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/shuttle/escape)
|
||||
"aQ" = (
|
||||
/obj/structure/reflector/single{
|
||||
icon_state = "reflector";
|
||||
dir = 8;
|
||||
anchored = 1
|
||||
anchored = 1;
|
||||
dir = 10
|
||||
},
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/shuttle/escape)
|
||||
|
||||
@@ -11,12 +11,14 @@
|
||||
"ad" = (
|
||||
/obj/machinery/door/airlock/titanium,
|
||||
/obj/docking_port/mobile{
|
||||
callTime = 250;
|
||||
dheight = 0;
|
||||
dir = 2;
|
||||
dwidth = 11;
|
||||
height = 22;
|
||||
id = "whiteship";
|
||||
launch_status = 0;
|
||||
movement_force = list("KNOCKDOWN" = 0, "THROW" = 0);
|
||||
name = "NT Medical Ship";
|
||||
port_direction = 8;
|
||||
preferred_direction = 4;
|
||||
@@ -374,7 +376,9 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/shuttle/abandoned)
|
||||
"bu" = (
|
||||
/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship,
|
||||
/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship{
|
||||
view_range = 18
|
||||
},
|
||||
/turf/open/floor/mineral/titanium,
|
||||
/area/shuttle/abandoned)
|
||||
|
||||
|
||||
@@ -23,6 +23,7 @@
|
||||
name = "NT Recovery White-Ship";
|
||||
port_direction = 8;
|
||||
preferred_direction = 1;
|
||||
timid = 1;
|
||||
roundstart_move = "whiteship_away";
|
||||
width = 16
|
||||
},
|
||||
|
||||
+667
-814
File diff suppressed because it is too large
Load Diff
@@ -624,6 +624,15 @@
|
||||
/obj/machinery/porta_turret/centcom_shuttle/setup()
|
||||
return
|
||||
|
||||
/obj/machinery/porta_turret/centcom_shuttle/weak
|
||||
max_integrity = 120
|
||||
integrity_failure = 60
|
||||
name = "Old Laser Turret"
|
||||
desc = "A turret built with substandard parts and run down further with age. Still capable of delivering lethal lasers to the odd space carp, but not much else."
|
||||
stun_projectile = /obj/item/projectile/beam/weak
|
||||
lethal_projectile = /obj/item/projectile/beam/weak
|
||||
faction = "neutral"
|
||||
|
||||
////////////////////////
|
||||
//Turret Control Panel//
|
||||
////////////////////////
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
var/list/random_icon_states = list()
|
||||
var/blood_state = "" //I'm sorry but cleanable/blood code is ass, and so is blood_DNA
|
||||
var/bloodiness = 0 //0-100, amount of blood in this decal, used for making footprints and affecting the alpha of bloody footprints
|
||||
var/mergeable_decal = 1 //when two of these are on a same tile or do we need to merge them into just one?
|
||||
var/mergeable_decal = TRUE //when two of these are on a same tile or do we need to merge them into just one?
|
||||
|
||||
/obj/effect/decal/cleanable/Initialize(mapload, list/datum/disease/diseases)
|
||||
if (random_icon_states && length(src.random_icon_states) > 0)
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
icon_state = "xgib1"
|
||||
layer = LOW_OBJ_LAYER
|
||||
random_icon_states = list("xgib1", "xgib2", "xgib3", "xgib4", "xgib5", "xgib6")
|
||||
mergeable_decal = 0
|
||||
mergeable_decal = FALSE
|
||||
|
||||
/obj/effect/decal/cleanable/xenoblood/xgibs/proc/streak(list/directions)
|
||||
set waitfor = 0
|
||||
|
||||
@@ -50,7 +50,7 @@
|
||||
icon_state = "gibbl5"
|
||||
layer = LOW_OBJ_LAYER
|
||||
random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6")
|
||||
mergeable_decal = 0
|
||||
mergeable_decal = FALSE
|
||||
|
||||
/obj/effect/decal/cleanable/blood/gibs/Initialize(mapload, list/datum/disease/diseases)
|
||||
. = ..()
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
desc = "Ashes to ashes, dust to dust, and into space."
|
||||
icon = 'icons/obj/objects.dmi'
|
||||
icon_state = "ash"
|
||||
mergeable_decal = 0
|
||||
mergeable_decal = FALSE
|
||||
|
||||
/obj/effect/decal/cleanable/ash/Initialize()
|
||||
. = ..()
|
||||
@@ -67,7 +67,7 @@
|
||||
gender = NEUTER
|
||||
icon = 'icons/effects/effects.dmi'
|
||||
icon_state = "molten"
|
||||
mergeable_decal = 0
|
||||
mergeable_decal = FALSE
|
||||
|
||||
/obj/effect/decal/cleanable/molten_object/large
|
||||
name = "big gooey grey mass"
|
||||
@@ -144,7 +144,7 @@
|
||||
desc = "The shredded remains of what appears to be clothing."
|
||||
icon_state = "shreds"
|
||||
gender = PLURAL
|
||||
mergeable_decal = 0
|
||||
mergeable_decal = FALSE
|
||||
|
||||
/obj/effect/decal/cleanable/shreds/ex_act(severity, target)
|
||||
if(severity == 1) //so shreds created during an explosion aren't deleted by the explosion.
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6", "gib7")
|
||||
blood_state = BLOOD_STATE_OIL
|
||||
bloodiness = MAX_SHOE_BLOODINESS
|
||||
mergeable_decal = 0
|
||||
mergeable_decal = FALSE
|
||||
|
||||
/obj/effect/decal/cleanable/robot_debris/proc/streak(list/directions)
|
||||
set waitfor = 0
|
||||
|
||||
@@ -3,6 +3,12 @@
|
||||
gender = PLURAL
|
||||
icon = 'icons/effects/blood.dmi'
|
||||
|
||||
/obj/effect/decal/remains/acid_act()
|
||||
visible_message("<span class='warning'>[src] dissolve[gender==PLURAL?"":"s"] into a puddle of sizzling goop!</span>")
|
||||
playsound(src, 'sound/items/welder.ogg', 150, 1)
|
||||
new /obj/effect/decal/cleanable/greenglow(drop_location())
|
||||
qdel(src)
|
||||
|
||||
/obj/effect/decal/remains/human
|
||||
desc = "They look like human remains. They have a strange aura about them."
|
||||
icon_state = "remains"
|
||||
|
||||
+1
-4
@@ -1265,14 +1265,11 @@
|
||||
#include "code\modules\clothing\glasses\engine_goggles.dm"
|
||||
#include "code\modules\clothing\glasses\hud.dm"
|
||||
#include "code\modules\clothing\glasses\vg_glasses.dm"
|
||||
#include "code\modules\clothing\gloves\boxing.dm"
|
||||
#include "code\modules\clothing\gloves\color.dm"
|
||||
#include "code\modules\clothing\gloves\miscellaneous.dm"
|
||||
#include "code\modules\clothing\gloves\vg_gloves.dm"
|
||||
#include "code\modules\clothing\gloves\_gloves.dm"
|
||||
#include "code\modules\clothing\gloves\boxing.dm"
|
||||
#include "code\modules\clothing\gloves\color.dm"
|
||||
#include "code\modules\clothing\gloves\miscellaneous.dm"
|
||||
#include "code\modules\clothing\gloves\vg_gloves.dm"
|
||||
#include "code\modules\clothing\head\_head.dm"
|
||||
#include "code\modules\clothing\head\beanie.dm"
|
||||
#include "code\modules\clothing\head\cit_hats.dm"
|
||||
|
||||
Reference in New Issue
Block a user