This commit is contained in:
Arkatos1
2019-05-13 22:21:48 +02:00
586 changed files with 12352 additions and 10897 deletions
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+273 -276
View File
@@ -10,9 +10,6 @@
dir = 8
},
/area/space)
"ad" = (
/turf/space/transit,
/area/syndicate_station/transit)
"ae" = (
/turf/unsimulated/wall{
tag = "icon-iron6";
@@ -1284,7 +1281,7 @@
width = 18
},
/turf/space/transit,
/area/syndicate_station/transit)
/area/space)
"dy" = (
/obj/docking_port/stationary/transit{
dir = 8;
@@ -14886,15 +14883,15 @@ aa
aa
aa
aa
ad
ad
ad
ad
ad
ad
ad
ad
ad
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
@@ -15137,21 +15134,21 @@ aa
aa
aa
aa
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
@@ -15394,21 +15391,21 @@ aa
aa
aa
aa
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
@@ -15651,21 +15648,21 @@ aa
aa
aa
aa
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
@@ -15901,28 +15898,28 @@ aa
aa
aa
aa
ad
ad
ad
ad
ad
aa
aa
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
@@ -16158,25 +16155,25 @@ aa
aa
aa
aa
ad
ad
ad
ad
ad
aa
aa
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
@@ -16415,27 +16412,27 @@ aa
aa
aa
aa
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
@@ -16672,27 +16669,27 @@ aa
aa
aa
aa
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
@@ -16929,27 +16926,27 @@ aa
aa
aa
aa
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
@@ -17186,27 +17183,27 @@ aa
aa
aa
aa
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
@@ -17443,27 +17440,27 @@ aa
aa
aa
aa
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
@@ -17700,25 +17697,25 @@ aa
aa
aa
aa
ad
ad
ad
ad
ad
aa
aa
aa
aa
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
@@ -17957,28 +17954,28 @@ aa
aa
aa
aa
ad
ad
ad
ad
ad
aa
aa
aa
aa
aa
aa
aa
aa
aa
dx
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
@@ -18223,19 +18220,19 @@ aa
aa
aa
aa
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
@@ -18480,19 +18477,19 @@ aa
aa
aa
aa
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
@@ -18741,15 +18738,15 @@ aa
aa
aa
aa
ad
ad
ad
ad
ad
ad
ad
ad
ad
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
@@ -18998,15 +18995,15 @@ aa
aa
aa
aa
ad
ad
ad
ad
ad
ad
ad
ad
ad
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
+34 -34
View File
@@ -145,7 +145,7 @@
"ay" = (
/obj/structure/lattice,
/turf/space,
/area/space)
/area/space/nearstation)
"az" = (
/obj/effect/landmark/damageturf,
/turf/simulated/floor/plating/airless{
@@ -156,31 +156,31 @@
"be" = (
/obj/item/trash/cheesie,
/turf/space,
/area/space)
/area/space/nearstation)
"bj" = (
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"bk" = (
/obj/structure/lattice,
/obj/structure/grille/broken,
/turf/space,
/area/space)
/area/space/nearstation)
"bl" = (
/obj/structure/lattice,
/obj/structure/grille,
/turf/space,
/area/space)
/area/space/nearstation)
"bm" = (
/obj/structure/grille,
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"bn" = (
/turf/simulated/wall/r_wall,
/area/space)
/area/space/nearstation)
"bo" = (
/obj/structure/girder,
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"bp" = (
/turf/simulated/wall/r_wall,
/area/tcommsat/chamber)
@@ -198,7 +198,7 @@
dir = 4
},
/turf/space,
/area/space)
/area/space/nearstation)
"bt" = (
/obj/structure/window/reinforced{
dir = 8
@@ -258,7 +258,7 @@
dir = 4
},
/turf/space,
/area/space)
/area/space/nearstation)
"bE" = (
/obj/structure/cable{
d1 = 1;
@@ -285,7 +285,7 @@
dir = 8
},
/turf/space,
/area/space)
/area/space/nearstation)
"bI" = (
/turf/simulated/floor/plating/airless,
/area/tcommsat/chamber)
@@ -355,7 +355,7 @@
dir = 8
},
/turf/space,
/area/space)
/area/space/nearstation)
"bV" = (
/obj/item/folder/yellow,
/turf/simulated/floor/plating/airless,
@@ -372,7 +372,7 @@
},
/obj/structure/lattice,
/turf/space,
/area/space)
/area/space/nearstation)
"bY" = (
/obj/structure/window/reinforced,
/obj/structure/window/reinforced{
@@ -383,7 +383,7 @@
},
/obj/structure/lattice,
/turf/space,
/area/space)
/area/space/nearstation)
"bZ" = (
/obj/structure/window/reinforced{
dir = 8
@@ -399,18 +399,18 @@
dir = 8
},
/turf/space,
/area/space)
/area/space/nearstation)
"cb" = (
/obj/structure/window/reinforced,
/obj/structure/window/reinforced{
dir = 1
},
/turf/space,
/area/space)
/area/space/nearstation)
"cc" = (
/obj/structure/window/reinforced,
/turf/space,
/area/space)
/area/space/nearstation)
"cd" = (
/obj/structure/sign/securearea,
/turf/simulated/wall/r_wall,
@@ -520,20 +520,20 @@
dir = 4
},
/turf/simulated/wall/r_wall,
/area/space)
/area/space/nearstation)
"cv" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/structure/grille/broken,
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"cw" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"cx" = (
/obj/structure/disposaloutlet{
dir = 4
@@ -542,7 +542,7 @@
dir = 8
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"cy" = (
/obj/structure/window/reinforced{
dir = 8
@@ -562,20 +562,20 @@
dir = 1
},
/turf/space,
/area/space)
/area/space/nearstation)
"cA" = (
/obj/structure/window/reinforced{
dir = 1
},
/obj/structure/lattice,
/turf/space,
/area/space)
/area/space/nearstation)
"cB" = (
/obj/structure/window/reinforced{
dir = 1
},
/turf/space,
/area/space)
/area/space/nearstation)
"cC" = (
/obj/structure/table,
/obj/item/radio/off,
@@ -606,14 +606,14 @@
/turf/simulated/floor/plasteel{
icon_state = "solarpanel"
},
/area/space)
/area/space/nearstation)
"cI" = (
/obj/structure/window/reinforced{
dir = 4
},
/obj/structure/lattice,
/turf/space,
/area/space)
/area/space/nearstation)
"cJ" = (
/obj/structure/window/reinforced{
dir = 8
@@ -679,7 +679,7 @@
},
/obj/structure/lattice,
/turf/space,
/area/space)
/area/space/nearstation)
"cQ" = (
/obj/structure/window/reinforced{
dir = 4
@@ -846,19 +846,19 @@
},
/obj/structure/window/reinforced,
/turf/space,
/area/space)
/area/space/nearstation)
"du" = (
/obj/structure/window/reinforced,
/obj/structure/lattice,
/turf/space,
/area/space)
/area/space/nearstation)
"dz" = (
/obj/structure/window/reinforced{
dir = 4
},
/obj/structure/window/reinforced,
/turf/space,
/area/space)
/area/space/nearstation)
"dA" = (
/obj/structure/window/reinforced,
/obj/structure/window/reinforced{
@@ -886,7 +886,7 @@
icon_state = "medium"
},
/turf/space,
/area/space)
/area/space/nearstation)
"dJ" = (
/obj/structure/lattice,
/obj/item/stack/rods,
@@ -894,7 +894,7 @@
icon_state = "medium"
},
/turf/space,
/area/space)
/area/space/nearstation)
"dK" = (
/obj/structure/grille,
/obj/structure/window/reinforced{
@@ -906,7 +906,7 @@
"dM" = (
/obj/structure/grille/broken,
/turf/space,
/area/space)
/area/space/nearstation)
"dO" = (
/obj/machinery/door/airlock/hatch,
/turf/simulated/floor/plasteel,
@@ -943,7 +943,7 @@
"ed" = (
/obj/item/crowbar,
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"ej" = (
/obj/structure/computerframe,
/turf/simulated/floor/plating,
+99 -99
View File
@@ -5,7 +5,7 @@
"ab" = (
/obj/structure/grille,
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"ac" = (
/obj/machinery/power/solar/fake,
/turf/simulated/floor/plating/airless{
@@ -18,7 +18,7 @@
"ae" = (
/obj/structure/lattice,
/turf/space,
/area/space)
/area/space/nearstation)
"af" = (
/turf/simulated/wall,
/area/djstation)
@@ -350,7 +350,7 @@
"aY" = (
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"aZ" = (
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
@@ -460,7 +460,7 @@
},
/obj/structure/disposaloutlet,
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"bl" = (
/turf/simulated/floor/plating/airless{
tag = "icon-platingdmg2";
@@ -646,7 +646,7 @@
/area/derelict/bridge/ai_upload)
"bE" = (
/turf/simulated/floor/plating,
/area/space)
/area/space/nearstation)
"bF" = (
/turf/simulated/floor/plasteel,
/area/derelict/solar_control)
@@ -843,7 +843,7 @@
/area/derelict/solar_control)
"ce" = (
/turf/simulated/wall/r_wall,
/area/space)
/area/space/nearstation)
"cf" = (
/obj/machinery/porta_turret,
/turf/simulated/floor/plasteel,
@@ -877,7 +877,7 @@
"cj" = (
/obj/structure/grille/broken,
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"ck" = (
/obj/machinery/light/small,
/turf/simulated/floor/plasteel,
@@ -908,7 +908,7 @@
"co" = (
/obj/structure/grille,
/turf/space,
/area/space)
/area/space/nearstation)
"cp" = (
/obj/structure/grille,
/turf/simulated/floor/plating/airless,
@@ -1019,7 +1019,7 @@
"cH" = (
/obj/structure/closet/crate,
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"cI" = (
/turf/simulated/floor/plating/airless{
icon_state = "damaged4"
@@ -1115,7 +1115,7 @@
/turf/simulated/floor/plating/airless{
icon_state = "damaged4"
},
/area/space)
/area/space/nearstation)
"cZ" = (
/obj/structure/cable{
d1 = 1;
@@ -1167,7 +1167,7 @@
/area/derelict/bridge/ai_upload)
"df" = (
/turf/simulated/wall,
/area/space)
/area/space/nearstation)
"dg" = (
/obj/structure/cable{
d1 = 1;
@@ -1197,7 +1197,7 @@
/obj/item/stack/ore/iron,
/obj/item/stack/ore/iron,
/turf/space,
/area/space)
/area/space/nearstation)
"dl" = (
/turf/simulated/floor/plating/airless{
icon_state = "damaged2"
@@ -1309,7 +1309,7 @@
"dE" = (
/obj/item/stack/ore/slag,
/turf/space,
/area/space)
/area/space/nearstation)
"dF" = (
/obj/structure/cable{
d1 = 1;
@@ -1490,7 +1490,7 @@
/turf/simulated/floor/plating/airless{
icon_state = "solarpanel"
},
/area/space)
/area/space/nearstation)
"eb" = (
/obj/structure/cable{
d1 = 4;
@@ -1536,7 +1536,7 @@
"ef" = (
/obj/item/stack/cable_coil/cut,
/turf/space,
/area/space)
/area/space/nearstation)
"eg" = (
/obj/machinery/light/small{
dir = 8
@@ -1893,7 +1893,7 @@
"fk" = (
/obj/item/stack/rods,
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"fl" = (
/obj/structure/grille,
/obj/structure/window/reinforced,
@@ -2088,7 +2088,7 @@
"fK" = (
/obj/item/stack/rods,
/turf/space,
/area/space)
/area/space/nearstation)
"fL" = (
/obj/structure/grille,
/obj/structure/window/reinforced{
@@ -2283,7 +2283,7 @@
/area/derelict/bridge/access)
"gp" = (
/turf/simulated/wall/mineral/bananium,
/area/space)
/area/space/nearstation)
"gq" = (
/obj/structure/window/reinforced{
dir = 4
@@ -2460,7 +2460,7 @@
"gO" = (
/obj/machinery/door/airlock/bananium,
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"gP" = (
/obj/structure/cable{
d1 = 2;
@@ -2513,28 +2513,28 @@
"gX" = (
/obj/item/flag/clown,
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"gY" = (
/obj/effect/landmark/damageturf,
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"gZ" = (
/obj/effect/landmark/burnturf,
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"ha" = (
/obj/effect/mob_spawn/human/corpse/clownmili{
name = "Clown Pilot"
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"hb" = (
/obj/effect/mob_spawn/human/corpse/clownmili,
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"hc" = (
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"hd" = (
/obj/machinery/light/small{
dir = 4
@@ -2627,7 +2627,7 @@
/turf/simulated/floor/plating/airless{
icon_state = "floorscorched2"
},
/area/space)
/area/space/nearstation)
"hp" = (
/obj/structure/computerframe,
/obj/effect/landmark/damageturf,
@@ -2648,7 +2648,7 @@
name = "Clown Pilot"
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"hs" = (
/obj/structure/closet,
/obj/structure/window/reinforced{
@@ -2707,7 +2707,7 @@
"hB" = (
/obj/item/shard,
/turf/space,
/area/space)
/area/space/nearstation)
"hC" = (
/obj/structure/window/reinforced,
/turf/simulated/floor/plating/airless,
@@ -2738,7 +2738,7 @@
dir = 5
},
/turf/space,
/area/space)
/area/space/nearstation)
"hG" = (
/turf/simulated/wall/r_wall,
/area/derelict/arrival)
@@ -2769,7 +2769,7 @@
/obj/structure/lattice,
/obj/structure/window/basic,
/turf/space,
/area/space)
/area/space/nearstation)
"hN" = (
/obj/structure/table,
/turf/simulated/floor/plasteel,
@@ -2901,7 +2901,7 @@
name = "External Engineering"
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"il" = (
/obj/machinery/light{
icon_state = "tube1";
@@ -2970,7 +2970,7 @@
icon_state = "medium"
},
/turf/space,
/area/space)
/area/space/nearstation)
"iv" = (
/obj/structure/table,
/turf/simulated/floor/plasteel{
@@ -2996,7 +2996,7 @@
dir = 1
},
/turf/space,
/area/space)
/area/space/nearstation)
"iz" = (
/obj/structure/lattice,
/obj/structure/lattice,
@@ -3004,7 +3004,7 @@
dir = 1
},
/turf/space,
/area/space)
/area/space/nearstation)
"iA" = (
/turf/simulated/floor/plating,
/area/derelict/arrival)
@@ -3014,7 +3014,7 @@
},
/obj/structure/grille,
/turf/space,
/area/space)
/area/space/nearstation)
"iC" = (
/turf/simulated/floor/plasteel{
dir = 8;
@@ -3106,7 +3106,7 @@
"iN" = (
/obj/item/stack/cable_coil/cut,
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"iO" = (
/obj/structure/table,
/obj/structure/window/reinforced{
@@ -3204,7 +3204,7 @@
"jb" = (
/obj/structure/window/reinforced,
/turf/space,
/area/space)
/area/space/nearstation)
"jc" = (
/obj/structure/window/reinforced{
dir = 4
@@ -3212,7 +3212,7 @@
/obj/structure/window/reinforced,
/obj/structure/grille,
/turf/space,
/area/space)
/area/space/nearstation)
"jd" = (
/obj/structure/window/reinforced{
dir = 1
@@ -3283,13 +3283,13 @@
"jl" = (
/obj/item/shard,
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"jm" = (
/obj/structure/window/reinforced,
/turf/simulated/floor/plating/airless{
icon_state = "white"
},
/area/space)
/area/space/nearstation)
"jn" = (
/obj/structure/cable{
d1 = 4;
@@ -3337,7 +3337,7 @@
icon_state = "medium"
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"jt" = (
/obj/structure/cable{
d1 = 4;
@@ -3380,13 +3380,13 @@
"jw" = (
/obj/structure/closet/l3closet,
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"jx" = (
/obj/structure/window/reinforced{
dir = 1
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"jy" = (
/obj/item/pen,
/turf/simulated/floor/plasteel,
@@ -3396,7 +3396,7 @@
dir = 1
},
/turf/space,
/area/space)
/area/space/nearstation)
"jA" = (
/obj/structure/window/reinforced{
dir = 4
@@ -3406,7 +3406,7 @@
},
/obj/structure/grille,
/turf/space,
/area/space)
/area/space/nearstation)
"jB" = (
/obj/structure/cable{
d1 = 2;
@@ -3453,7 +3453,7 @@
"jG" = (
/obj/item/cigbutt,
/turf/space,
/area/space)
/area/space/nearstation)
"jH" = (
/obj/structure/table,
/obj/item/stock_parts/cell,
@@ -3496,7 +3496,7 @@
/turf/simulated/floor/plating/airless{
icon_state = "white"
},
/area/space)
/area/space/nearstation)
"jN" = (
/obj/machinery/light{
icon_state = "tube1";
@@ -3554,7 +3554,7 @@
icon_state = "4-8"
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"jT" = (
/obj/structure/cable{
d1 = 2;
@@ -3562,7 +3562,7 @@
icon_state = "2-8"
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"jU" = (
/obj/structure/closet/wardrobe/genetics_white,
/turf/simulated/floor/plating/airless{
@@ -3577,7 +3577,7 @@
dir = 1
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"jW" = (
/obj/machinery/light/small{
dir = 4
@@ -3593,12 +3593,12 @@
icon_state = "medium"
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"jY" = (
/turf/simulated/floor/plating/airless{
icon_state = "white"
},
/area/space)
/area/space/nearstation)
"jZ" = (
/obj/structure/cable{
d1 = 1;
@@ -3606,7 +3606,7 @@
icon_state = "1-4"
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"ka" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable{
@@ -3615,7 +3615,7 @@
icon_state = "4-8"
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"kb" = (
/obj/machinery/light/small{
dir = 4
@@ -3629,7 +3629,7 @@
icon_state = "medium"
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"kd" = (
/obj/structure/window/basic{
dir = 1
@@ -3640,7 +3640,7 @@
icon_state = "4-8"
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"ke" = (
/obj/machinery/door/window{
dir = 8
@@ -3652,7 +3652,7 @@
icon_state = "small"
},
/turf/space,
/area/space)
/area/space/nearstation)
"kg" = (
/obj/machinery/light/small{
dir = 1
@@ -3667,7 +3667,7 @@
icon_state = "4-8"
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"ki" = (
/obj/structure/cable{
d1 = 4;
@@ -3728,13 +3728,13 @@
"kp" = (
/obj/structure/window/basic,
/turf/space,
/area/space)
/area/space/nearstation)
"kq" = (
/obj/structure/window/basic{
dir = 8
},
/turf/space,
/area/space)
/area/space/nearstation)
"kr" = (
/obj/structure/cable{
d1 = 4;
@@ -3827,12 +3827,12 @@
},
/obj/structure/window/basic,
/turf/space,
/area/space)
/area/space/nearstation)
"kE" = (
/obj/structure/lattice,
/obj/structure/grille,
/turf/space,
/area/space)
/area/space/nearstation)
"kF" = (
/obj/machinery/door/airlock/external{
name = "Arrivals Docking Bay 1"
@@ -3972,7 +3972,7 @@
icon_state = "1-2"
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"kV" = (
/obj/machinery/door/airlock/maintenance{
name = "Atmospherics Access";
@@ -4017,7 +4017,7 @@
},
/obj/structure/window/reinforced,
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"ld" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
tag = "icon-manifold-b-f (EAST)";
@@ -4038,26 +4038,26 @@
dir = 1
},
/turf/space,
/area/space)
/area/space/nearstation)
"lg" = (
/obj/structure/window/basic{
dir = 5
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"lh" = (
/obj/structure/grille,
/obj/structure/window/basic{
dir = 1
},
/turf/space,
/area/space)
/area/space/nearstation)
"li" = (
/obj/structure/window/basic{
dir = 1
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"lj" = (
/obj/machinery/door/airlock/maintenance{
name = "Atmospherics Access";
@@ -4114,7 +4114,7 @@
icon_state = "4-8"
},
/turf/simulated/wall/r_wall,
/area/space)
/area/space/nearstation)
"lt" = (
/obj/structure/cable{
d1 = 4;
@@ -4130,14 +4130,14 @@
"lv" = (
/obj/structure/girder,
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"lw" = (
/obj/structure/lattice,
/obj/structure/window/basic{
dir = 4
},
/turf/space,
/area/space)
/area/space/nearstation)
"lx" = (
/obj/structure/girder,
/obj/structure/window/basic,
@@ -4191,13 +4191,13 @@
"lD" = (
/obj/machinery/door/window,
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"lE" = (
/obj/item/shard{
icon_state = "small"
},
/turf/simulated/floor/plating/airless/asteroid,
/area/space)
/area/space/nearstation)
"lF" = (
/obj/structure/window/basic{
dir = 1
@@ -4223,7 +4223,7 @@
dir = 8
},
/turf/simulated/floor/plating/airless/asteroid,
/area/space)
/area/space/nearstation)
"lJ" = (
/obj/machinery/vending/sovietsoda,
/turf/simulated/floor/plating/airless,
@@ -4235,24 +4235,24 @@
"lL" = (
/obj/structure/table,
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"lM" = (
/obj/structure/window/reinforced{
dir = 8
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"lN" = (
/obj/item/paper{
info = "The call has gone out! Our ancestral home has been rediscovered! Not a small patch of land, but a true clown nation, a true Clown Planet! We're on our way home at last!"
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"lO" = (
/obj/structure/lattice,
/obj/item/stack/cable_coil/cut,
/turf/space,
/area/space)
/area/space/nearstation)
"lP" = (
/obj/structure/girder,
/turf/simulated/floor/plating,
@@ -4273,13 +4273,13 @@
"lS" = (
/obj/structure/closet/wardrobe/orange,
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"lT" = (
/obj/structure/window/basic{
dir = 4
},
/turf/space,
/area/space)
/area/space/nearstation)
"lU" = (
/obj/structure/grille,
/turf/simulated/floor/plating,
@@ -4328,7 +4328,7 @@
dir = 8
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"me" = (
/turf/simulated/wall/r_wall,
/area/derelict/atmospherics)
@@ -4343,7 +4343,7 @@
"mg" = (
/obj/structure/window/reinforced,
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"mh" = (
/obj/structure/grille,
/obj/structure/grille,
@@ -4354,11 +4354,11 @@
dir = 8
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"mi" = (
/obj/structure/bed,
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"mj" = (
/turf/simulated/floor/plating/airless{
icon_state = "floorgrime"
@@ -4403,7 +4403,7 @@
dir = 8
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"mr" = (
/obj/structure/closet/wardrobe/mixed,
/turf/simulated/floor/plasteel,
@@ -4411,7 +4411,7 @@
"ms" = (
/obj/item/pickaxe,
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"mt" = (
/obj/machinery/atmospherics/unary/portables_connector{
dir = 4
@@ -4458,7 +4458,7 @@
dir = 8
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"my" = (
/obj/structure/grille,
/obj/structure/window/reinforced{
@@ -4515,7 +4515,7 @@
dir = 4
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"mH" = (
/obj/machinery/light/small{
dir = 1
@@ -4601,7 +4601,7 @@
dir = 5
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"mP" = (
/obj/structure/window/reinforced,
/turf/simulated/floor/plasteel,
@@ -4782,7 +4782,7 @@
icon_state = "right"
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"nl" = (
/obj/machinery/door/window{
base_state = "right";
@@ -5039,7 +5039,7 @@
/obj/item/stack/cable_coil/cut,
/turf/space,
/turf/simulated/floor/plating/airless/catwalk,
/area/space)
/area/space/nearstation)
"nM" = (
/turf/simulated/floor/plating/airless{
icon_state = "derelict1"
@@ -5173,7 +5173,7 @@
"oi" = (
/obj/structure/girder/reinforced,
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"oj" = (
/obj/structure/cable{
d1 = 1;
@@ -5238,7 +5238,7 @@
req_access_txt = "46"
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"os" = (
/obj/structure/table,
/obj/item/stack/sheet/metal{
@@ -5264,7 +5264,7 @@
opened = 1
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"ou" = (
/obj/structure/shuttle/engine/propulsion{
color = "#FFFF00";
@@ -5272,7 +5272,7 @@
icon_state = "propulsion_l"
},
/turf/space,
/area/space)
/area/space/nearstation)
"ov" = (
/obj/machinery/atmospherics/unary/vent_pump{
on = 1
@@ -5292,7 +5292,7 @@
/turf/simulated/floor/plating/airless{
color = "#FFFF00"
},
/area/space)
/area/space/nearstation)
"ox" = (
/turf/simulated/floor/plating/airless,
/area/derelict/se_solar)
@@ -5314,7 +5314,7 @@
/turf/simulated/floor/plating/airless{
color = "#FFFF00"
},
/area/space)
/area/space/nearstation)
"oB" = (
/obj/machinery/light/small{
dir = 4
@@ -5373,10 +5373,10 @@
/area/derelict/teleporter)
"pr" = (
/turf/simulated/mineral/random,
/area/space)
/area/space/nearstation)
"ps" = (
/turf/simulated/floor/plating/airless/asteroid,
/area/space)
/area/space/nearstation)
(1,1,1) = {"
aa
@@ -315,7 +315,7 @@
dir = 4
},
/turf/space,
/area/space)
/area/space/nearstation)
"aL" = (
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -356,7 +356,7 @@
dir = 8
},
/turf/space,
/area/space)
/area/space/nearstation)
"aR" = (
/obj/machinery/light/small{
dir = 4
@@ -754,7 +754,7 @@
"bK" = (
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/space)
/area/space/nearstation)
"bL" = (
/obj/machinery/light/small{
dir = 8
@@ -781,7 +781,7 @@
"bP" = (
/obj/structure/lattice,
/turf/space,
/area/space)
/area/space/nearstation)
"bQ" = (
/obj/machinery/shieldwallgen{
active = 2;
@@ -803,7 +803,7 @@
},
/obj/structure/disposaloutlet,
/turf/simulated/floor/plating,
/area/space)
/area/space/nearstation)
"bS" = (
/obj/structure/cable{
d1 = 1;
@@ -828,11 +828,11 @@
"bV" = (
/obj/machinery/shieldwallgen,
/turf/space,
/area/space)
/area/space/nearstation)
"bW" = (
/obj/item/shard,
/turf/space,
/area/space)
/area/space/nearstation)
(1,1,1) = {"
aa
@@ -9,7 +9,7 @@
dir = 4
},
/turf/space,
/area/space)
/area/space/nearstation)
"c" = (
/obj/machinery/door/airlock/external,
/turf/simulated/floor/plating,
@@ -21,7 +21,7 @@
dir = 8
},
/turf/space,
/area/space)
/area/space/nearstation)
"e" = (
/obj/structure/window/reinforced{
tag = "icon-rwindow (EAST)";
@@ -65,7 +65,7 @@
"k" = (
/obj/structure/window/reinforced,
/turf/space,
/area/space)
/area/space/nearstation)
"l" = (
/obj/structure/window/reinforced,
/obj/structure/window/reinforced{
@@ -113,7 +113,7 @@
dir = 1
},
/turf/space,
/area/space)
/area/space/nearstation)
"q" = (
/obj/machinery/light/small{
tag = "icon-bulb1 (WEST)";
@@ -11,12 +11,12 @@
"d" = (
/obj/structure/lattice,
/turf/space,
/area/space)
/area/space/nearstation)
"e" = (
/obj/structure/lattice,
/obj/structure/lattice,
/turf/space,
/area/space)
/area/space/nearstation)
(1,1,1) = {"
a
@@ -7,7 +7,7 @@
/area/ruin/unpowered)
"c" = (
/turf/simulated/mineral,
/area/space)
/area/space/nearstation)
"d" = (
/turf/simulated/floor/plating/airless/asteroid,
/area/ruin/unpowered)
@@ -66,7 +66,7 @@
/area/ruin/unpowered)
"r" = (
/turf/simulated/floor/plating/airless/asteroid,
/area/space)
/area/space/nearstation)
(1,1,1) = {"
a
@@ -171,7 +171,7 @@
"D" = (
/obj/structure/lattice,
/turf/space,
/area/space)
/area/space/nearstation)
"E" = (
/obj/item/stack/rods,
/turf/simulated/floor/plating/airless,
@@ -205,7 +205,7 @@
"K" = (
/obj/item/stack/sheet/metal,
/turf/space,
/area/space)
/area/space/nearstation)
"L" = (
/obj/effect/decal/mecha_wreckage/gygax,
/turf/simulated/shuttle/floor{
@@ -215,7 +215,7 @@
/area/ruin/powered)
"M" = (
/turf/unsimulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"N" = (
/turf/simulated/shuttle/wall{
tag = "icon-swall14";
@@ -231,7 +231,7 @@
"P" = (
/obj/item/stack/rods,
/turf/space,
/area/space)
/area/space/nearstation)
"Q" = (
/turf/simulated/shuttle/wall{
tag = "icon-swall15";
@@ -11,7 +11,7 @@
tag = ""
},
/turf/space,
/area/space)
/area/space/nearstation)
"ac" = (
/obj/structure/lattice,
/obj/structure/cable{
@@ -21,7 +21,7 @@
tag = ""
},
/turf/space,
/area/space)
/area/space/nearstation)
"ad" = (
/obj/structure/lattice,
/obj/structure/cable{
@@ -30,7 +30,7 @@
icon_state = "2-8"
},
/turf/space,
/area/space)
/area/space/nearstation)
"ae" = (
/obj/structure/lattice,
/obj/item/stack/cable_coil/cut{
@@ -39,7 +39,7 @@
icon_state = "coil_red2"
},
/turf/space,
/area/space)
/area/space/nearstation)
"af" = (
/obj/structure/lattice,
/obj/structure/cable{
@@ -49,7 +49,7 @@
tag = ""
},
/turf/space,
/area/space)
/area/space/nearstation)
"ag" = (
/turf/simulated/wall,
/area/ruin/onehalf/dorms_med)
@@ -66,7 +66,7 @@
icon_state = "1-2"
},
/turf/space,
/area/space)
/area/space/nearstation)
"aj" = (
/turf/unsimulated/floor/plating/airless,
/area/ruin/onehalf/hallway)
@@ -155,7 +155,7 @@
"aw" = (
/obj/structure/lattice,
/turf/space,
/area/space)
/area/space/nearstation)
"ax" = (
/obj/structure/lattice,
/turf/space,
@@ -806,7 +806,7 @@
"bU" = (
/obj/item/stack/sheet/metal,
/turf/space,
/area/space)
/area/space/nearstation)
"bV" = (
/obj/structure/disposalpipe/segment,
/obj/item/stack/rods,
@@ -903,11 +903,11 @@
"ck" = (
/obj/structure/girder/reinforced,
/turf/unsimulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"cl" = (
/obj/effect/landmark/damageturf,
/turf/simulated/floor/plating,
/area/space)
/area/space/nearstation)
"cm" = (
/obj/structure/lattice,
/obj/structure/disposalpipe/segment{
@@ -926,7 +926,7 @@
icon_state = "small"
},
/turf/space,
/area/space)
/area/space/nearstation)
"co" = (
/obj/structure/grille,
/obj/structure/window/full/reinforced,
@@ -1009,15 +1009,15 @@
"cv" = (
/obj/item/stack/rods,
/turf/space,
/area/space)
/area/space/nearstation)
"cw" = (
/turf/unsimulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"cx" = (
/obj/structure/lattice,
/obj/item/stack/sheet/plasteel,
/turf/space,
/area/space)
/area/space/nearstation)
"cy" = (
/obj/structure/lattice,
/obj/item/shard{
@@ -1072,7 +1072,7 @@
"cE" = (
/obj/item/stack/tile/wood,
/turf/space,
/area/space)
/area/space/nearstation)
"cF" = (
/turf/space,
/area/ruin/onehalf/hallway)
@@ -1162,7 +1162,7 @@
"cR" = (
/obj/item/stack/sheet/plasteel,
/turf/space,
/area/space)
/area/space/nearstation)
"cS" = (
/obj/structure/lattice,
/obj/structure/cable{
@@ -1223,7 +1223,7 @@
icon_state = "2-8"
},
/turf/space,
/area/space)
/area/space/nearstation)
"db" = (
/obj/structure/table,
/obj/item/flashlight,
@@ -1258,12 +1258,12 @@
icon_state = "1-2"
},
/turf/space,
/area/space)
/area/space/nearstation)
"dg" = (
/obj/structure/girder/reinforced,
/obj/item/stack/sheet/plasteel,
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"dj" = (
/obj/structure/grille,
/obj/item/shard,
@@ -1352,7 +1352,7 @@
icon_state = "medium"
},
/turf/space,
/area/space)
/area/space/nearstation)
"dp" = (
/obj/structure/lattice,
/obj/structure/cable{
@@ -1368,7 +1368,7 @@
},
/obj/item/stack/rods,
/turf/space,
/area/space)
/area/space/nearstation)
"dq" = (
/obj/structure/lattice,
/obj/structure/cable{
@@ -1384,7 +1384,7 @@
tag = ""
},
/turf/space,
/area/space)
/area/space/nearstation)
(1,1,1) = {"
aa
@@ -4,10 +4,10 @@
/area/space)
"ab" = (
/turf/simulated/mineral,
/area/space)
/area/space/nearstation)
"ac" = (
/turf/simulated/floor/plating/airless/asteroid,
/area/space)
/area/space/nearstation)
"ad" = (
/obj/structure/grille,
/obj/structure/window/full/reinforced,
@@ -5,7 +5,7 @@
"b" = (
/obj/structure/lattice,
/turf/space,
/area/space)
/area/space/nearstation)
"c" = (
/obj/structure/grille,
/turf/simulated/floor/plating,
@@ -502,7 +502,7 @@
/area/ruin/unpowered)
"bH" = (
/turf/simulated/wall/mineral/titanium,
/area/space)
/area/space/nearstation)
"bI" = (
/obj/structure/window/reinforced,
/turf/simulated/floor/mineral/plasma,
+11 -16
View File
@@ -264,7 +264,7 @@
"aP" = (
/obj/structure/lattice,
/turf/space,
/area/space)
/area/space/nearstation)
"aQ" = (
/obj/machinery/door/airlock/gold{
locked = 1
@@ -1517,7 +1517,7 @@
"et" = (
/obj/singularity/academy,
/turf/space,
/area/space)
/area/space/nearstation)
"eu" = (
/obj/structure/window/reinforced{
dir = 8
@@ -3716,7 +3716,7 @@
icon_state = "medium"
},
/turf/space,
/area/space)
/area/space/nearstation)
"jz" = (
/obj/machinery/igniter,
/turf/simulated/floor/plating,
@@ -4490,12 +4490,7 @@
/turf/simulated/floor/plasteel{
icon_state = "hydrofloor"
},
/area/space)
"lu" = (
/turf/simulated/floor/plasteel{
icon_state = "hydrofloor"
},
/area/space)
/area/awaymission/academy/academyaft)
"lv" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 5;
@@ -4504,7 +4499,7 @@
/turf/simulated/floor/plasteel{
icon_state = "hydrofloor"
},
/area/space)
/area/awaymission/academy/academyaft)
"lw" = (
/obj/machinery/door/poddoor/shutters{
dir = 2;
@@ -15432,10 +15427,10 @@ hM
lp
hp
hp
lu
lu
lu
lu
hp
hp
hp
hp
hp
hp
gZ
@@ -15564,8 +15559,8 @@ lq
lr
lt
lv
lu
lu
hp
hp
hp
hp
gZ
@@ -16,7 +16,7 @@
/obj/item/circular_saw,
/obj/structure/lattice,
/turf/space,
/area/space)
/area/space/nearstation)
"af" = (
/turf/simulated/shuttle/wall{
tag = "icon-swall12";
@@ -46,7 +46,7 @@
"aj" = (
/mob/living/simple_animal/hostile/carp,
/turf/space,
/area/space)
/area/space/nearstation)
"ak" = (
/turf/simulated/shuttle/wall{
tag = "icon-swall12";
@@ -97,7 +97,7 @@
"as" = (
/obj/structure/lattice,
/turf/space,
/area/space)
/area/space/nearstation)
"at" = (
/turf/space,
/turf/simulated/shuttle/wall{
@@ -2626,14 +2626,6 @@
},
/turf/simulated/floor/engine,
/area/awaymission/BMPship/Aft)
"gy" = (
/turf/space,
/turf/simulated/shuttle/wall{
tag = "icon-swall_f5";
icon_state = "swall_f5";
dir = 2
},
/area/space)
"gz" = (
/obj/item/shard,
/obj/effect/landmark/damageturf,
@@ -3273,7 +3265,7 @@
icon_state = "medium"
},
/turf/space,
/area/space)
/area/space/nearstation)
"ip" = (
/turf/simulated/shuttle/wall{
tag = "icon-swall13";
@@ -3522,12 +3514,6 @@
/obj/machinery/portable_atmospherics/canister/air,
/turf/simulated/floor/plating,
/area/awaymission)
"jf" = (
/turf/space,
/area/crew_quarters/bar)
"jg" = (
/turf/space,
/area/exploration/methlab)
"jh" = (
/obj/machinery/door_control{
id = "packerMed";
@@ -9820,7 +9806,7 @@ eW
fF
ee
aW
gy
gg
aa
aa
gP
@@ -13998,7 +13984,7 @@ aa
aa
aa
aa
jf
aa
aa
aa
aa
@@ -14389,11 +14375,11 @@ aa
aa
aa
aa
jg
jg
jg
jg
jg
aa
aa
aa
aa
aa
aa
aa
aa
@@ -14518,12 +14504,12 @@ aa
aa
aa
aa
jg
jg
jg
jg
jg
jg
aa
aa
aa
aa
aa
aa
aa
aa
aa
@@ -14648,13 +14634,13 @@ aa
aa
aa
aa
jg
jg
jg
jg
jg
jg
jg
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
@@ -14779,9 +14765,9 @@ aa
aa
aa
aa
jg
jg
jg
aa
aa
aa
aa
aa
aa
@@ -14908,8 +14894,8 @@ aa
aa
aa
aa
jg
jg
aa
aa
aa
aa
aa
@@ -15038,12 +15024,12 @@ aa
aa
aa
aa
jg
jg
jg
jg
jg
jg
aa
aa
aa
aa
aa
aa
aa
aa
aa
@@ -15168,12 +15154,12 @@ aa
aa
aa
aa
jg
jg
jg
jg
jg
jg
aa
aa
aa
aa
aa
aa
aa
aa
aa
@@ -15300,7 +15286,7 @@ aa
aa
aa
aa
jg
aa
aa
aa
aa
+11 -31
View File
@@ -483,7 +483,7 @@
"bm" = (
/obj/structure/lattice,
/turf/space,
/area/space)
/area/space/nearstation)
"bn" = (
/turf/simulated/floor/plasteel{
icon_state = "vault";
@@ -1264,7 +1264,7 @@
pixel_y = 0
},
/turf/simulated/floor/plating,
/area/space)
/area/awaymission/centcomAway/maint)
"dl" = (
/turf/simulated/shuttle/wall{
icon_state = "swallc1";
@@ -1887,12 +1887,6 @@
icon_state = "floor"
},
/area/awaymission/centcomAway/general)
"eP" = (
/turf/space,
/area/awaycontent/a2{
has_gravity = 1;
name = "MO19 Research"
})
"eQ" = (
/turf/simulated/shuttle/wall{
icon_state = "swall2";
@@ -3595,20 +3589,6 @@
dir = 4
},
/area/awaymission/centcomAway/general)
"iZ" = (
/obj/structure/grille,
/obj/structure/window/reinforced{
dir = 8
},
/obj/structure/window/reinforced,
/obj/structure/window/reinforced{
dir = 1
},
/obj/structure/window/reinforced{
dir = 4
},
/turf/simulated/floor/plating,
/area/space)
"ja" = (
/obj/structure/grille,
/obj/structure/window/reinforced,
@@ -5805,8 +5785,8 @@
icon_state = "propulsion_r";
dir = 1
},
/turf/space,
/area/space)
/turf/simulated/shuttle/plating,
/area/awaymission/centcomAway/thunderdome)
"nV" = (
/obj/machinery/light,
/turf/simulated/floor/plasteel{
@@ -5818,15 +5798,15 @@
icon_state = "propulsion_l";
dir = 1
},
/turf/space,
/area/space)
/turf/simulated/shuttle/plating,
/area/awaymission/centcomAway/thunderdome)
"nX" = (
/obj/structure/shuttle/engine/propulsion{
icon_state = "propulsion";
dir = 1
},
/turf/space,
/area/space)
/turf/simulated/shuttle/plating,
/area/awaymission/centcomAway/thunderdome)
"nY" = (
/obj/structure/computerframe,
/turf/simulated/floor/plasteel{
@@ -16520,7 +16500,7 @@ eO
oa
lb
eF
iZ
fg
eF
lV
mc
@@ -20660,7 +20640,7 @@ cc
aa
aa
aa
eP
aa
aa
aa
aa
@@ -20790,7 +20770,7 @@ cc
aa
aa
aa
eP
aa
aa
aa
aa
+17 -17
View File
@@ -1,7 +1,7 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"aa" = (
/turf/simulated/mineral/random,
/area/space)
/area/space/nearstation)
"ab" = (
/turf/space,
/area/space)
@@ -2617,23 +2617,23 @@
"iq" = (
/obj/structure/lattice,
/turf/space,
/area/space)
/area/space/nearstation)
"ir" = (
/obj/effect/mob_spawn/human/corpse/syndicatesoldier,
/turf/space,
/area/space)
/area/space/nearstation)
"is" = (
/turf/simulated/shuttle/wall{
icon_state = "wall3"
},
/area/space)
/area/space/nearstation)
"it" = (
/turf/space,
/turf/simulated/shuttle/wall{
dir = 1;
icon_state = "diagonalWall3"
},
/area/space)
/area/space/nearstation)
"iu" = (
/obj/machinery/sleeper,
/turf/simulated/floor/plasteel/airless{
@@ -2641,14 +2641,14 @@
icon_state = "floor4";
dir = 10
},
/area/space)
/area/space/nearstation)
"iv" = (
/turf/simulated/floor/plasteel/airless{
tag = "icon-floor4 (SOUTHWEST)";
icon_state = "floor4";
dir = 10
},
/area/space)
/area/space/nearstation)
"iw" = (
/obj/effect/mob_spawn/human/corpse/syndicatesoldier,
/turf/simulated/floor/plasteel/airless{
@@ -2656,7 +2656,7 @@
icon_state = "floor4";
dir = 10
},
/area/space)
/area/space/nearstation)
"ix" = (
/obj/machinery/door/airlock/external,
/turf/simulated/floor/plasteel/airless{
@@ -2664,7 +2664,7 @@
icon_state = "floor4";
dir = 10
},
/area/space)
/area/space/nearstation)
"iy" = (
/obj/item/stack/rods,
/turf/simulated/floor/plasteel/airless{
@@ -2672,7 +2672,7 @@
icon_state = "floor4";
dir = 10
},
/area/space)
/area/space/nearstation)
"iz" = (
/turf/space,
/turf/simulated/shuttle/wall{
@@ -2695,7 +2695,7 @@
"iC" = (
/obj/machinery/sleeper,
/turf/simulated/floor/plasteel/airless,
/area/space)
/area/space/nearstation)
"iD" = (
/turf/simulated/shuttle/floor{
icon_state = "floor4"
@@ -2712,14 +2712,14 @@
/turf/simulated/shuttle/wall{
icon_state = "diagonalWall3"
},
/area/space)
/area/space/nearstation)
"iG" = (
/turf/space,
/turf/simulated/shuttle/wall{
dir = 4;
icon_state = "diagonalWall3"
},
/area/space)
/area/space/nearstation)
"iH" = (
/obj/machinery/sleeper,
/turf/simulated/shuttle/floor{
@@ -2741,11 +2741,11 @@
dir = 1
},
/turf/simulated/shuttle/plating,
/area/space)
/area/space/nearstation)
"iK" = (
/obj/structure/shuttle/engine/propulsion,
/turf/simulated/shuttle/plating,
/area/space)
/area/space/nearstation)
"iL" = (
/obj/machinery/door/airlock/external,
/turf/simulated/shuttle/floor{
@@ -2853,7 +2853,7 @@
/area/awaymission/spacebattle/syndicate6)
"jc" = (
/turf/simulated/floor/plating/airless/asteroid,
/area/space)
/area/space/nearstation)
"jd" = (
/turf/simulated/wall/mineral/plasma,
/area/awaymission/spacebattle/secret)
@@ -2898,7 +2898,7 @@
tag = "icon-propulsion_l (WEST)"
},
/turf/simulated/shuttle/plating,
/area/space)
/area/space/nearstation)
"Jj" = (
/obj/structure/shuttle/engine/propulsion{
tag = "icon-propulsion_l (NORTH)";
+28 -53
View File
@@ -2113,30 +2113,30 @@
id = "turbinespace"
},
/turf/space,
/area/space)
/area/space/nearstation)
"dQ" = (
/turf/unsimulated/wall,
/area/space)
/area/space/nearstation)
"dR" = (
/turf/unsimulated/wall/fakeglass{
dir = 8;
icon_state = "fakewindows";
opacity = 0
},
/area/space)
/area/space/nearstation)
"dS" = (
/turf/unsimulated/wall/fakeglass{
icon_state = "fakewindows2";
dir = 8
},
/area/space)
/area/space/nearstation)
"dT" = (
/turf/unsimulated/wall/fakeglass{
dir = 4;
icon_state = "fakewindows";
opacity = 0
},
/area/space)
/area/space/nearstation)
"dU" = (
/turf/unsimulated/wall/fakeglass{
dir = 8;
@@ -2409,7 +2409,7 @@
icon_state = "fakewindows";
dir = 1
},
/area/space)
/area/space/nearstation)
"eC" = (
/obj/machinery/light{
dir = 1
@@ -2425,7 +2425,7 @@
icon_state = "fakewindows2";
dir = 1
},
/area/space)
/area/space/nearstation)
"eF" = (
/obj/structure/closet/crate/can,
/turf/unsimulated/floor/carpet,
@@ -2463,7 +2463,7 @@
/area/awaymission/spacehotel)
"eL" = (
/turf/unsimulated/wall/fakeglass,
/area/space)
/area/space/nearstation)
"eM" = (
/turf/unsimulated/floor{
dir = 2;
@@ -2684,7 +2684,7 @@
/turf/unsimulated/wall/fakeglass{
icon_state = "fakewindows3"
},
/area/space)
/area/space/nearstation)
"fv" = (
/obj/effect/landmark/map_loader/hotel_room{
dir = 1
@@ -3124,12 +3124,6 @@
icon_state = "cafeteria"
},
/area/awaymission/spacehotel/kitchen)
"gE" = (
/mob/living/carbon/human/interactive/away/hotel/chef,
/turf/unsimulated/floor{
icon_state = "cafeteria"
},
/area/awaymission/spacehotel/kitchen)
"gF" = (
/obj/machinery/camera{
c_tag = "Room 201";
@@ -3277,12 +3271,6 @@
icon_state = "whiteyellowfull"
},
/area/awaymission/spacehotel)
"ha" = (
/mob/living/carbon/human/interactive/away/hotel/bartender,
/turf/unsimulated/floor{
icon_state = "whiteyellowfull"
},
/area/awaymission/spacehotel)
"hb" = (
/turf/unsimulated/wall/fakeglass,
/area/awaymission/spacehotel)
@@ -3685,7 +3673,7 @@
dir = 1;
icon_state = "fakewindows2"
},
/area/space)
/area/space/nearstation)
"if" = (
/obj/effect/view_portal{
id = "hotel_13"
@@ -4134,12 +4122,6 @@
},
/turf/unsimulated/floor/carpet,
/area/awaymission/spacehotel)
"jm" = (
/obj/effect/spawner/snpc_squad{
squad_type = /mob/living/carbon/human/interactive/away/hotel/guard
},
/turf/unsimulated/floor/carpet,
/area/awaymission/spacehotel)
"jn" = (
/obj/structure{
desc = "It appears to be similar to a SMES.";
@@ -4489,7 +4471,6 @@
/obj/structure/chair{
dir = 8
},
/mob/living/carbon/human/interactive/away/hotel/concierge,
/turf/unsimulated/floor/carpet,
/area/awaymission/spacehotel/reception)
"kk" = (
@@ -4512,12 +4493,6 @@
/obj/structure/table/reinforced,
/turf/unsimulated/floor/carpet,
/area/awaymission/spacehotel/reception)
"kn" = (
/obj/structure/chair{
dir = 8
},
/turf/unsimulated/floor/carpet,
/area/awaymission/spacehotel/reception)
"ko" = (
/obj/structure/filingcabinet/filingcabinet,
/obj/machinery/light{
@@ -4577,14 +4552,14 @@
dir = 10;
icon_state = "fakewindows"
},
/area/space)
/area/space/nearstation)
"ky" = (
/turf/unsimulated/wall/fakeglass{
dir = 4;
icon_state = "fakewindows";
opacity = 1
},
/area/space)
/area/space/nearstation)
"kz" = (
/obj/machinery/door/airlock/external{
name = "Arrival Airlock"
@@ -4596,13 +4571,13 @@
icon_state = "fakewindows";
dir = 8
},
/area/space)
/area/space/nearstation)
"kB" = (
/turf/unsimulated/wall/fakeglass{
icon_state = "fakewindows";
dir = 6
},
/area/space)
/area/space/nearstation)
"kC" = (
/turf/simulated/shuttle/wall{
icon_state = "swall_s6";
@@ -4656,19 +4631,19 @@
icon_state = "swall_s6";
dir = 2
},
/area/space)
/area/space/nearstation)
"kL" = (
/turf/simulated/shuttle/wall{
icon_state = "swall12";
dir = 2
},
/area/space)
/area/space/nearstation)
"kM" = (
/turf/simulated/shuttle/wall{
icon_state = "swall_s10";
dir = 2
},
/area/space)
/area/space/nearstation)
"kN" = (
/turf/unsimulated/wall/fakeglass{
icon_state = "fakewindows3"
@@ -4726,22 +4701,22 @@
icon_state = "swallc4";
dir = 2
},
/area/space)
/area/space/nearstation)
"kX" = (
/turf/simulated/shuttle/wall/interior,
/area/space)
/area/space/nearstation)
"kY" = (
/turf/simulated/shuttle/wall{
icon_state = "swall3"
},
/area/space)
/area/space/nearstation)
"kZ" = (
/obj/structure/shuttle/engine/propulsion{
dir = 4;
icon_state = "propulsion"
},
/turf/simulated/shuttle/plating,
/area/space)
/area/space/nearstation)
"la" = (
/obj/structure/chair{
dir = 8
@@ -4793,13 +4768,13 @@
icon_state = "swall_s5";
dir = 2
},
/area/space)
/area/space/nearstation)
"li" = (
/turf/simulated/shuttle/wall{
icon_state = "swallc1";
dir = 2
},
/area/space)
/area/space/nearstation)
"lj" = (
/turf/simulated/shuttle/wall{
icon_state = "swall_s9";
@@ -4811,7 +4786,7 @@
icon_state = "swall_s9";
dir = 2
},
/area/space)
/area/space/nearstation)
"ll" = (
/obj/machinery/shower{
dir = 8
@@ -9762,7 +9737,7 @@ cl
jF
jT
kj
kn
kj
jT
kv
dS
@@ -10655,7 +10630,7 @@ gh
eb
gp
gw
gE
gD
gN
gT
gD
@@ -11058,7 +11033,7 @@ cl
iw
iI
eG
jm
eb
jH
jV
cl
@@ -18978,7 +18953,7 @@ dX
gI
gP
gX
ha
gX
hq
cl
hB
@@ -41,7 +41,7 @@
"ak" = (
/obj/structure/lattice,
/turf/space,
/area/space)
/area/space/nearstation)
"al" = (
/obj/machinery/door/window/westright,
/turf/simulated/floor/plasteel/airless,
@@ -256,10 +256,10 @@
/turf/simulated/shuttle/wall{
icon_state = "wall3"
},
/area/space)
/area/space/nearstation)
"ba" = (
/turf/simulated/wall,
/area/space)
/area/space/nearstation)
"bb" = (
/obj/machinery/door/airlock/engineering,
/turf/simulated/floor/plasteel/airless,
@@ -4123,7 +4123,7 @@
/turf/simulated/floor/plasteel,
/area/awaymission/arrivalblock)
"kG" = (
/obj/item/clothing/shoes/syndigaloshes,
/obj/item/clothing/shoes/chameleon/noslip,
/obj/item/clothing/under/syndicate,
/obj/effect/decal/remains/human{
desc = "This guy seemed to have died in terrible way! Half his remains are dust.";
@@ -13398,7 +13398,7 @@
/area/awaymission/UO71/loot)
"zt" = (
/obj/structure/chair/wood/normal,
/obj/item/clothing/shoes/syndigaloshes,
/obj/item/clothing/shoes/chameleon/noslip,
/turf/simulated/floor/carpet,
/area/awaymission/UO71/loot)
"zu" = (
@@ -13,12 +13,6 @@
power_light = 0;
poweralm = 0
})
"ab" = (
/turf/unsimulated/wall{
icon_state = "rock";
name = "rock"
},
/area/space)
"ac" = (
/turf/simulated/mineral/random/labormineral,
/area/awaycontent/a7{
@@ -6998,7 +6992,10 @@
dir = 9;
icon_state = "warnwhite"
},
/area/space)
/area/awaycontent/a5{
has_gravity = 1;
name = "UO45 Research"
})
"lc" = (
/obj/structure/sink{
pixel_y = 25
@@ -27794,10 +27791,10 @@ aa
aa
"}
(72,1,1) = {"
ab
ab
ab
ab
aa
aa
aa
aa
aa
aa
aa
@@ -27944,10 +27941,10 @@ aa
aa
"}
(73,1,1) = {"
ab
ab
ab
ab
aa
aa
aa
aa
aa
aa
aa
+22 -22
View File
@@ -204,7 +204,7 @@
/area/awaymission/wwvaultdoors)
"aG" = (
/turf/simulated/mineral,
/area/space)
/area/space/nearstation)
"aH" = (
/obj/structure/cable{
d2 = 8;
@@ -268,7 +268,7 @@
name = "Blocker"
},
/turf/space,
/area/space)
/area/space/nearstation)
"aQ" = (
/obj/effect/forcefield{
desc = "You can't get in. Heh.";
@@ -276,7 +276,7 @@
name = "Blocker"
},
/turf/simulated/mineral,
/area/space)
/area/space/nearstation)
"aR" = (
/obj/effect/forcefield{
desc = "You can't get in. Heh.";
@@ -349,7 +349,7 @@
/area/awaymission/wwmines)
"be" = (
/turf/simulated/wall/mineral/sandstone,
/area/space)
/area/space/nearstation)
"bf" = (
/obj/structure/largecrate,
/turf/simulated/floor/plating,
@@ -393,7 +393,7 @@
"bp" = (
/obj/structure/lattice,
/turf/space,
/area/space)
/area/space/nearstation)
"bq" = (
/obj/effect/mine/dnascramble,
/obj/item/ammo_box/c10mm,
@@ -431,14 +431,14 @@
icon_state = "fwindow"
},
/turf/space,
/area/space)
/area/space/nearstation)
"bx" = (
/obj/structure/window/reinforced{
tag = "icon-fwindow";
icon_state = "fwindow"
},
/turf/space,
/area/space)
/area/space/nearstation)
"by" = (
/obj/structure/closet/secure_closet/freezer/fridge,
/turf/simulated/floor/plasteel{
@@ -605,7 +605,7 @@
dir = 4
},
/turf/space,
/area/space)
/area/space/nearstation)
"bV" = (
/obj/structure/window/reinforced{
tag = "icon-fwindow (NORTH)";
@@ -668,7 +668,7 @@
dir = 8
},
/turf/space,
/area/space)
/area/space/nearstation)
"cb" = (
/obj/machinery/light/small{
tag = "icon-bulb1 (WEST)";
@@ -736,7 +736,7 @@
dir = 4
},
/turf/space,
/area/space)
/area/space/nearstation)
"ck" = (
/turf/simulated/floor/wood,
/area/awaymission/wwgov)
@@ -810,7 +810,7 @@
/obj/structure/lattice,
/obj/structure/lattice,
/turf/space,
/area/space)
/area/space/nearstation)
"cs" = (
/obj/effect/decal/cleanable/blood/splatter,
/turf/simulated/floor/carpet,
@@ -981,7 +981,7 @@
dir = 8
},
/turf/space,
/area/space)
/area/space/nearstation)
"cT" = (
/obj/structure/chair/comfy/black{
dir = 4
@@ -1075,7 +1075,7 @@
dir = 4
},
/turf/space,
/area/space)
/area/space/nearstation)
"dg" = (
/obj/machinery/light/small{
tag = "icon-bulb1 (WEST)";
@@ -1701,7 +1701,7 @@
dir = 1
},
/turf/space,
/area/space)
/area/space/nearstation)
"eM" = (
/obj/structure/lattice,
/obj/structure/window/reinforced{
@@ -1710,7 +1710,7 @@
dir = 1
},
/turf/space,
/area/space)
/area/space/nearstation)
"eN" = (
/obj/structure/window/reinforced{
tag = "icon-fwindow (EAST)";
@@ -1739,7 +1739,7 @@
dir = 4
},
/turf/space,
/area/space)
/area/space/nearstation)
"eP" = (
/obj/structure/window/reinforced{
tag = "icon-fwindow (NORTH)";
@@ -1752,7 +1752,7 @@
dir = 8
},
/turf/space,
/area/space)
/area/space/nearstation)
"eQ" = (
/obj/structure/window/reinforced{
tag = "icon-fwindow (EAST)";
@@ -2080,7 +2080,7 @@
/area/awaymission/wwrefine)
"fI" = (
/turf/simulated/floor/plasteel,
/area/space)
/area/space/nearstation)
"fJ" = (
/obj/effect/decal/cleanable/cobweb,
/obj/structure/chair/office/dark{
@@ -2329,7 +2329,7 @@
icon_state = "fwindow"
},
/turf/space,
/area/space)
/area/space/nearstation)
"gp" = (
/obj/structure/window/reinforced{
tag = "icon-fwindow (WEST)";
@@ -2341,7 +2341,7 @@
icon_state = "fwindow"
},
/turf/space,
/area/space)
/area/space/nearstation)
"gq" = (
/obj/item/paper{
info = "The syndicate have invaded. Their ships appeared out of nowhere and now they likely intend to kill us all and take everything. On the off-chance that the Vault may grant us sanctuary, many of us have decided to force our way inside and bolt the door, taking as many provisions with us as we can carry. In case you find this, send for help immediately and open the Vault. Find us inside.";
@@ -2422,7 +2422,7 @@
},
/obj/structure/lattice,
/turf/space,
/area/space)
/area/space/nearstation)
"gC" = (
/obj/item/gun/projectile/shotgun,
/turf/simulated/floor/wood,
@@ -2473,7 +2473,7 @@
dir = 8
},
/turf/simulated/floor/plasteel,
/area/space)
/area/space/nearstation)
"gK" = (
/obj/item/gun/projectile/revolver/russian,
/turf/simulated/floor/wood,
File diff suppressed because it is too large Load Diff
+149 -148
View File
@@ -8030,11 +8030,12 @@
"tH" = (
/obj/docking_port/stationary{
dir = 2;
dwidth = 8;
height = 15;
dwidth = 9;
height = 18;
id = "admin_away";
name = "centcom bay 1";
width = 18
timid = 1;
width = 19
},
/turf/space,
/area/space)
@@ -8543,7 +8544,7 @@
pixel_y = 3
},
/obj/item/clothing/mask/gas/cyborg,
/obj/item/clothing/mask/gas/voice,
/obj/item/clothing/mask/chameleon,
/obj/item/clothing/mask/balaclava{
pixel_x = 3;
pixel_y = -3
@@ -8729,7 +8730,7 @@
/area/admin)
"uY" = (
/obj/structure/rack,
/obj/item/clothing/under/chameleon/all{
/obj/item/clothing/mask/chameleon{
pixel_x = -3;
pixel_y = 3
},
@@ -9036,7 +9037,7 @@
pixel_y = 3
},
/obj/item/clothing/shoes/centcom,
/obj/item/clothing/shoes/syndigaloshes{
/obj/item/clothing/shoes/chameleon/noslip{
pixel_x = 3;
pixel_y = -3
},
@@ -12275,7 +12276,7 @@
"Hv" = (
/obj/structure/rack,
/obj/item/katana/energy,
/obj/item/clothing/mask/gas/voice/space_ninja,
/obj/item/clothing/mask/gas/space_ninja,
/turf/unsimulated/floor{
icon_state = "engine"
},
@@ -35340,9 +35341,9 @@ wK
wK
wK
wK
aN
aN
aN
wK
wK
wK
aN
aN
aN
@@ -35581,21 +35582,24 @@ aN
aN
cp
cj
yt
yt
yt
cr
aN
aN
cr
yt
cr
aN
aN
cr
yt
yt
yt
aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
wK
aN
aN
@@ -35638,9 +35642,6 @@ aN
aN
aN
aN
aN
aN
aN
jZ
kz
kM
@@ -35838,9 +35839,6 @@ aN
aN
cp
cj
yt
yt
cr
aN
aN
aN
@@ -35850,9 +35848,15 @@ aN
aN
aN
aN
cr
yt
yt
aN
aN
aN
aN
aN
aN
aN
aN
aN
wK
aN
aN
@@ -35918,9 +35922,6 @@ aN
aN
aN
aN
aN
aN
aN
"}
(91,1,1) = {"
aN
@@ -36095,8 +36096,6 @@ aN
aN
cp
cj
yt
cr
aN
aN
aN
@@ -36108,8 +36107,13 @@ aN
aN
aN
aN
cr
yt
aN
aN
aN
aN
aN
aN
aN
wK
aN
aN
@@ -36152,9 +36156,6 @@ aN
aN
aN
aN
aN
aN
aN
jU
kw
kE
@@ -36352,7 +36353,6 @@ aN
aN
cp
cj
cr
aN
aN
aN
@@ -36366,7 +36366,11 @@ aN
aN
aN
aN
cr
aN
aN
aN
aN
aN
wK
aN
aN
@@ -36408,9 +36412,6 @@ aN
aN
aN
aN
aN
aN
aN
jQ
jW
kD
@@ -36624,6 +36625,9 @@ aN
aN
aN
aN
aN
aN
aN
wK
aN
aN
@@ -36665,9 +36669,6 @@ aN
aN
aN
aN
aN
aN
aN
jP
kt
kx
@@ -36881,6 +36882,9 @@ aN
aN
aN
aN
aN
aN
aN
wK
aN
aN
@@ -36922,9 +36926,6 @@ aN
aN
aN
aN
aN
aN
aN
jS
kv
kx
@@ -37138,6 +37139,9 @@ aN
aN
aN
aN
aN
aN
aN
wK
aN
aN
@@ -37179,9 +37183,6 @@ aN
aN
aN
aN
aN
aN
aN
jR
ku
kx
@@ -37395,6 +37396,9 @@ aN
aN
aN
aN
aN
aN
aN
wK
aN
aN
@@ -37436,9 +37440,6 @@ aN
aN
aN
aN
aN
aN
aN
jT
ka
kA
@@ -37652,6 +37653,9 @@ aN
aN
aN
aN
aN
aN
aN
wK
aN
aN
@@ -37694,9 +37698,6 @@ aN
aN
aN
aN
aN
aN
aN
jZ
kz
kM
@@ -37909,6 +37910,9 @@ aN
aN
aN
aN
aN
aN
aN
wK
aN
aN
@@ -37974,9 +37978,6 @@ aN
aN
aN
aN
aN
aN
aN
"}
(99,1,1) = {"
aN
@@ -38166,6 +38167,9 @@ aN
aN
aN
aN
aN
aN
aN
wK
aN
aN
@@ -38231,9 +38235,6 @@ aN
aN
aN
aN
aN
aN
aN
"}
(100,1,1) = {"
aN
@@ -38423,6 +38424,9 @@ aN
aN
aN
aN
aN
aN
aN
wK
aN
aN
@@ -38488,9 +38492,6 @@ aN
aN
aN
aN
aN
aN
aN
"}
(101,1,1) = {"
aN
@@ -38680,6 +38681,9 @@ aN
aN
aN
aN
aN
aN
aN
wK
aN
aN
@@ -38713,9 +38717,6 @@ aN
aN
aN
aN
aN
aN
aN
mr
mr
mr
@@ -38937,6 +38938,9 @@ aN
aN
aN
aN
aN
aN
aN
wK
aN
aN
@@ -38970,9 +38974,6 @@ aN
aN
aN
aN
aN
aN
aN
mr
aN
aN
@@ -39179,7 +39180,6 @@ qo
qs
tx
wK
cr
aN
aN
aN
@@ -39193,7 +39193,11 @@ aN
aN
aN
aN
cr
aN
aN
aN
aN
aN
wK
aN
aN
@@ -39227,9 +39231,6 @@ aN
aN
aN
aN
aN
aN
aN
mr
aN
aN
@@ -39436,21 +39437,24 @@ qo
qs
tA
wK
yt
aN
aN
aN
aN
aN
yt
yt
yt
aN
aN
aN
aN
aN
yt
aN
aN
aN
aN
aN
aN
aN
aN
wK
aN
aN
@@ -39484,9 +39488,6 @@ aN
aN
aN
aN
aN
aN
aN
mr
aN
aN
@@ -39693,21 +39694,24 @@ tq
tv
tz
wK
yt
cr
aN
aN
aN
aN
yt
yt
yt
aN
aN
aN
aN
cr
yt
aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
wK
aN
aN
@@ -39741,9 +39745,6 @@ aN
aN
aN
aN
aN
aN
aN
mr
aN
aN
@@ -39950,21 +39951,24 @@ wK
wK
wK
wK
yt
yt
cr
aN
aN
cr
yt
yt
yt
cr
aN
aN
cr
yt
yt
aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
wK
aN
aN
@@ -39998,9 +40002,6 @@ aN
aN
aN
aN
aN
aN
aN
mr
aN
aN
@@ -40207,22 +40208,6 @@ aN
aN
aN
wK
wK
wK
wK
wK
wK
wK
wK
wK
wK
wK
wK
wK
wK
wK
wK
wK
aN
aN
aN
@@ -40241,6 +40226,22 @@ aN
aN
aN
aN
wK
aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
@@ -40463,26 +40464,26 @@ aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
wK
wK
wK
wK
wK
wK
wK
wK
wK
wK
wK
wK
wK
wK
wK
wK
wK
wK
wK
wK
aN
aN
aN
+64 -64
View File
@@ -5,7 +5,7 @@
"ab" = (
/obj/item/trash/cheesie,
/turf/space,
/area/space)
/area/space/nearstation)
"ac" = (
/obj/docking_port/stationary{
dir = 8;
@@ -412,7 +412,7 @@
"aT" = (
/obj/structure/lattice,
/turf/space,
/area/space)
/area/space/nearstation)
"aU" = (
/obj/structure/reagent_dispensers/watertank/high,
/turf/simulated/floor/plating,
@@ -457,28 +457,28 @@
icon_state = "swall_s6";
dir = 2
},
/area/space)
/area/space/nearstation)
"bb" = (
/turf/simulated/shuttle/wall{
tag = "icon-swall14";
icon_state = "swall14";
dir = 2
},
/area/space)
/area/space/nearstation)
"bc" = (
/turf/simulated/shuttle/wall{
tag = "icon-swall12";
icon_state = "swall12";
dir = 2
},
/area/space)
/area/space/nearstation)
"bd" = (
/turf/simulated/shuttle/wall{
tag = "icon-swall_s10";
icon_state = "swall_s10";
dir = 2
},
/area/space)
/area/space/nearstation)
"be" = (
/turf/simulated/shuttle/wall{
tag = "icon-swall14";
@@ -503,7 +503,7 @@
icon_state = "swall7";
dir = 2
},
/area/space)
/area/space/nearstation)
"bj" = (
/turf/simulated/shuttle/floor{
icon_state = "floor3"
@@ -513,12 +513,12 @@
icon_state = "swall_f9";
dir = 2
},
/area/space)
/area/space/nearstation)
"bk" = (
/turf/simulated/shuttle/floor{
icon_state = "floor3"
},
/area/space)
/area/space/nearstation)
"bl" = (
/turf/simulated/shuttle/floor{
icon_state = "floor3"
@@ -528,14 +528,14 @@
icon_state = "swall_f5";
dir = 2
},
/area/space)
/area/space/nearstation)
"bm" = (
/turf/simulated/shuttle/wall{
tag = "icon-swall11";
icon_state = "swall11";
dir = 2
},
/area/space)
/area/space/nearstation)
"bn" = (
/obj/machinery/vending/hydroseeds,
/turf/simulated/floor/mineral/titanium/purple,
@@ -549,7 +549,7 @@
/turf/simulated/shuttle/floor{
icon_state = "floor3"
},
/area/space)
/area/space/nearstation)
"bq" = (
/turf/simulated/floor/mineral/titanium/purple,
/area/shuttle/freegolem)
@@ -572,7 +572,7 @@
icon_state = "swall_f10";
dir = 2
},
/area/space)
/area/space/nearstation)
"bt" = (
/obj/machinery/light{
dir = 1;
@@ -589,7 +589,7 @@
icon_state = "swall_f6";
dir = 2
},
/area/space)
/area/space/nearstation)
"bv" = (
/obj/machinery/light{
dir = 1;
@@ -608,21 +608,21 @@
icon_state = "swall_s5";
dir = 2
},
/area/space)
/area/space/nearstation)
"by" = (
/turf/simulated/shuttle/wall{
tag = "icon-swall13";
icon_state = "swall13";
dir = 2
},
/area/space)
/area/space/nearstation)
"bz" = (
/turf/simulated/shuttle/wall{
tag = "icon-swall_s9";
icon_state = "swall_s9";
dir = 2
},
/area/space)
/area/space/nearstation)
"bA" = (
/obj/machinery/vending/coffee/free,
/turf/simulated/floor/mineral/titanium/purple,
@@ -793,7 +793,7 @@
/obj/structure/lattice,
/obj/structure/grille,
/turf/space,
/area/space)
/area/space/nearstation)
"bX" = (
/obj/machinery/power/solar,
/obj/structure/cable{
@@ -803,7 +803,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
/area/space)
/area/space/nearstation)
"bY" = (
/obj/structure/cable{
d1 = 2;
@@ -817,7 +817,7 @@
tag = ""
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"bZ" = (
/obj/machinery/power/solar,
/obj/structure/cable{
@@ -827,7 +827,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
/area/space)
/area/space/nearstation)
"ca" = (
/obj/structure/cable{
d1 = 2;
@@ -846,12 +846,12 @@
icon_state = "1-2"
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"cb" = (
/obj/structure/lattice,
/obj/structure/grille/broken,
/turf/space,
/area/space)
/area/space/nearstation)
"cc" = (
/obj/machinery/camera{
c_tag = "Telecomms North Solars";
@@ -859,7 +859,7 @@
network = list("Telecomms")
},
/turf/space,
/area/space)
/area/space/nearstation)
"cd" = (
/obj/structure/cable{
d1 = 1;
@@ -868,7 +868,7 @@
tag = ""
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"ce" = (
/obj/structure/cable{
d1 = 4;
@@ -878,7 +878,7 @@
tag = ""
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"cf" = (
/obj/structure/cable{
d1 = 2;
@@ -892,7 +892,7 @@
icon_state = "2-4"
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"cg" = (
/obj/structure/cable{
d1 = 1;
@@ -901,7 +901,7 @@
tag = ""
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"ch" = (
/obj/structure/cable{
d1 = 1;
@@ -909,7 +909,7 @@
icon_state = "1-2"
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"ci" = (
/obj/structure/lattice,
/obj/structure/grille,
@@ -919,7 +919,7 @@
icon_state = "2-4"
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"cj" = (
/obj/structure/lattice,
/obj/structure/grille,
@@ -931,7 +931,7 @@
tag = ""
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"ck" = (
/obj/structure/grille,
/obj/structure/cable{
@@ -954,7 +954,7 @@
tag = ""
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"cl" = (
/obj/structure/lattice,
/obj/structure/grille,
@@ -965,7 +965,7 @@
tag = ""
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"cm" = (
/obj/structure/lattice,
/obj/structure/grille,
@@ -976,10 +976,10 @@
tag = ""
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"cn" = (
/turf/simulated/wall/r_wall,
/area/space)
/area/space/nearstation)
"co" = (
/obj/structure/lattice,
/obj/structure/grille,
@@ -990,7 +990,7 @@
tag = ""
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"cp" = (
/turf/simulated/wall/r_wall,
/area/turret_protected/tcomsat)
@@ -1006,7 +1006,7 @@
icon_state = "1-2"
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"cs" = (
/obj/structure/lattice,
/turf/space,
@@ -1619,7 +1619,7 @@
dir = 4
},
/turf/simulated/wall/r_wall,
/area/space)
/area/space/nearstation)
"dP" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -1631,13 +1631,13 @@
icon_state = "1-2"
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"dQ" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"dR" = (
/obj/structure/disposaloutlet{
dir = 4
@@ -1646,7 +1646,7 @@
dir = 8
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"dS" = (
/obj/structure/window/reinforced{
dir = 8
@@ -1704,7 +1704,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
/area/space)
/area/space/nearstation)
"dY" = (
/obj/structure/cable{
d1 = 1;
@@ -1720,7 +1720,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
/area/space)
/area/space/nearstation)
"ea" = (
/obj/machinery/door/window/brigdoor{
dir = 8;
@@ -2043,7 +2043,7 @@
icon_state = "2-4"
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"eE" = (
/obj/structure/cable{
d1 = 1;
@@ -2064,7 +2064,7 @@
tag = ""
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"eF" = (
/obj/structure/cable{
d1 = 2;
@@ -2073,7 +2073,7 @@
tag = ""
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"eG" = (
/obj/structure/window/reinforced{
dir = 8
@@ -2151,7 +2151,7 @@
icon_state = "2-4"
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"eO" = (
/obj/structure/cable{
d1 = 2;
@@ -2173,7 +2173,7 @@
tag = ""
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"eP" = (
/obj/structure/cable{
d1 = 1;
@@ -2188,7 +2188,7 @@
tag = ""
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"eQ" = (
/obj/structure/table/wood,
/obj/item/storage/firstaid/brute,
@@ -2334,7 +2334,7 @@
network = list("Telecomms")
},
/turf/space,
/area/space)
/area/space/nearstation)
"fd" = (
/obj/structure/window/reinforced{
dir = 4
@@ -2450,7 +2450,7 @@
network = list("Telecomms")
},
/turf/space,
/area/space)
/area/space/nearstation)
"fo" = (
/obj/structure/cable{
d1 = 2;
@@ -2464,7 +2464,7 @@
tag = ""
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"fp" = (
/obj/structure/table/wood,
/obj/item/storage/firstaid/adv,
@@ -2491,7 +2491,7 @@
icon_state = "1-2"
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"fr" = (
/obj/structure/window/reinforced{
dir = 8
@@ -2717,7 +2717,7 @@
icon_state = "2-4"
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"fJ" = (
/obj/machinery/telecomms/bus/preset_one,
/turf/simulated/floor/plasteel{
@@ -3481,7 +3481,7 @@
},
/obj/structure/grille,
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"hC" = (
/obj/structure/cable{
d1 = 1;
@@ -3790,7 +3790,7 @@
/area/tcommsat/entrance)
"ii" = (
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"ij" = (
/obj/structure/cable,
/obj/machinery/power/terminal{
@@ -3845,7 +3845,7 @@
},
/obj/machinery/power/tracker,
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"iu" = (
/obj/structure/cable{
d1 = 1;
@@ -3860,7 +3860,7 @@
tag = ""
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"iv" = (
/obj/structure/cable{
d1 = 4;
@@ -3871,7 +3871,7 @@
},
/obj/structure/grille,
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"iw" = (
/obj/machinery/computer/teleporter,
/turf/simulated/floor/plating,
@@ -3895,7 +3895,7 @@
},
/obj/structure/grille,
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"iA" = (
/obj/structure/grille,
/obj/structure/cable{
@@ -3917,7 +3917,7 @@
tag = ""
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"iB" = (
/obj/structure/cable{
d1 = 1;
@@ -3932,7 +3932,7 @@
tag = ""
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"iC" = (
/obj/structure/cable{
d1 = 1;
@@ -3952,7 +3952,7 @@
icon_state = "1-2"
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"iD" = (
/obj/machinery/camera{
c_tag = "Telecomms South Solars";
@@ -3960,7 +3960,7 @@
network = list("Telecomms")
},
/turf/space,
/area/space)
/area/space/nearstation)
"iF" = (
/turf/simulated/wall/r_wall,
/area/AIsattele)
+18 -18
View File
@@ -5,7 +5,7 @@
"ab" = (
/obj/structure/lattice,
/turf/space,
/area/space)
/area/space/nearstation)
"ac" = (
/turf/simulated/wall,
/area/constructionsite/hallway/port)
@@ -554,10 +554,10 @@
/area/constructionsite/hallway/starboard)
"bC" = (
/turf/simulated/wall,
/area/space)
/area/space/nearstation)
"bD" = (
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"bE" = (
/obj/machinery/light{
dir = 1;
@@ -850,14 +850,14 @@
tag = "icon-catwalk6";
icon_state = "catwalk6"
},
/area/space)
/area/space/nearstation)
"cm" = (
/turf/simulated/floor/plating/airless,
/turf/simulated/floor/plating/airless/catwalk{
tag = "icon-catwalk12";
icon_state = "catwalk12"
},
/area/space)
/area/space/nearstation)
"cn" = (
/turf/simulated/floor/plating/airless,
/turf/simulated/floor/plating/airless/catwalk{
@@ -878,7 +878,7 @@
tag = "icon-catwalk10";
icon_state = "catwalk10"
},
/area/space)
/area/space/nearstation)
"cq" = (
/obj/structure/inflatable/door,
/turf/simulated/floor/plasteel/airless,
@@ -889,7 +889,7 @@
tag = "icon-catwalk3";
icon_state = "catwalk3"
},
/area/space)
/area/space/nearstation)
"cs" = (
/turf/simulated/floor/plating/airless,
/turf/simulated/floor/plating/airless/catwalk{
@@ -1164,7 +1164,7 @@
tag = "icon-catwalk1";
icon_state = "catwalk1"
},
/area/space)
/area/space/nearstation)
"cU" = (
/obj/structure/lattice,
/turf/space,
@@ -1208,7 +1208,7 @@
/area/engiestation)
"dc" = (
/turf/simulated/wall/r_wall,
/area/space)
/area/space/nearstation)
"dd" = (
/obj/machinery/power/solar,
/obj/structure/cable{
@@ -2024,7 +2024,7 @@
tag = "icon-catwalk9";
icon_state = "catwalk9"
},
/area/space)
/area/space/nearstation)
"et" = (
/obj/machinery/door/airlock/maintenance{
req_access_txt = "0";
@@ -2336,7 +2336,7 @@
tag = "icon-catwalk2";
icon_state = "catwalk2"
},
/area/space)
/area/space/nearstation)
"fj" = (
/obj/machinery/vending/cola,
/turf/simulated/floor/plasteel{
@@ -2640,7 +2640,7 @@
tag = "icon-catwalk5";
icon_state = "catwalk5"
},
/area/space)
/area/space/nearstation)
"fR" = (
/obj/item/lighter/zippo,
/turf/simulated/floor/plating/airless,
@@ -2648,7 +2648,7 @@
tag = "icon-catwalk8";
icon_state = "catwalk8"
},
/area/space)
/area/space/nearstation)
"fS" = (
/obj/machinery/shower{
dir = 4;
@@ -2746,7 +2746,7 @@
tag = "icon-catwalk4";
icon_state = "catwalk4"
},
/area/space)
/area/space/nearstation)
"gd" = (
/obj/structure/lattice,
/obj/structure/disposaloutlet{
@@ -2756,18 +2756,18 @@
dir = 4
},
/turf/space,
/area/space)
/area/space/nearstation)
"ge" = (
/obj/structure/disposalpipe/segment{
dir = 8;
icon_state = "pipe-c"
},
/turf/space,
/area/space)
/area/space/nearstation)
"gf" = (
/obj/structure/grille,
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"gg" = (
/obj/item/radio/intercom{
dir = 1;
@@ -4077,7 +4077,7 @@
/area/constructionsite/engineering)
"jh" = (
/turf/simulated/mineral,
/area/space)
/area/space/nearstation)
"ji" = (
/obj/structure/cable{
d1 = 1;
+73 -73
View File
@@ -7,7 +7,7 @@
amount = 2
},
/turf/space,
/area/space)
/area/space/nearstation)
"ac" = (
/obj/machinery/power/solar/fake,
/turf/simulated/floor/plasteel/airless{
@@ -17,17 +17,17 @@
"ad" = (
/turf/space,
/turf/simulated/floor/plating/airless/catwalk,
/area/space)
/area/space/nearstation)
"ae" = (
/obj/structure/lattice,
/turf/space,
/area/space)
/area/space/nearstation)
"af" = (
/obj/machinery/power/solar/fake,
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
/area/space)
/area/space/nearstation)
"ag" = (
/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
@@ -41,7 +41,7 @@
icon_state = "brokengrille"
},
/turf/space,
/area/space)
/area/space/nearstation)
"aj" = (
/obj/machinery/power/terminal,
/turf/simulated/floor/plating,
@@ -55,7 +55,7 @@
amount = 1
},
/turf/space,
/area/space)
/area/space/nearstation)
"am" = (
/obj/item/extinguisher,
/turf/simulated/floor/plating,
@@ -86,7 +86,7 @@
},
/obj/structure/lattice,
/turf/space,
/area/space)
/area/space/nearstation)
"ap" = (
/obj/structure/cable{
d1 = 1;
@@ -135,12 +135,12 @@
icon_state = "brokengrille"
},
/turf/space,
/area/space)
/area/space/nearstation)
"au" = (
/obj/structure/lattice,
/obj/structure/lattice,
/turf/space,
/area/space)
/area/space/nearstation)
"av" = (
/obj/structure/grille,
/obj/structure/window/full/shuttle,
@@ -174,7 +174,7 @@
/area/djstation)
"az" = (
/turf/simulated/floor/plasteel/airless,
/area/space)
/area/space/nearstation)
"aA" = (
/obj/structure/grille,
/obj/structure/window/full/shuttle,
@@ -511,7 +511,7 @@
"bj" = (
/obj/structure/grille,
/turf/space,
/area/space)
/area/space/nearstation)
"bk" = (
/obj/structure/table/reinforced,
/obj/item/ashtray/bronze,
@@ -577,7 +577,7 @@
/obj/structure/lattice,
/obj/structure/grille,
/turf/space,
/area/space)
/area/space/nearstation)
"bt" = (
/turf/simulated/wall/mineral/titanium/nodecon,
/area/derelict/arrival)
@@ -1257,7 +1257,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
/area/space)
/area/space/nearstation)
"cJ" = (
/obj/structure/sign/securearea,
/turf/simulated/wall/mineral/titanium/nodecon/nodiagonal,
@@ -1836,7 +1836,7 @@
"ed" = (
/obj/item/stack/rods,
/turf/space,
/area/space)
/area/space/nearstation)
"ee" = (
/obj/structure/grille,
/obj/structure/window/full/shuttle,
@@ -2282,7 +2282,7 @@
"fa" = (
/mob/living/simple_animal/hostile/carp,
/turf/space,
/area/space)
/area/space/nearstation)
"fb" = (
/obj/structure/grille,
/obj/structure/window/full/shuttle,
@@ -2510,7 +2510,7 @@
/area/derelict/crew_quarters)
"fC" = (
/turf/simulated/wall/mineral/titanium/nodecon,
/area/space)
/area/space/nearstation)
"fD" = (
/obj/machinery/light_switch{
pixel_x = 32;
@@ -2708,7 +2708,7 @@
"fZ" = (
/obj/item/shard,
/turf/space,
/area/space)
/area/space/nearstation)
"ga" = (
/obj/structure/toilet{
dir = 8
@@ -3086,7 +3086,7 @@
icon_state = "medium"
},
/turf/space,
/area/space)
/area/space/nearstation)
"gV" = (
/obj/structure/coatrack,
/turf/simulated/floor/plasteel{
@@ -3382,7 +3382,7 @@
"hw" = (
/obj/machinery/atmospherics/unary/passive_vent,
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"hx" = (
/obj/structure/chair/wood/normal,
/turf/simulated/floor/wood{
@@ -4417,7 +4417,7 @@
icon_state = "small"
},
/turf/space,
/area/space)
/area/space/nearstation)
"ju" = (
/obj/structure/chair{
dir = 4
@@ -4876,7 +4876,7 @@
"kp" = (
/obj/item/stack/ore/uranium,
/turf/space,
/area/space)
/area/space/nearstation)
"kq" = (
/obj/structure/table/reinforced,
/obj/item/paper/djstation{
@@ -5221,7 +5221,7 @@
"kZ" = (
/obj/item/stack/ore/iron,
/turf/space,
/area/space)
/area/space/nearstation)
"la" = (
/turf/simulated/floor/plasteel{
dir = 8;
@@ -5392,7 +5392,7 @@
dir = 1
},
/turf/simulated/shuttle/plating,
/area/space)
/area/space/nearstation)
"lu" = (
/turf/space,
/turf/simulated/shuttle/wall{
@@ -5400,7 +5400,7 @@
icon_state = "swall_f6";
tag = "icon-swall_f6"
},
/area/space)
/area/space/nearstation)
"lv" = (
/obj/structure/table,
/obj/effect/spawner/lootdrop/maintenance,
@@ -5415,7 +5415,7 @@
},
/obj/structure/window/reinforced,
/turf/simulated/shuttle/plating,
/area/space)
/area/space/nearstation)
"lx" = (
/turf/space,
/turf/simulated/shuttle/wall{
@@ -5423,11 +5423,11 @@
icon_state = "swall_f10";
dir = 2
},
/area/space)
/area/space/nearstation)
"ly" = (
/obj/item/stack/tile,
/turf/space,
/area/space)
/area/space/nearstation)
"lz" = (
/obj/machinery/light{
dir = 1;
@@ -5454,13 +5454,13 @@
icon_state = "swall11";
dir = 2
},
/area/space)
/area/space/nearstation)
"lC" = (
/turf/simulated/shuttle/wall{
icon_state = "swall7";
dir = 2
},
/area/space)
/area/space/nearstation)
"lD" = (
/turf/space,
/area/derelict/eva{
@@ -5472,7 +5472,7 @@
icon_state = "swall_f5";
dir = 2
},
/area/space)
/area/space/nearstation)
"lF" = (
/turf/space,
/area/syndicate_depot/perimeter)
@@ -5533,13 +5533,13 @@
icon_state = "swall_f9";
dir = 2
},
/area/space)
/area/space/nearstation)
"lP" = (
/turf/simulated/shuttle/wall{
icon_state = "swall3";
dir = 2
},
/area/space)
/area/space/nearstation)
"lQ" = (
/obj/structure/cable{
d1 = 1;
@@ -5710,19 +5710,19 @@
/obj/item/shard,
/obj/effect/mob_spawn/human/mime/corpse,
/turf/simulated/floor/plasteel/airless,
/area/space)
/area/space/nearstation)
"mp" = (
/obj/item/broken_bottle,
/obj/effect/mob_spawn/human/mime/corpse,
/turf/simulated/floor/plasteel/airless,
/area/space)
/area/space/nearstation)
"mq" = (
/obj/item/shard{
icon_state = "medium"
},
/obj/effect/mob_spawn/human/mime/corpse,
/turf/simulated/floor/plasteel/airless,
/area/space)
/area/space/nearstation)
"mr" = (
/obj/structure/falsewall,
/turf/simulated/floor/plasteel{
@@ -5774,7 +5774,7 @@
icon_state = "swall12";
dir = 2
},
/area/space)
/area/space/nearstation)
"my" = (
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/shuttle/wall{
@@ -5782,7 +5782,7 @@
icon_state = "swall_f9";
dir = 2
},
/area/space)
/area/space/nearstation)
"mz" = (
/obj/structure/closet/crate{
icon_state = "crateopen";
@@ -5791,7 +5791,7 @@
/obj/item/stack/ore/bananium,
/obj/item/grenade/bananade,
/turf/simulated/floor/plasteel/airless,
/area/space)
/area/space/nearstation)
"mA" = (
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -5814,7 +5814,7 @@
icon_state = "medium"
},
/turf/simulated/floor/plasteel/airless,
/area/space)
/area/space/nearstation)
"mE" = (
/obj/structure/cable{
d1 = 1;
@@ -5840,7 +5840,7 @@
tag = "icon-burst_r (WEST)"
},
/turf/simulated/shuttle/plating,
/area/space)
/area/space/nearstation)
"mG" = (
/obj/structure/shuttle/engine/heater{
tag = "icon-heater (EAST)";
@@ -5851,13 +5851,13 @@
dir = 8
},
/turf/simulated/shuttle/plating,
/area/space)
/area/space/nearstation)
"mH" = (
/turf/simulated/mineral,
/area/space)
/area/space/nearstation)
"mI" = (
/turf/simulated/floor/plating/airless/asteroid,
/area/space)
/area/space/nearstation)
"mJ" = (
/obj/effect/decal/cleanable/blood,
/turf/simulated/floor/plasteel{
@@ -5871,7 +5871,7 @@
"mL" = (
/obj/machinery/door/unpowered/shuttle,
/turf/simulated/floor/plasteel/airless,
/area/space)
/area/space/nearstation)
"mM" = (
/obj/effect/spawner/random_spawners/syndicate/loot,
/turf/simulated/floor/plasteel{
@@ -5900,7 +5900,7 @@
/obj/item/stack/ore/tranquillite,
/obj/item/stack/ore/tranquillite,
/turf/simulated/floor/plasteel/airless,
/area/space)
/area/space/nearstation)
"mQ" = (
/obj/structure/closet/crate,
/obj/item/stack/ore/tranquillite,
@@ -5911,7 +5911,7 @@
/obj/item/stack/ore/tranquillite,
/obj/item/stack/ore/tranquillite,
/turf/simulated/floor/plasteel/airless,
/area/space)
/area/space/nearstation)
"mR" = (
/obj/machinery/light{
dir = 1;
@@ -5935,7 +5935,7 @@
"mT" = (
/obj/item/shard,
/turf/simulated/floor/plating/airless/asteroid,
/area/space)
/area/space/nearstation)
"mU" = (
/obj/structure/closet/crate,
/obj/item/stack/ore/bananium,
@@ -5944,25 +5944,25 @@
/obj/item/stack/ore/bananium,
/obj/item/stack/ore/bananium,
/turf/simulated/floor/plasteel/airless,
/area/space)
/area/space/nearstation)
"mV" = (
/obj/effect/mob_spawn/human/mime/corpse{
name = "Mime Pilot"
},
/turf/simulated/floor/plasteel/airless,
/area/space)
/area/space/nearstation)
"mW" = (
/obj/structure/computerframe/HONKputer,
/turf/simulated/floor/plasteel/airless,
/area/space)
/area/space/nearstation)
"mX" = (
/obj/effect/mob_spawn/human/corpse/clownmili,
/turf/simulated/floor/plasteel/airless,
/area/space)
/area/space/nearstation)
"mY" = (
/obj/effect/mob_spawn/human/corpse/clownoff,
/turf/simulated/floor/plasteel/airless,
/area/space)
/area/space/nearstation)
"mZ" = (
/obj/effect/spawner/random_spawners/syndicate/turret/external,
/turf/simulated/floor/plasteel{
@@ -5979,17 +5979,17 @@
dir = 4
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"nb" = (
/obj/item/shard{
icon_state = "small"
},
/turf/simulated/floor/plating/airless/asteroid,
/area/space)
/area/space/nearstation)
"nc" = (
/obj/item/stack/ore/bananium,
/turf/simulated/floor/plasteel/airless,
/area/space)
/area/space/nearstation)
"nd" = (
/obj/item/stack/sheet/metal{
layer = 4.1
@@ -6005,7 +6005,7 @@
tag = "icon-propulsion_l (WEST)"
},
/turf/simulated/shuttle/plating,
/area/space)
/area/space/nearstation)
"nf" = (
/obj/effect/spawner/random_spawners/syndicate/trap/mine,
/obj/item/stack/sheet/metal{
@@ -6018,14 +6018,14 @@
"ng" = (
/obj/item/paper/clownship,
/turf/simulated/floor/plasteel/airless,
/area/space)
/area/space/nearstation)
"nh" = (
/obj/item/shard,
/obj/structure/chair{
dir = 8
},
/turf/simulated/floor/plasteel/airless,
/area/space)
/area/space/nearstation)
"ni" = (
/obj/machinery/light{
dir = 4;
@@ -6039,7 +6039,7 @@
"nj" = (
/obj/effect/mob_spawn/human/clown/corpse,
/turf/simulated/floor/plasteel/airless,
/area/space)
/area/space/nearstation)
"nk" = (
/obj/machinery/computer/syndicate_depot/teleporter,
/turf/simulated/floor/plasteel{
@@ -6049,7 +6049,7 @@
"nl" = (
/obj/item/pickaxe,
/turf/simulated/floor/plasteel/airless,
/area/space)
/area/space/nearstation)
"nm" = (
/obj/structure/closet/crate,
/obj/item/stack/ore/bananium,
@@ -6057,7 +6057,7 @@
/obj/item/stack/ore/bananium,
/obj/item/stack/ore/bananium,
/turf/simulated/floor/plasteel/airless,
/area/space)
/area/space/nearstation)
"nn" = (
/turf/simulated/floor/plasteel{
dir = 1;
@@ -6080,7 +6080,7 @@
icon_state = "swall_f10";
dir = 2
},
/area/space)
/area/space/nearstation)
"nq" = (
/obj/structure/shuttle/engine/propulsion{
dir = 4;
@@ -6093,7 +6093,7 @@
tag = "icon-propulsion_l (WEST)"
},
/turf/simulated/shuttle/plating,
/area/space)
/area/space/nearstation)
"nr" = (
/obj/effect/decal/warning_stripes/red,
/obj/structure/window/plasmareinforced{
@@ -6267,13 +6267,13 @@
dir = 8
},
/turf/simulated/floor/plating/airless/asteroid,
/area/space)
/area/space/nearstation)
"nO" = (
/obj/effect/mob_spawn/human/clown/corpse{
name = "Clown Pilot"
},
/turf/simulated/floor/plasteel/airless,
/area/space)
/area/space/nearstation)
"nP" = (
/obj/structure/dispenser,
/turf/simulated/floor/plasteel{
@@ -7454,7 +7454,7 @@
/obj/effect/landmark/burnturf,
/obj/structure/grille/broken,
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"qI" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
@@ -8047,7 +8047,7 @@
/turf/simulated/wall/mineral/titanium/nodecon/nosmooth{
icon_state = "swall_f10"
},
/area/space)
/area/space/nearstation)
"rM" = (
/turf/simulated/floor/plasteel/airless{
dir = 5;
@@ -8965,7 +8965,7 @@
icon_state = "medium"
},
/turf/space,
/area/space)
/area/space/nearstation)
"tA" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
@@ -10583,7 +10583,7 @@
"wz" = (
/obj/item/stack/sheet/metal,
/turf/space,
/area/space)
/area/space/nearstation)
"wC" = (
/obj/effect/landmark/burnturf,
/obj/machinery/light/small{
@@ -11119,7 +11119,7 @@
name = "I PISS ON YOU!"
},
/turf/space,
/area/space)
/area/space/nearstation)
"yo" = (
/obj/structure/chair/comfy/brown{
dir = 8
@@ -11325,7 +11325,7 @@
max_amount = 30
},
/turf/space,
/area/space)
/area/space/nearstation)
"yS" = (
/obj/machinery/door/airlock/external{
frequency = 1501;
@@ -11489,7 +11489,7 @@
icon_state = "small"
},
/turf/space,
/area/space)
/area/space/nearstation)
"zt" = (
/turf/simulated/wall,
/area/derelict/teleporter)
@@ -11647,7 +11647,7 @@
icon_state = "swall_f5";
dir = 2
},
/area/space)
/area/space/nearstation)
"zR" = (
/obj/machinery/portable_atmospherics/canister/toxins,
/obj/machinery/light/small{
+30 -42
View File
@@ -39,7 +39,7 @@
"ag" = (
/obj/spacepod/random,
/turf/space,
/area/space)
/area/space/nearstation)
"ah" = (
/obj/structure/grille,
/obj/structure/window/reinforced{
@@ -57,7 +57,7 @@
"aj" = (
/obj/structure/lattice,
/turf/space,
/area/space)
/area/space/nearstation)
"ak" = (
/turf/simulated/mineral/random/high_chance,
/area/mine/dangerous/unexplored)
@@ -104,7 +104,7 @@
icon_state = "pwall";
dir = 1
},
/area/space)
/area/mine/abandoned)
"ar" = (
/turf/simulated/floor/plating/airless,
/turf/simulated/shuttle/wall{
@@ -143,7 +143,7 @@
tag = "icon-floor2";
icon_state = "floor2"
},
/area/space)
/area/mine/abandoned)
"aw" = (
/obj/structure/shuttle/engine/propulsion{
dir = 8;
@@ -156,7 +156,7 @@
tag = ""
},
/turf/simulated/floor/plating/airless,
/area/space)
/area/mine/abandoned)
"ax" = (
/obj/machinery/door/airlock/hatch,
/turf/simulated/shuttle/floor{
@@ -172,7 +172,7 @@
tag = "icon-floor2";
icon_state = "floor2"
},
/area/space)
/area/mine/abandoned)
"az" = (
/obj/structure/grille,
/obj/structure/window/reinforced{
@@ -223,7 +223,7 @@
icon_state = "pwall";
dir = 5
},
/area/space)
/area/mine/abandoned)
"aH" = (
/obj/structure/alien/weeds,
/turf/simulated/floor/plating/airless{
@@ -236,7 +236,7 @@
icon_state = "medium"
},
/turf/space,
/area/space)
/area/space/nearstation)
"aJ" = (
/obj/structure/grille,
/obj/structure/window/reinforced{
@@ -252,7 +252,7 @@
icon_state = "pwall";
dir = 6
},
/area/space)
/area/mine/abandoned)
"aL" = (
/turf/space,
/turf/simulated/shuttle/wall{
@@ -260,7 +260,7 @@
icon_state = "pwall";
dir = 9
},
/area/space)
/area/mine/abandoned)
"aM" = (
/obj/structure/grille,
/obj/structure/window/reinforced{
@@ -305,7 +305,7 @@
/obj/item/stack/rods,
/obj/structure/lattice,
/turf/space,
/area/space)
/area/space/nearstation)
"aS" = (
/obj/item/shard,
/obj/item/stack/rods,
@@ -411,7 +411,7 @@
/obj/item/shard,
/obj/structure/lattice,
/turf/space,
/area/space)
/area/space/nearstation)
"bj" = (
/obj/machinery/power/terminal{
dir = 4
@@ -1564,13 +1564,13 @@
/area/mine/abandoned)
"eg" = (
/turf/simulated/mineral/random/labormineral,
/area/space)
/area/space/nearstation)
"eh" = (
/turf/simulated/wall/r_wall,
/area/mine/dangerous/explored)
"ei" = (
/turf/simulated/mineral/random,
/area/space)
/area/space/nearstation)
"ej" = (
/obj/structure/girder/displaced,
/turf/simulated/floor/plating/airless{
@@ -2494,7 +2494,7 @@
d2 = 4
},
/turf/simulated/floor/plating,
/area/space)
/area/space/nearstation)
"gb" = (
/obj/effect/spawner/window/reinforced,
/obj/structure/cable{
@@ -2526,7 +2526,7 @@
icon_state = "0-8"
},
/turf/simulated/floor/plating,
/area/space)
/area/space/nearstation)
"ge" = (
/obj/machinery/computer/shuttle/labor/one_way,
/obj/structure/cable{
@@ -3099,10 +3099,10 @@
/area/mine/west_outpost)
"hu" = (
/turf/simulated/floor/plating/airless,
/area/space)
/area/space/nearstation)
"hv" = (
/turf/simulated/mineral,
/area/space)
/area/space/nearstation)
"hw" = (
/obj/machinery/computer/mech_bay_power_console,
/obj/structure/window/reinforced{
@@ -4315,12 +4315,6 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/mine/eva)
"kh" = (
/turf/simulated/floor/plating/airless{
icon_state = "asteroidwarning";
dir = 5
},
/area/space)
"ki" = (
/obj/machinery/light,
/turf/simulated/floor/plating/airless/asteroid,
@@ -4598,7 +4592,7 @@
icon_state = "asteroidwarning";
dir = 4
},
/area/space)
/area/mine/dangerous/explored)
"kR" = (
/obj/machinery/door/airlock/external{
frequency = 1379;
@@ -4774,7 +4768,7 @@
/area/mine/living_quarters)
"ll" = (
/turf/simulated/floor/plating/airless/asteroid,
/area/space)
/area/space/nearstation)
"lm" = (
/obj/effect/spawner/window/reinforced,
/obj/machinery/door/firedoor,
@@ -5368,12 +5362,6 @@
},
/turf/simulated/floor/plasteel,
/area/mine/eva)
"mx" = (
/turf/simulated/floor/plating/airless{
icon_state = "asteroidwarning";
dir = 6
},
/area/space)
"my" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden,
@@ -6702,7 +6690,7 @@
dir = 4
},
/turf/space,
/area/space)
/area/space/nearstation)
"pj" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
/obj/effect/decal/warning_stripes/blue/hollow,
@@ -52246,11 +52234,11 @@ bV
bV
bV
bV
ll
kh
bV
dP
kQ
mx
ll
dK
bV
mQ
nj
nj
@@ -52503,11 +52491,11 @@ bV
bV
bV
bV
ll
ll
ll
ll
ll
bV
bV
bV
bV
bV
bV
bV
bV
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+9 -3
View File
@@ -11,7 +11,8 @@ Pipelines + Other Objects -> Pipe network
GLOBAL_DATUM_INIT(pipe_icon_manager, /datum/pipe_icon_manager, new())
/obj/machinery/atmospherics
anchored = 1
layer = 2.4 //under wires with their 2.44
layer = GAS_PIPE_HIDDEN_LAYER //under wires
plane = FLOOR_PLANE
idle_power_usage = 0
active_power_usage = 0
power_channel = ENVIRON
@@ -61,10 +62,14 @@ GLOBAL_DATUM_INIT(pipe_icon_manager, /datum/pipe_icon_manager, new())
// Icons/overlays/underlays
/obj/machinery/atmospherics/update_icon()
return null
var/turf/T = loc
if(level == 2 || !T.intact)
plane = GAME_PLANE
else
plane = FLOOR_PLANE
/obj/machinery/atmospherics/proc/update_pipe_image()
pipe_image = image(src, loc, layer = 20, dir = dir) //the 20 puts it above Byond's darkness (not its opacity view)
pipe_image = image(src, loc, layer = ABOVE_HUD_LAYER, dir = dir) //the 20 puts it above Byond's darkness (not its opacity view)
pipe_image.plane = HUD_PLANE
/obj/machinery/atmospherics/proc/check_icon_cache(var/safety = 0)
@@ -327,3 +332,4 @@ GLOBAL_DATUM_INIT(pipe_icon_manager, /datum/pipe_icon_manager, new())
/obj/machinery/atmospherics/update_remote_sight(mob/user)
user.sight |= (SEE_TURFS|BLIND)
. = ..()
@@ -3,6 +3,8 @@
initialize_directions = SOUTH|NORTH
use_power = IDLE_POWER_USE
layer = GAS_PUMP_LAYER
var/datum/gas_mixture/air1
var/datum/gas_mixture/air2
@@ -15,8 +15,6 @@
var/obj/machinery/power/generator/generator
layer = 2.45 // Just above wires
anchored = 1
density = 1
@@ -112,6 +110,8 @@
..()
/obj/machinery/atmospherics/binary/circulator/update_icon()
..()
if(stat & (BROKEN|NOPOWER))
icon_state = "circ[side]-p"
else if(last_pressure_delta > 0)
@@ -71,6 +71,8 @@
add_underlay(T, node2, dir)
/obj/machinery/atmospherics/binary/dp_vent_pump/update_icon(var/safety = 0)
..()
if(!check_icon_cache())
return
@@ -28,6 +28,7 @@
return ..()
/obj/machinery/atmospherics/binary/passive_gate/update_icon()
..()
icon_state = "[on ? "on" : "off"]"
/obj/machinery/atmospherics/binary/passive_gate/update_underlays()
@@ -79,6 +79,8 @@ Thus, the two variables affect pump operation are set in New():
on = 1
/obj/machinery/atmospherics/binary/pump/update_icon()
..()
if(!powered())
icon_state = "off"
else
@@ -16,6 +16,8 @@
icon_state = "map_valve1"
/obj/machinery/atmospherics/binary/valve/update_icon(animation)
..()
if(animation)
flick("valve[src.open][!src.open]",src)
else
@@ -83,6 +83,8 @@ Thus, the two variables affect pump operation are set in New():
set_frequency(frequency)
/obj/machinery/atmospherics/binary/volume_pump/update_icon()
..()
if(!powered())
icon_state = "off"
else
@@ -72,6 +72,8 @@
update_ports()
/obj/machinery/atmospherics/omni/update_icon()
..()
if(stat & NOPOWER)
overlays = overlays_off
on = 0
@@ -83,8 +85,6 @@
underlays = underlays_current
return
/obj/machinery/atmospherics/omni/proc/error_check()
return
@@ -79,6 +79,8 @@ Filter types:
radio_connection = SSradio.add_object(src, frequency, RADIO_ATMOSIA)
/obj/machinery/atmospherics/trinary/filter/update_icon()
..()
if(flipped)
icon_state = "m"
else
@@ -57,6 +57,8 @@
update_icon()
/obj/machinery/atmospherics/trinary/mixer/update_icon(safety = 0)
..()
if(flipped)
icon_state = "m"
else
@@ -4,6 +4,7 @@
use_power = IDLE_POWER_USE
var/on = 0
layer = GAS_FILTER_LAYER
var/datum/gas_mixture/air1
var/datum/gas_mixture/air2
@@ -135,6 +135,7 @@
/obj/machinery/atmospherics/trinary/tvalve/digital/update_icon()
..()
if(!powered())
icon_state = "tvalvenopower"
@@ -13,6 +13,8 @@
var/current_heat_capacity = 50000 //totally random
/obj/machinery/atmospherics/unary/cold_sink/update_icon()
..()
if(node)
icon_state = "intact_[on?("on"):("off")]"
else
@@ -20,8 +22,6 @@
on = 0
return
/obj/machinery/atmospherics/unary/cold_sink/process_atmos()
..()
if(!on)
@@ -9,12 +9,12 @@
var/update_cycle
/obj/machinery/atmospherics/unary/generator_input/update_icon()
..()
if(node)
icon_state = "intact"
else
icon_state = "exposed"
return
/obj/machinery/atmospherics/unary/generator_input/proc/return_exchange_air()
return air_contents
@@ -13,13 +13,13 @@
burn_state = LAVA_PROOF
/obj/machinery/atmospherics/unary/heat_exchanger/update_icon()
..()
if(node)
icon_state = "intact"
else
icon_state = "exposed"
return
/obj/machinery/atmospherics/unary/heat_exchanger/atmos_init()
if(!partner)
var/partner_connect = turn(dir,180)
@@ -13,6 +13,8 @@
var/current_heat_capacity = 50000 //totally random
/obj/machinery/atmospherics/unary/heat_reservoir/update_icon()
..()
if(node)
icon_state = "intact_[on?("on"):("off")]"
else
@@ -20,8 +22,6 @@
on = 0
return
/obj/machinery/atmospherics/unary/heat_reservoir/process_atmos()
..()
if(!on)
@@ -2,7 +2,7 @@
icon = 'icons/atmos/injector.dmi'
icon_state = "map_injector"
use_power = IDLE_POWER_USE
layer = 3
layer = GAS_SCRUBBER_LAYER
can_unwrench = 1
@@ -38,6 +38,8 @@
return ..()
/obj/machinery/atmospherics/unary/outlet_injector/update_icon()
..()
if(!powered())
icon_state = "off"
else
@@ -14,6 +14,8 @@
var/oxygen_content = 10
/obj/machinery/atmospherics/unary/oxygen_generator/update_icon()
..()
if(node)
icon_state = "intact_[on?("on"):("off")]"
else
@@ -21,8 +23,6 @@
on = 0
return
/obj/machinery/atmospherics/unary/oxygen_generator/New()
..()
@@ -6,7 +6,7 @@
desc = "For connecting portables devices related to atmospherics control."
can_unwrench = 1
layer = 2.4
layer = GAS_FILTER_LAYER
var/obj/machinery/portable_atmospherics/connected_device
@@ -18,6 +18,7 @@
return ..()
/obj/machinery/atmospherics/unary/portables_connector/update_icon()
..()
icon_state = "connector"
/obj/machinery/atmospherics/unary/portables_connector/update_underlays()
@@ -11,10 +11,12 @@
desc = "Transfers heat to and from an area"
/obj/machinery/atmospherics/unary/thermal_plate/update_icon()
var/prefix=""
..()
var/prefix = ""
//var/suffix="_idle" // Also available: _heat, _cool
if(level == 1 && istype(loc, /turf/simulated))
prefix="h"
prefix = "h"
icon_state = "[prefix]off"
/obj/machinery/atmospherics/unary/thermal_plate/process_atmos()
@@ -10,6 +10,8 @@
desc = "Has a valve and pump attached to it"
use_power = IDLE_POWER_USE
layer = GAS_SCRUBBER_LAYER
can_unwrench = 1
var/open = 0
@@ -77,6 +79,10 @@
air_contents.volume = 1000
/obj/machinery/atmospherics/unary/vent_pump/update_icon(var/safety = 0)
..()
plane = FLOOR_PLANE
if(!check_icon_cache())
return
@@ -6,6 +6,7 @@
name = "air scrubber"
desc = "Has a valve and pump attached to it"
layer = GAS_SCRUBBER_LAYER
use_power = IDLE_POWER_USE
idle_power_usage = 10
@@ -91,6 +92,10 @@
return 1
/obj/machinery/atmospherics/unary/vent_scrubber/update_icon(var/safety = 0)
..()
plane = FLOOR_PLANE
if(!check_icon_cache())
return
+2 -1
View File
@@ -4,7 +4,6 @@
icon = 'icons/atmos/pipes.dmi'
icon_state = "cap"
level = 2
layer = 2.4 //under wires with their 2.44
volume = 35
@@ -55,6 +54,8 @@
node.update_underlays()
/obj/machinery/atmospherics/pipe/cap/update_icon(var/safety = 0)
..()
if(!check_icon_cache())
return
+2 -1
View File
@@ -14,7 +14,6 @@
var/obj/machinery/atmospherics/node3
level = 1
layer = 2.4 //under wires with their 2.44
/obj/machinery/atmospherics/pipe/manifold/New()
@@ -116,6 +115,8 @@
node3.update_underlays()
/obj/machinery/atmospherics/pipe/manifold/update_icon(var/safety = 0)
..()
if(!check_icon_cache())
return
+2 -1
View File
@@ -15,7 +15,6 @@
var/obj/machinery/atmospherics/node4
level = 1
layer = 2.4 //under wires with their 2.44
/obj/machinery/atmospherics/pipe/manifold4w/New()
..()
@@ -90,6 +89,8 @@
node4.update_underlays()
/obj/machinery/atmospherics/pipe/manifold4w/update_icon(var/safety = 0)
..()
if(!check_icon_cache())
return
-1
View File
@@ -3,7 +3,6 @@
var/datum/pipeline/parent
var/volume = 0
force = 20
layer = 2.4 //under wires with their 2.44
use_power = NO_POWER_USE
can_unwrench = 1
var/alert_pressure = 80*ONE_ATMOSPHERE //minimum pressure before check_pressure(...) should be called
@@ -137,6 +137,8 @@
node2.update_underlays()
/obj/machinery/atmospherics/pipe/simple/update_icon(var/safety = 0)
..()
if(!check_icon_cache())
return
@@ -28,6 +28,8 @@
icon_state = "map_universal"
/obj/machinery/atmospherics/pipe/simple/hidden/universal/update_icon(var/safety = 0)
..()
if(!check_icon_cache())
return
@@ -39,6 +39,8 @@
icon_state = "map_universal"
/obj/machinery/atmospherics/pipe/simple/visible/universal/update_icon(var/safety = 0)
..()
if(!check_icon_cache())
return
-6
View File
@@ -52,12 +52,6 @@
#define GRAB_UPGRADING 4
#define GRAB_KILL 5
//Hostile Mob AI Status
#define AI_ON 1
#define AI_IDLE 2
#define AI_OFF 3
//Attack types for checking shields/hit reactions
#define MELEE_ATTACK 1
+1
View File
@@ -1,3 +1,4 @@
#define GAME_STATE_STARTUP 0
#define GAME_STATE_PREGAME 1
#define GAME_STATE_SETTING_UP 2
#define GAME_STATE_PLAYING 3
+6 -6
View File
@@ -8,12 +8,12 @@
#define TARGET_INVALID_EVENT 7
//gamemode istype helpers
#define GAMEMODE_IS_BLOB (ticker && istype(ticker.mode, /datum/game_mode/blob))
#define GAMEMODE_IS_CULT (ticker && istype(ticker.mode, /datum/game_mode/cult))
#define GAMEMODE_IS_HEIST (ticker && istype(ticker.mode, /datum/game_mode/heist))
#define GAMEMODE_IS_NUCLEAR (ticker && istype(ticker.mode, /datum/game_mode/nuclear))
#define GAMEMODE_IS_REVOLUTION (ticker && istype(ticker.mode, /datum/game_mode/revolution))
#define GAMEMODE_IS_WIZARD (ticker && istype(ticker.mode, /datum/game_mode/wizard))
#define GAMEMODE_IS_BLOB (SSticker && istype(SSticker.mode, /datum/game_mode/blob))
#define GAMEMODE_IS_CULT (SSticker && istype(SSticker.mode, /datum/game_mode/cult))
#define GAMEMODE_IS_HEIST (SSticker && istype(SSticker.mode, /datum/game_mode/heist))
#define GAMEMODE_IS_NUCLEAR (SSticker && istype(SSticker.mode, /datum/game_mode/nuclear))
#define GAMEMODE_IS_REVOLUTION (SSticker && istype(SSticker.mode, /datum/game_mode/revolution))
#define GAMEMODE_IS_WIZARD (SSticker && istype(SSticker.mode, /datum/game_mode/wizard))
//special roles
// Distinct from the ROLE_X defines because some antags have multiple special roles but only one ban type
+24 -16
View File
@@ -6,7 +6,9 @@
#define PLANE_SPACE -95
#define PLANE_SPACE_PARALLAX -90
#define GAME_PLANE 0
#define FLOOR_PLANE -2
#define GAME_PLANE -1
#define BLACKNESS_PLANE 0 //To keep from conflicts with SEE_BLACKNESS internals
#define SPACE_LAYER 1.8
//#define TURF_LAYER 2 //For easy recordkeeping; this is a byond define
@@ -83,23 +85,29 @@
#define ABOVE_LIGHTING_PLANE 16
#define ABOVE_LIGHTING_LAYER 16
#define BYOND_LIGHTING_PLANE 17
#define BYOND_LIGHTING_LAYER 17
#define FLOOR_OPENSPACE_PLANE 17
#define OPENSPACE_LAYER 17
#define BYOND_LIGHTING_PLANE 18
#define BYOND_LIGHTING_LAYER 18
#define CAMERA_STATIC_PLANE 19
#define CAMERA_STATIC_LAYER 19
//HUD layer defines
#define FULLSCREEN_PLANE 18
#define FLASH_LAYER 18
#define FULLSCREEN_LAYER 18.1
#define UI_DAMAGE_LAYER 18.2
#define BLIND_LAYER 18.3
#define CRIT_LAYER 18.4
#define CURSE_LAYER 18.5
#define FULLSCREEN_PLANE 20
#define FLASH_LAYER 20
#define FULLSCREEN_LAYER 20.1
#define UI_DAMAGE_LAYER 20.2
#define BLIND_LAYER 20.3
#define CRIT_LAYER 20.4
#define CURSE_LAYER 20.5
#define HUD_PLANE 19
#define HUD_LAYER 19
#define ABOVE_HUD_PLANE 20
#define ABOVE_HUD_LAYER 20
#define HUD_PLANE 21
#define HUD_LAYER 21
#define ABOVE_HUD_PLANE 22
#define ABOVE_HUD_LAYER 22
#define SPLASHSCREEN_LAYER 21
#define SPLASHSCREEN_PLANE 21
#define SPLASHSCREEN_LAYER 23
#define SPLASHSCREEN_PLANE 23
+81 -31
View File
@@ -1,42 +1,92 @@
#define LIGHTING_FALLOFF 1 // type of falloff to use for lighting; 1 for circular, 2 for square
#define LIGHTING_LAMBERTIAN 0 // use lambertian shading for light sources
#define LIGHTING_HEIGHT 1 // height off the ground of light sources on the pseudo-z-axis, you should probably leave this alone
//Bay lighting engine shit, not in /code/modules/lighting because BYOND is being shit about it
#define LIGHTING_INTERVAL 5 // frequency, in 1/10ths of a second, of the lighting process
#define LIGHTING_ICON 'icons/effects/lighting_overlay.dmi' // icon used for lighting shading effects
#define MINIMUM_USEFUL_LIGHT_RANGE 1.4
#define LIGHTING_ROUND_VALUE (1 / 128) //Value used to round lumcounts, values smaller than 1/255 don't matter (if they do, thanks sinking points), greater values will make lighting less precise, but in turn increase performance, VERY SLIGHTLY.
#define LIGHTING_FALLOFF 1 // type of falloff to use for lighting; 1 for circular, 2 for square
#define LIGHTING_LAMBERTIAN 0 // use lambertian shading for light sources
#define LIGHTING_HEIGHT 1 // height off the ground of light sources on the pseudo-z-axis, you should probably leave this alone
#define LIGHTING_ROUND_VALUE (1 / 64) //Value used to round lumcounts, values smaller than 1/129 don't matter (if they do, thanks sinking points), greater values will make lighting less precise, but in turn increase performance, VERY SLIGHTLY.
#define LIGHTING_SOFT_THRESHOLD 0.05 // If the max of the lighting lumcounts of each spectrum drops below this, disable luminosity on the lighting overlays.
#define LIGHTING_ICON 'icons/effects/lighting_object.dmi' // icon used for lighting shading effects
// If the max of the lighting lumcounts of each spectrum drops below this, disable luminosity on the lighting objects.
// Set to zero to disable soft lighting. Luminosity changes then work if it's lit at all.
#define LIGHTING_SOFT_THRESHOLD 0
// If I were you I'd leave this alone.
#define LIGHTING_BASE_MATRIX \
list \
( \
LIGHTING_SOFT_THRESHOLD, LIGHTING_SOFT_THRESHOLD, LIGHTING_SOFT_THRESHOLD, 0, \
LIGHTING_SOFT_THRESHOLD, LIGHTING_SOFT_THRESHOLD, LIGHTING_SOFT_THRESHOLD, 0, \
LIGHTING_SOFT_THRESHOLD, LIGHTING_SOFT_THRESHOLD, LIGHTING_SOFT_THRESHOLD, 0, \
LIGHTING_SOFT_THRESHOLD, LIGHTING_SOFT_THRESHOLD, LIGHTING_SOFT_THRESHOLD, 0, \
1, 1, 1, 0, \
1, 1, 1, 0, \
1, 1, 1, 0, \
1, 1, 1, 0, \
0, 0, 0, 1 \
) \
// Helpers so we can (more easily) control the colour matrices.
#define CL_MATRIX_RR 1
#define CL_MATRIX_RG 2
#define CL_MATRIX_RB 3
#define CL_MATRIX_RA 4
#define CL_MATRIX_GR 5
#define CL_MATRIX_GG 6
#define CL_MATRIX_GB 7
#define CL_MATRIX_GA 8
#define CL_MATRIX_BR 9
#define CL_MATRIX_BG 10
#define CL_MATRIX_BB 11
#define CL_MATRIX_BA 12
#define CL_MATRIX_AR 13
#define CL_MATRIX_AG 14
#define CL_MATRIX_AB 15
#define CL_MATRIX_AA 16
#define CL_MATRIX_CR 17
#define CL_MATRIX_CG 18
#define CL_MATRIX_CB 19
#define CL_MATRIX_CA 20
//Some defines to generalise colours used in lighting.
//Important note on colors. Colors can end up significantly different from the basic html picture, especially when saturated
#define LIGHT_COLOR_WHITE "#FFFFFF"
#define LIGHT_COLOR_RED "#FA8282" //Warm but extremely diluted red. rgb(250, 130, 130)
#define LIGHT_COLOR_GREEN "#64C864" //Bright but quickly dissipating neon green. rgb(100, 200, 100)
#define LIGHT_COLOR_BLUE "#6496FA" //Cold, diluted blue. rgb(100, 150, 250)
#define LIGHT_COLOR_BLUEGREEN "#7DE1AF" //Light blueish green. rgb(125, 225, 175)
#define LIGHT_COLOR_CYAN "#7DE1E1" //Diluted cyan. rgb(125, 225, 225)
#define LIGHT_COLOR_LIGHT_CYAN "#40CEFF" //More-saturated cyan. rgb(64, 206, 255)
#define LIGHT_COLOR_DARK_BLUE "#6496FA" //Saturated blue. rgb(51, 117, 248)
#define LIGHT_COLOR_PINK "#E17DE1" //Diluted, mid-warmth pink. rgb(225, 125, 225)
#define LIGHT_COLOR_YELLOW "#E1E17D" //Dimmed yellow, leaning kaki. rgb(225, 225, 125)
#define LIGHT_COLOR_BROWN "#966432" //Clear brown, mostly dim. rgb(150, 100, 50)
#define LIGHT_COLOR_ORANGE "#FA9632" //Mostly pure orange. rgb(250, 150, 50)
#define LIGHT_COLOR_PURPLE "#952CF4" //Light Purple. rgb(149, 44, 244)
#define LIGHT_COLOR_LAVENDER "#9B51FF" //Less-saturated light purple. rgb(155, 81, 255)
#define LIGHT_COLOR_HOLY_MAGIC "#FFF743" //slightly desaturated bright yellow.
#define LIGHT_COLOR_BLOOD_MAGIC "#D00000" //deep crimson
#define LIGHT_COLOR_PURE_CYAN "#00FFFF"
#define LIGHT_COLOR_DARKRED "#A91515"
#define LIGHT_COLOR_PURE_RED "#FF0000"
#define LIGHT_COLOR_DARKGREEN "#50AB00"
#define LIGHT_COLOR_PURE_GREEN "#00FF00"
#define LIGHT_COLOR_LIGHTBLUE "#0099FF"
#define LIGHT_COLOR_DARKBLUE "#315AB4"
#define LIGHT_COLOR_PURE_BLUE "#0000FF"
#define LIGHT_COLOR_FADEDPURPLE "#A97FAA"
//These ones aren't a direct colour like the ones above, because nothing would fit
#define LIGHT_COLOR_FIRE "#FAA019" //Warm orange color, leaning strongly towards yellow. rgb(250, 160, 25)
#define LIGHT_COLOR_LAVA "#C48A18" //Very warm yellow, leaning slightly towards orange. rgb(196, 138, 24)
#define LIGHT_COLOR_FLARE "#FA644B" //Bright, non-saturated red. Leaning slightly towards pink for visibility. rgb(250, 100, 75)
#define LIGHT_COLOR_SLIME_LAMP "#AFC84B" //Weird color, between yellow and green, very slimy. rgb(175, 200, 75)
#define LIGHT_COLOR_TUNGSTEN "#FAE1AF" //Extremely diluted yellow, close to skin color (for some reason). rgb(250, 225, 175)
#define LIGHT_COLOR_HALOGEN "#F0FAFA" //Barely visible cyan-ish hue, as the doctor prescribed. rgb(240, 250, 250)
#define LIGHT_RANGE_FIRE 3 //How many tiles standard fires glow.
#define LIGHTING_PLANE_ALPHA_VISIBLE 255
#define LIGHTING_PLANE_ALPHA_NV_TRAIT 245
#define LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE 192
#define LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE 128 //For lighting alpha, small amounts lead to big changes. even at 128 its hard to figure out what is dark and what is light, at 64 you almost can't even tell.
#define LIGHTING_PLANE_ALPHA_INVISIBLE 0
//lighting area defines
#define DYNAMIC_LIGHTING_DISABLED 0 //dynamic lighting disabled (area stays at full brightness)
#define DYNAMIC_LIGHTING_ENABLED 1 //dynamic lighting enabled
#define DYNAMIC_LIGHTING_FORCED 2 //dynamic lighting enabled even if the area doesn't require power
#define DYNAMIC_LIGHTING_IFSTARLIGHT 3 //dynamic lighting enabled only if starlight is.
#define IS_DYNAMIC_LIGHTING(A) A.dynamic_lighting
//code assumes higher numbers override lower numbers.
#define LIGHTING_NO_UPDATE 0
#define LIGHTING_VIS_UPDATE 1
#define LIGHTING_CHECK_UPDATE 2
#define LIGHTING_FORCE_UPDATE 3
#define FLASH_LIGHT_DURATION 2
#define FLASH_LIGHT_POWER 3
#define FLASH_LIGHT_RANGE 3.8
+46 -61
View File
@@ -114,33 +114,6 @@
#define CHRISTMAS "Christmas"
#define FRIDAY_13TH "Friday the 13th"
//Light color defs, for light-emitting things
//Some defs may be pure color- this is for neatness, and configurability. Changing #define COLOR_ is a bad idea.
#define LIGHT_COLOR_CYAN "#7BF9FF"
#define LIGHT_COLOR_PURE_CYAN "#00FFFF"
#define LIGHT_COLOR_RED "#B40000"
#define LIGHT_COLOR_ORANGE "#FF9933"
#define LIGHT_COLOR_DARKRED "#A91515"
#define LIGHT_COLOR_PURE_RED "#FF0000"
#define LIGHT_COLOR_GREEN "#00CC00"
#define LIGHT_COLOR_DARKGREEN "#50AB00"
#define LIGHT_COLOR_PURE_GREEN "#00FF00"
#define LIGHT_COLOR_BLUE "#6496FA" //Cold, diluted blue. rgb(100, 150, 250)
#define LIGHT_COLOR_LIGHTBLUE "#0099FF"
#define LIGHT_COLOR_DARKBLUE "#315AB4"
#define LIGHT_COLOR_PURE_BLUE "#0000FF"
#define LIGHT_COLOR_FADEDPURPLE "#A97FAA"
#define LIGHT_COLOR_PURPLE "#CD00CD"
#define LIGHT_COLOR_PINK "#FF33CC"
#define LIGHT_COLOR_YELLOW "#E1E17D" //Dimmed yellow, leaning kaki. rgb(225, 225, 125)
#define LIGHT_COLOR_WHITE "#FFFFFF"
#define RESIZE_DEFAULT_SIZE 1
//transfer_ai() defines. Main proc in ai_core.dm
@@ -208,33 +181,34 @@
#define MFOAM_IRON 2
//Human Overlays Indexes/////////
#define BODY_LAYER 37
#define MUTANTRACE_LAYER 36
#define TAIL_UNDERLIMBS_LAYER 35 //Tail split-rendering.
#define LIMBS_LAYER 34
#define INTORGAN_LAYER 33
#define MARKINGS_LAYER 32
#define UNDERWEAR_LAYER 31
#define MUTATIONS_LAYER 30
#define H_DAMAGE_LAYER 29
#define UNIFORM_LAYER 28
#define ID_LAYER 27
#define SHOES_LAYER 26
#define GLOVES_LAYER 25
#define EARS_LAYER 24
#define SUIT_LAYER 23
#define BELT_LAYER 22 //Possible make this an overlay of somethign required to wear a belt?
#define SUIT_STORE_LAYER 21
#define BACK_LAYER 20
#define HEAD_ACCESSORY_LAYER 19
#define FHAIR_LAYER 18
#define GLASSES_LAYER 17
#define HAIR_LAYER 16 //TODO: make part of head layer?
#define HEAD_ACC_OVER_LAYER 15 //Select-layer rendering.
#define FHAIR_OVER_LAYER 14 //Select-layer rendering.
#define GLASSES_OVER_LAYER 13 //Select-layer rendering.
#define TAIL_LAYER 12 //bs12 specific. this hack is probably gonna come back to haunt me
#define FACEMASK_LAYER 11
#define BODY_LAYER 38
#define MUTANTRACE_LAYER 37
#define TAIL_UNDERLIMBS_LAYER 36 //Tail split-rendering.
#define LIMBS_LAYER 35
#define INTORGAN_LAYER 34
#define MARKINGS_LAYER 33
#define UNDERWEAR_LAYER 32
#define MUTATIONS_LAYER 31
#define H_DAMAGE_LAYER 30
#define UNIFORM_LAYER 29
#define ID_LAYER 28
#define SHOES_LAYER 27
#define GLOVES_LAYER 26
#define EARS_LAYER 25
#define SUIT_LAYER 24
#define BELT_LAYER 23 //Possible make this an overlay of somethign required to wear a belt?
#define SUIT_STORE_LAYER 22
#define BACK_LAYER 21
#define HEAD_ACCESSORY_LAYER 20
#define FHAIR_LAYER 19
#define GLASSES_LAYER 18
#define HAIR_LAYER 17 //TODO: make part of head layer?
#define HEAD_ACC_OVER_LAYER 16 //Select-layer rendering.
#define FHAIR_OVER_LAYER 15 //Select-layer rendering.
#define GLASSES_OVER_LAYER 14 //Select-layer rendering.
#define TAIL_LAYER 13 //bs12 specific. this hack is probably gonna come back to haunt me
#define FACEMASK_LAYER 12
#define OVER_MASK_LAYER 11 //Select-layer rendering.
#define HEAD_LAYER 10
#define COLLAR_LAYER 9
#define HANDCUFF_LAYER 8
@@ -245,7 +219,7 @@
#define FIRE_LAYER 3 //If you're on fire
#define MISC_LAYER 2
#define FROZEN_LAYER 1
#define TOTAL_LAYERS 37
#define TOTAL_LAYERS 38
///Access Region Codes///
#define REGION_ALL 0
@@ -303,7 +277,7 @@
#define TRIGGER_GUARD_NORMAL 1
// Macro to get the current elapsed round time, rather than total world runtime
#define ROUND_TIME (round_start_time ? (world.time - round_start_time) : 0)
#define ROUND_TIME (SSticker.round_start_time ? (world.time - SSticker.round_start_time) : 0)
// Macro that returns true if it's too early in a round to freely ghost out
#define TOO_EARLY_TO_GHOST (config && (ROUND_TIME < (config.round_abandon_penalty_period)))
@@ -318,10 +292,8 @@
#define SHELTER_DEPLOY_BAD_AREA "bad area"
#define SHELTER_DEPLOY_ANCHORED_OBJECTS "anchored objects"
// Client donator levels
#define DONATOR_LEVEL_NONE 0
#define DONATOR_LEVEL_ONE 1
#define DONATOR_LEVEL_TWO 2
// Maximum donation level
#define DONATOR_LEVEL_MAX 4
// The cooldown on OOC messages such as OOC, LOOC, praying and adminhelps
#define OOC_COOLDOWN 5
@@ -401,4 +373,17 @@
#define GHOST_ORBIT_TRIANGLE "triangle"
#define GHOST_ORBIT_HEXAGON "hexagon"
#define GHOST_ORBIT_SQUARE "square"
#define GHOST_ORBIT_PENTAGON "pentagon"
#define GHOST_ORBIT_PENTAGON "pentagon"
// Filters
#define FILTER_AMBIENT_OCCLUSION filter(type="drop_shadow", x=0, y=-2, size=4, border=4, color="#04080FAA")
//Fullscreen overlay resolution in tiles.
#define FULLSCREEN_OVERLAY_RESOLUTION_X 15
#define FULLSCREEN_OVERLAY_RESOLUTION_Y 15
//suit sensors: sensor_mode defines
#define SENSOR_OFF 0
#define SENSOR_LIVING 1
#define SENSOR_VITALS 2
#define SENSOR_COORDS 3
+7
View File
@@ -94,6 +94,13 @@
#define APPEARANCE_ALL_BODY APPEARANCE_ALL_HAIR|APPEARANCE_HEAD_ACCESSORY|APPEARANCE_MARKINGS|APPEARANCE_BODY_ACCESSORY|APPEARANCE_ALT_HEAD
#define APPEARANCE_ALL 32767
//If you add a new status, be sure to add a list for it to the simple_animals global in _globalvars/lists/mobs.dm
//Hostile Mob AI Status
#define AI_ON 1
#define AI_IDLE 2
#define AI_OFF 3
#define AI_Z_OFF 4
// Intents
#define INTENT_HELP "help"
#define INTENT_DISARM "disarm"
+4 -2
View File
@@ -29,10 +29,12 @@
#define UI_DARKMODE 131072
#define DISABLE_KARMA 262144
#define CHAT_NO_MENTORTICKETLOGS 524288
#define TYPING_ONCE 1048576
#define AMBIENT_OCCLUSION 2097152
#define TOGGLES_DEFAULT (CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_RADIO|CHAT_LOOC|MEMBER_PUBLIC|DONATOR_PUBLIC)
#define TOGGLES_TOTAL 4194303 // If you add or remove a preference toggle above, make sure you update this define with the total value of the toggles combined.
#define TOGGLES_DEFAULT (CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_RADIO|CHAT_LOOC|MEMBER_PUBLIC|DONATOR_PUBLIC|AMBIENT_OCCLUSION)
// Admin attack logs filter system, see /proc/add_attack_logs and /proc/msg_admin_attack
#define ATKLOG_ALL 0
-23
View File
@@ -1,23 +0,0 @@
#define SNPC_MAX_RANGE_FIND 32
#define SNPC_MIN_RANGE_FIND 16
#define SNPC_FUZZY_CHANCE_HIGH 85
#define SNPC_FUZZY_CHANCE_LOW 50
#define SNPC_CHANCE_TALK 15
#define SNPC_BRUTE 1
#define SNPC_STEALTH 2
#define SNPC_MARTYR 3
#define SNPC_PSYCHO 4
#define SNPC_INTERACTING 2
#define SNPC_TRAVEL 4
#define SNPC_FIGHTING 8
#define SNPC_SPECIAL 16
#define TRAIT_ROBUST 2
#define TRAIT_UNROBUST 4
#define TRAIT_SMART 8
#define TRAIT_DUMB 16
#define TRAIT_MEAN 32
#define TRAIT_FRIENDLY 64
#define TRAIT_THIEVING 128
+1 -1
View File
@@ -150,7 +150,7 @@
// A logging proc that only outputs after setup is done, to
// help devs test initialization stuff that happens a lot
/proc/log_after_setup(var/message)
if(ticker && ticker.current_state > GAME_STATE_SETTING_UP)
if(SSticker && SSticker.current_state > GAME_STATE_SETTING_UP)
to_chat(world, "<span class='danger'>[message]</span>")
log_world(message)
+1 -1
View File
@@ -114,7 +114,7 @@
return
if(QDELETED(A))
return
if((A.smooth & SMOOTH_TRUE) || (A.smooth & SMOOTH_MORE))
if(A.smooth & (SMOOTH_TRUE | SMOOTH_MORE))
var/adjacencies = calculate_adjacencies(A)
if(A.smooth & SMOOTH_DIAGONAL)
+185 -141
View File
@@ -634,170 +634,214 @@ The _flatIcons list is a cache for generated icon files.
*/
// Creates a single icon from a given /atom or /image. Only the first argument is required.
/proc/getFlatIcon(image/A, defdir=2, deficon=null, defstate="", defblend=BLEND_DEFAULT)
// We start with a blank canvas, otherwise some icon procs crash silently
var/icon/flat = icon('icons/effects/effects.dmi', "icon_state"="nothing") // Final flattened icon
if(!A)
return flat
if(A.alpha <= 0)
return flat
/proc/getFlatIcon(image/A, defdir, deficon, defstate, defblend, start = TRUE, no_anim = FALSE)
//Define... defines.
var/static/icon/flat_template = icon('icons/effects/effects.dmi', "nothing")
#define BLANK icon(flat_template)
#define SET_SELF(SETVAR) do { \
var/icon/SELF_ICON=icon(icon(curicon, curstate, base_icon_dir),"",SOUTH,no_anim?1:null); \
if(A.alpha<255) { \
SELF_ICON.Blend(rgb(255,255,255,A.alpha),ICON_MULTIPLY);\
} \
if(A.color) { \
if(islist(A.color)){ \
SELF_ICON.MapColors(arglist(A.color))} \
else{ \
SELF_ICON.Blend(A.color,ICON_MULTIPLY)} \
} \
##SETVAR=SELF_ICON;\
} while (0)
#define INDEX_X_LOW 1
#define INDEX_X_HIGH 2
#define INDEX_Y_LOW 3
#define INDEX_Y_HIGH 4
#define flatX1 flat_size[INDEX_X_LOW]
#define flatX2 flat_size[INDEX_X_HIGH]
#define flatY1 flat_size[INDEX_Y_LOW]
#define flatY2 flat_size[INDEX_Y_HIGH]
#define addX1 add_size[INDEX_X_LOW]
#define addX2 add_size[INDEX_X_HIGH]
#define addY1 add_size[INDEX_Y_LOW]
#define addY2 add_size[INDEX_Y_HIGH]
if(!A || A.alpha <= 0)
return BLANK
var/noIcon = FALSE
if(start)
if(!defdir)
defdir = A.dir
if(!deficon)
deficon = A.icon
if(!defstate)
defstate = A.icon_state
if(!defblend)
defblend = A.blend_mode
var/curicon
if(A.icon)
curicon = A.icon
else
curicon = deficon
var/curicon = A.icon || deficon
var/curstate = A.icon_state || defstate
if(!curicon)
noIcon = TRUE // Do not render this object.
var/curstate
if(A.icon_state)
curstate = A.icon_state
else
curstate = defstate
if(!noIcon && !(curstate in icon_states(curicon)))
if("" in icon_states(curicon))
curstate = ""
else
noIcon = TRUE // Do not render this object.
if(!((noIcon = (!curicon))))
var/curstates = icon_states(curicon)
if(!(curstate in curstates))
if("" in curstates)
curstate = ""
else
noIcon = TRUE // Do not render this object.
var/curdir
if(A.dir != 2)
curdir = A.dir
else
var/base_icon_dir //We'll use this to get the icon state to display if not null BUT NOT pass it to overlays as the dir we have
//These should use the parent's direction (most likely)
if(!A.dir || A.dir == SOUTH)
curdir = defdir
var/curblend
if(A.blend_mode == BLEND_DEFAULT)
curblend = defblend
else
curblend = A.blend_mode
curdir = A.dir
// Layers will be a sorted list of icons/overlays, based on the order in which they are displayed
var/list/layers = list()
var/image/copy
// Add the atom's icon itself, without pixel_x/y offsets.
if(!noIcon)
copy = image(icon=curicon, icon_state=curstate, layer=A.layer, dir=curdir)
copy.color = A.color
copy.alpha = A.alpha
copy.blend_mode = curblend
layers[copy] = A.layer
// Loop through the underlays, then overlays, sorting them into the layers list
var/list/process = A.underlays // Current list being processed
var/pSet=0 // Which list is being processed: 0 = underlays, 1 = overlays
var/curIndex=1 // index of 'current' in list being processed
var/current // Current overlay being sorted
var/currentLayer // Calculated layer that overlay appears on (special case for FLOAT_LAYER)
var/compare // The overlay 'add' is being compared against
var/cmpIndex // The index in the layers list of 'compare'
while(TRUE)
if(curIndex<=process.len)
current = process[curIndex]
if(!current)
curIndex++ //Skip this bad layer item
continue
currentLayer = current:layer
if(currentLayer<0) // Special case for FLY_LAYER
if(currentLayer <= -1000) return flat
if(pSet == 0) // Underlay
currentLayer = A.layer+currentLayer/1000
else // Overlay
currentLayer = A.layer+(1000+currentLayer)/1000
// Sort add into layers list
for(cmpIndex=1,cmpIndex<=layers.len,cmpIndex++)
compare = layers[cmpIndex]
if(currentLayer < layers[compare]) // Associated value is the calculated layer
layers.Insert(cmpIndex,current)
layers[current] = currentLayer
break
if(cmpIndex>layers.len) // Reached end of list without inserting
layers[current]=currentLayer // Place at end
curIndex++
if(curIndex>process.len)
if(pSet == 0) // Switch to overlays
curIndex = 1
pSet = 1
process = A.overlays
else // All done
//Try to remove/optimize this section ASAP, CPU hog.
//Determines if there's directionals.
if(!noIcon && curdir != SOUTH)
var/exist = FALSE
var/static/list/checkdirs = list(NORTH, EAST, WEST)
for(var/i in checkdirs) //Not using GLOB for a reason.
if(length(icon_states(icon(curicon, curstate, i))))
exist = TRUE
break
if(!exist)
base_icon_dir = SOUTH
//
var/icon/add // Icon of overlay being added
if(!base_icon_dir)
base_icon_dir = curdir
// Current dimensions of flattened icon
var/flatX1 = 1
var/flatX2 = flat.Width()
var/flatY1 = 1
var/flatY2 = flat.Height()
// Dimensions of overlay being added
var/addX1
var/addX2
var/addY1
var/addY2
ASSERT(!BLEND_DEFAULT) //I might just be stupid but lets make sure this define is 0.
for(var/I in layers)
var/curblend = A.blend_mode || defblend
if(I:alpha == 0)
continue
if(A.overlays.len || A.underlays.len)
var/icon/flat = BLANK
// Layers will be a sorted list of icons/overlays, based on the order in which they are displayed
var/list/layers = list()
var/image/copy
// Add the atom's icon itself, without pixel_x/y offsets.
if(!noIcon)
copy = image(icon=curicon, icon_state=curstate, layer=A.layer, dir=base_icon_dir)
copy.color = A.color
copy.alpha = A.alpha
copy.blend_mode = curblend
layers[copy] = A.layer
if(I == copy) // 'I' is an /image based on the object being flattened.
curblend = BLEND_OVERLAY
add = icon(I:icon, I:icon_state, I:dir)
// This checks for a silent failure mode of the icon routine. If the requested dir
// doesn't exist in this icon state it returns a 32x32 icon with 0 alpha.
if(I:dir != SOUTH && add.Width() == 32 && add.Height() == 32)
// Check every pixel for blank (computationally expensive, but the process is limited
// by the amount of film on the station, only happens when we hit something that's
// turned, and bails at the very first pixel it sees.
var/blankpixel;
for(var/y;y<=32;y++)
for(var/x;x<32;x++)
blankpixel = isnull(add.GetPixel(x,y))
if(!blankpixel)
break
if(!blankpixel)
// Loop through the underlays, then overlays, sorting them into the layers list
for(var/process_set in 0 to 1)
var/list/process = process_set? A.overlays : A.underlays
for(var/i in 1 to process.len)
var/image/current = process[i]
if(!current)
continue
if(current.plane != FLOAT_PLANE && current.plane != A.plane)
continue
var/current_layer = current.layer
if(current_layer < 0)
if(current_layer <= -1000)
return flat
current_layer = process_set + A.layer + current_layer / 1000
for(var/p in 1 to layers.len)
var/image/cmp = layers[p]
if(current_layer < layers[cmp])
layers.Insert(p, current)
break
// If we ALWAYS returned a null (which happens when GetPixel encounters something with alpha 0)
if(blankpixel)
// Pull the default direction.
add = icon(I:icon, I:icon_state)
else // 'I' is an appearance object.
add = getFlatIcon(new/image(I), curdir, curicon, curstate, curblend)
layers[current] = current_layer
// Find the new dimensions of the flat icon to fit the added overlay
addX1 = min(flatX1, I:pixel_x+1)
addX2 = max(flatX2, I:pixel_x+add.Width())
addY1 = min(flatY1, I:pixel_y+1)
addY2 = max(flatY2, I:pixel_y+add.Height())
//sortTim(layers, /proc/cmp_image_layer_asc)
if(addX1!=flatX1 || addX2!=flatX2 || addY1!=flatY1 || addY2!=flatY2)
// Resize the flattened icon so the new icon fits
flat.Crop(addX1-flatX1+1, addY1-flatY1+1, addX2-flatX1+1, addY2-flatY1+1)
flatX1=addX1;flatX2=addX2
flatY1=addY1;flatY2=addY2
var/icon/add // Icon of overlay being added
// Blend the overlay into the flattened icon
flat.Blend(add, blendMode2iconMode(curblend), I:pixel_x + 2 - flatX1, I:pixel_y + 2 - flatY1)
// Current dimensions of flattened icon
var/list/flat_size = list(1, flat.Width(), 1, flat.Height())
// Dimensions of overlay being added
var/list/add_size[4]
if(A.color)
flat.Blend(A.color, ICON_MULTIPLY)
if(A.alpha < 255)
flat.Blend(rgb(255, 255, 255, A.alpha), ICON_MULTIPLY)
for(var/V in layers)
var/image/I = V
if(I.alpha == 0)
continue
return icon(flat, "", SOUTH)
if(I == copy) // 'I' is an /image based on the object being flattened.
curblend = BLEND_OVERLAY
add = icon(I.icon, I.icon_state, base_icon_dir)
else // 'I' is an appearance object.
add = getFlatIcon(image(I), curdir, curicon, curstate, curblend, FALSE, no_anim)
if(!add)
continue
// Find the new dimensions of the flat icon to fit the added overlay
add_size = list(
min(flatX1, I.pixel_x+1),
max(flatX2, I.pixel_x+add.Width()),
min(flatY1, I.pixel_y+1),
max(flatY2, I.pixel_y+add.Height())
)
if(flat_size ~! add_size)
// Resize the flattened icon so the new icon fits
flat.Crop(
addX1 - flatX1 + 1,
addY1 - flatY1 + 1,
addX2 - flatX1 + 1,
addY2 - flatY1 + 1
)
flat_size = add_size.Copy()
// Blend the overlay into the flattened icon
flat.Blend(add, blendMode2iconMode(curblend), I.pixel_x + 2 - flatX1, I.pixel_y + 2 - flatY1)
if(A.color)
if(islist(A.color))
flat.MapColors(arglist(A.color))
else
flat.Blend(A.color, ICON_MULTIPLY)
if(A.alpha < 255)
flat.Blend(rgb(255, 255, 255, A.alpha), ICON_MULTIPLY)
if(no_anim)
//Clean up repeated frames
var/icon/cleaned = new /icon()
cleaned.Insert(flat, "", SOUTH, 1, 0)
. = cleaned
else
. = icon(flat, "", SOUTH)
else //There's no overlays.
if(!noIcon)
SET_SELF(.)
//Clear defines
#undef flatX1
#undef flatX2
#undef flatY1
#undef flatY2
#undef addX1
#undef addX2
#undef addY1
#undef addY2
#undef INDEX_X_LOW
#undef INDEX_X_HIGH
#undef INDEX_Y_LOW
#undef INDEX_Y_HIGH
#undef BLANK
#undef SET_SELF
/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.
for(var/I in A.overlays)//For every image in overlays. var/image/I will not work, don't try it.
if(I:layer>A.layer) continue//If layer is greater than what we need, skip it.
var/icon/image_overlay = new(I:icon,I:icon_state)//Blend only works with icon objects.
for(var/V in A.overlays)//For every image in overlays. var/image/I will not work, don't try it.
var/image/I = V
if(I.layer>A.layer)
continue//If layer is greater than what we need, skip it.
var/icon/image_overlay = new(I.icon,I.icon_state)//Blend only works with icon objects.
//Also, icons cannot directly set icon_state. Slower than changing variables but whatever.
alpha_mask.Blend(image_overlay,ICON_OR)//OR so they are lumped together in a nice overlay.
return alpha_mask//And now return the mask.
+11 -4
View File
@@ -124,9 +124,13 @@
. += A
//Like typesof() or subtypesof(), but returns a typecache instead of a list
/proc/typecacheof(path, ignore_root_path)
/proc/typecacheof(path, ignore_root_path, only_root_path = FALSE)
if(ispath(path))
var/list/types = ignore_root_path ? subtypesof(path) : typesof(path)
var/list/types = list()
if(only_root_path)
types = list(path)
else
types = ignore_root_path ? subtypesof(path) : typesof(path)
var/list/L = list()
for(var/T in types)
L[T] = TRUE
@@ -140,8 +144,11 @@
L[T] = TRUE
else
for(var/P in pathlist)
for(var/T in typesof(P))
L[T] = TRUE
if(only_root_path)
L[P] = TRUE
else
for(var/T in typesof(P))
L[T] = TRUE
return L
//Removes any null entries from the list
+2 -2
View File
@@ -112,8 +112,8 @@ var/syndicate_name = null
//Traitors and traitor silicons will get these. Revs will not.
var/syndicate_code_phrase//Code phrase for traitors.
var/syndicate_code_response//Code response for traitors.
GLOBAL_VAR(syndicate_code_phrase) //Code phrase for traitors.
GLOBAL_VAR(syndicate_code_response) //Code response for traitors.
/*
Should be expanded.
+2 -2
View File
@@ -35,7 +35,7 @@
* If you want to display the canonical station "time" (aka the in-character time of the station) use station_time_timestamp
*/
/proc/classic_worldtime2text(time = world.time)
time = (round_start_time ? (time - round_start_time) : (time - world.time))
time = (SSticker.round_start_time ? (time - SSticker.round_start_time) : (time - world.time))
return "[round(time / 36000)+12]:[(time / 600 % 60) < 10 ? add_zero(time / 600 % 60, 1) : time / 600 % 60]"
//Returns the world time in english
@@ -59,7 +59,7 @@
- You can use this, for example, to do "This will expire at [station_time_at(world.time + 500)]" to display a "station time" expiration date
which is much more useful for a player)*/
/proc/station_time(time=world.time, display_only=FALSE)
return ((((time - round_start_time)) + GLOB.gametime_offset) % 864000) - (display_only ? GLOB.timezoneOffset : 0)
return ((((time - SSticker.round_start_time)) + GLOB.gametime_offset) % 864000) - (display_only ? GLOB.timezoneOffset : 0)
/proc/station_time_timestamp(format = "hh:mm:ss", time=world.time)
return time2text(station_time(time, TRUE), format)
+14
View File
@@ -2029,3 +2029,17 @@ var/mob/dview/dview_mob = new
/proc/pass()
return
/proc/params2turf(scr_loc, turf/origin, client/C)
if(!scr_loc)
return null
var/tX = splittext(scr_loc, ",")
var/tY = splittext(tX[2], ":")
var/tZ = origin.z
tY = tY[1]
tX = splittext(tX[1], ":")
tX = tX[1]
var/list/actual_view = getviewsize(C ? C.view : world.view)
tX = Clamp(origin.x + text2num(tX) - round(actual_view[1] / 2) - 1, 1, world.maxx)
tY = Clamp(origin.y + text2num(tY) - round(actual_view[2] / 2) - 1, 1, world.maxy)
return locate(tX, tY, tZ)
+1 -2
View File
@@ -22,8 +22,7 @@ GLOBAL_LIST_INIT(living_mob_list, list()) //List of all alive mobs, including
GLOBAL_LIST_INIT(dead_mob_list, list()) //List of all dead mobs, including clientless. Excludes /mob/new_player
GLOBAL_LIST_INIT(respawnable_list, list()) //List of all mobs, dead or in mindless creatures that still be respawned.
GLOBAL_LIST_INIT(non_respawnable_keys, list()) //List of ckeys that are excluded from respawning for remainder of round.
GLOBAL_LIST_INIT(simple_animal_list, list()) //List of all simple animals, including clientless
GLOBAL_LIST_INIT(snpc_list, list()) //List of all snpc's, including clientless
GLOBAL_LIST_INIT(simple_animals, list(list(), list(), list(), list())) //One for each AI_* status define, List of all simple animals, including clientless
GLOBAL_LIST_INIT(bots_list, list()) //List of all bots(beepsky, medibots,etc)
GLOBAL_LIST_INIT(med_hud_users, list())
+4 -1
View File
@@ -83,4 +83,7 @@ GLOBAL_VAR_INIT(gametime_offset, 432000) // 12:00 in seconds
//printers shutdown if too much shit printed
var/copier_items_printed = 0
var/copier_max_items = 300
var/copier_items_printed_logged = FALSE
var/copier_items_printed_logged = FALSE
GLOBAL_VAR(map_name) // Self explanatory
+2 -3
View File
@@ -1,3 +1,2 @@
var/global/datum/datacore/data_core = null
var/map_name = "Unknown" //The name of the map that is loaded. Assigned in world/New()
// TODO: Move this to be not in its own fucking file all alone on its own
var/global/datum/datacore/data_core = null
+20 -2
View File
@@ -403,7 +403,25 @@
icon_state = "passage0"
plane = CLICKCATCHER_PLANE
mouse_opacity = MOUSE_OPACITY_OPAQUE
screen_loc = "CENTER-7,CENTER-7"
screen_loc = "CENTER"
#define MAX_SAFE_BYOND_ICON_SCALE_TILES (MAX_SAFE_BYOND_ICON_SCALE_PX / world.icon_size)
#define MAX_SAFE_BYOND_ICON_SCALE_PX (33 * 32) //Not using world.icon_size on purpose.
/obj/screen/click_catcher/proc/UpdateGreed(view_size_x = 15, view_size_y = 15)
var/icon/newicon = icon('icons/mob/screen_gen.dmi', "catcher")
var/ox = min(MAX_SAFE_BYOND_ICON_SCALE_TILES, view_size_x)
var/oy = min(MAX_SAFE_BYOND_ICON_SCALE_TILES, view_size_y)
var/px = view_size_x * world.icon_size
var/py = view_size_y * world.icon_size
var/sx = min(MAX_SAFE_BYOND_ICON_SCALE_PX, px)
var/sy = min(MAX_SAFE_BYOND_ICON_SCALE_PX, py)
newicon.Scale(sx, sy)
icon = newicon
screen_loc = "CENTER-[(ox-1)*0.5],CENTER-[(oy-1)*0.5]"
var/matrix/M = new
M.Scale(px/sx, py/sy)
transform = M
/obj/screen/click_catcher/Click(location, control, params)
var/list/modifiers = params2list(params)
@@ -411,6 +429,6 @@
var/mob/living/carbon/C = usr
C.swap_hand()
else
var/turf/T = screen_loc2turf(modifiers["screen-loc"], get_turf(usr))
var/turf/T = params2turf(modifiers["screen-loc"], get_turf(usr))
T.Click(location, control, params)
return 1
+3
View File
@@ -141,6 +141,9 @@
blobpwrdisplay.name = "blob power"
blobpwrdisplay.icon_state = "block"
blobpwrdisplay.screen_loc = ui_health
blobpwrdisplay.mouse_opacity = MOUSE_OPACITY_TRANSPARENT
blobpwrdisplay.layer = ABOVE_HUD_LAYER
blobpwrdisplay.plane = ABOVE_HUD_PLANE
static_inventory += blobpwrdisplay
blobhealthdisplay = new /obj/screen()
-2
View File
@@ -40,7 +40,6 @@
using.icon = ui_style
using.icon_state = "swap_1"
using.screen_loc = ui_swaphand1
using.layer = 19
static_inventory += using
using = new /obj/screen/swap_hand()
@@ -48,7 +47,6 @@
using.icon = ui_style
using.icon_state = "swap_2"
using.screen_loc = ui_swaphand2
using.layer = 19
static_inventory += using
mymob.zone_sel = new /obj/screen/zone_sel()
+62 -16
View File
@@ -2,23 +2,21 @@
var/list/screens = list()
/mob/proc/overlay_fullscreen(category, type, severity)
var/obj/screen/fullscreen/screen
if(screens[category])
screen = screens[category]
if(screen.type != type)
clear_fullscreen(category, FALSE)
return .()
else if(!severity || severity == screen.severity)
return null
else
screen = new type
var/obj/screen/fullscreen/screen = screens[category]
if (!screen || screen.type != type)
// needs to be recreated
clear_fullscreen(category, FALSE)
screens[category] = screen = new type()
else if ((!severity || severity == screen.severity) && (!client || screen.screen_loc != "CENTER-7,CENTER-7" || screen.view == client.view))
// doesn't need to be updated
return screen
screen.icon_state = "[initial(screen.icon_state)][severity]"
screen.severity = severity
screens[category] = screen
if(client)
if (client && screen.should_show_to(src))
screen.update_for_view(client.view)
client.screen += screen
return screen
/mob/proc/clear_fullscreen(category, animated = 10)
@@ -45,17 +43,38 @@
clear_fullscreen(category)
/datum/hud/proc/reload_fullscreen()
var/list/screens = mymob.screens
for(var/category in screens)
mymob.client.screen |= screens[category]
if(mymob.client)
var/obj/screen/fullscreen/screen
var/list/screens = mymob.screens
for(var/category in screens)
screen = screens[category]
if(screen.should_show_to(mymob))
screen.update_for_view(mymob.client.view)
mymob.client.screen |= screen
else
mymob.client.screen -= screen
/obj/screen/fullscreen
icon = 'icons/mob/screen_full.dmi'
icon_state = "default"
screen_loc = "CENTER-7,CENTER-7"
layer = FULLSCREEN_LAYER
plane = FULLSCREEN_PLANE
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
var/view = 7
var/severity = 0
var/show_when_dead = FALSE
/obj/screen/fullscreen/proc/update_for_view(client_view)
if (screen_loc == "CENTER-7,CENTER-7" && view != client_view)
var/list/actualview = getviewsize(client_view)
view = client_view
transform = matrix(actualview[1]/FULLSCREEN_OVERLAY_RESOLUTION_X, 0, 0, 0, actualview[2]/FULLSCREEN_OVERLAY_RESOLUTION_Y, 0)
/obj/screen/fullscreen/proc/should_show_to(mob/mymob)
if(!show_when_dead && mymob.stat == DEAD)
return FALSE
return TRUE
/obj/screen/fullscreen/Destroy()
severity = 0
@@ -100,6 +119,33 @@
screen_loc = "WEST,SOUTH to EAST,NORTH"
icon_state = "druggy"
/obj/screen/fullscreen/lighting_backdrop
icon = 'icons/mob/screen_gen.dmi'
icon_state = "flash"
transform = matrix(200, 0, 0, 0, 200, 0)
plane = LIGHTING_PLANE
blend_mode = BLEND_OVERLAY
show_when_dead = TRUE
//Provides darkness to the back of the lighting plane
/obj/screen/fullscreen/lighting_backdrop/lit
invisibility = INVISIBILITY_LIGHTING
layer = BACKGROUND_LAYER+21
color = "#000"
show_when_dead = TRUE
//Provides whiteness in case you don't see lights so everything is still visible
/obj/screen/fullscreen/lighting_backdrop/unlit
layer = BACKGROUND_LAYER+20
show_when_dead = TRUE
/obj/screen/fullscreen/see_through_darkness
icon_state = "nightvision"
plane = LIGHTING_PLANE
layer = LIGHTING_LAYER
blend_mode = BLEND_ADD
show_when_dead = TRUE
#undef FULLSCREEN_LAYER
#undef BLIND_LAYER
#undef CRIT_LAYER
+26 -4
View File
@@ -38,15 +38,23 @@
var/obj/screen/movable/action_button/hide_toggle/hide_actions_toggle
var/action_buttons_hidden = 0
var/list/obj/screen/plane_master/plane_masters = list() // see "appearance_flags" in the ref, assoc list of "[plane]" = object
/mob/proc/create_mob_hud()
if(client && !hud_used)
hud_used = new /datum/hud(src)
update_sight()
/datum/hud/New(mob/owner)
mymob = owner
hide_actions_toggle = new
hide_actions_toggle.InitialiseIcon(mymob)
for(var/mytype in subtypesof(/obj/screen/plane_master))
var/obj/screen/plane_master/instance = new mytype()
plane_masters["[instance.plane]"] = instance
instance.backdrop(mymob)
/datum/hud/Destroy()
if(mymob.hud_used == src)
mymob.hud_used = null
@@ -83,14 +91,16 @@
nightvisionicon = null
devilsouldisplay = null
QDEL_LIST_ASSOC_VAL(plane_masters)
mymob = null
return ..()
/datum/hud/proc/show_hud(version = 0)
if(!ismob(mymob))
return 0
return FALSE
if(!mymob.client)
return 0
return FALSE
mymob.client.screen = list()
@@ -162,13 +172,25 @@
mymob.update_action_buttons(1)
reorganize_alerts()
reload_fullscreen()
plane_masters_update()
/datum/hud/proc/plane_masters_update()
// Plane masters are always shown to OUR mob, never to observers
for(var/thing in plane_masters)
var/obj/screen/plane_master/PM = plane_masters[thing]
PM.backdrop(mymob)
mymob.client.screen += PM
/datum/hud/human/show_hud(version = 0)
..()
. = ..()
if(!.)
return
hidden_inventory_update()
/datum/hud/robot/show_hud(version = 0)
..()
. = ..()
if(!.)
return
update_robot_modules_display()
/datum/hud/proc/hidden_inventory_update()
+1
View File
@@ -83,6 +83,7 @@
/datum/hud/human/New(mob/living/carbon/human/owner, var/ui_style = 'icons/mob/screen_white.dmi', var/ui_color = "#ffffff", var/ui_alpha = 255)
..()
owner.overlay_fullscreen("see_through_darkness", /obj/screen/fullscreen/see_through_darkness)
var/obj/screen/using
var/obj/screen/inventory/inv_box
+1 -1
View File
@@ -1,7 +1,7 @@
/obj/screen/movable/pic_in_pic
name = "Picture-in-picture"
screen_loc = "CENTER"
plane = GAME_PLANE
plane = FLOOR_PLANE
var/atom/center
var/width = 0
var/height = 0
+53
View File
@@ -0,0 +1,53 @@
/obj/screen/plane_master
screen_loc = "CENTER"
icon_state = "blank"
appearance_flags = PLANE_MASTER|NO_CLIENT_COLOR
blend_mode = BLEND_OVERLAY
var/show_alpha = 255
var/hide_alpha = 0
/obj/screen/plane_master/proc/Show(override)
alpha = override || show_alpha
/obj/screen/plane_master/proc/Hide(override)
alpha = override || hide_alpha
/obj/screen/plane_master/proc/outline(_size, _color)
filters += filter(type = "outline", size = _size, color = _color)
/obj/screen/plane_master/proc/shadow(_size, _border, _offset = 0, _x = 0, _y = 0, _color = "#04080FAA")
filters += filter(type = "drop_shadow", x = _x, y = _y, color = _color, size = _size, offset = _offset, border = _border)
/obj/screen/plane_master/proc/clear_filters()
filters = list()
//Why do plane masters need a backdrop sometimes? Read http://www.byond.com/forum/?post=2141928
//Trust me, you need one. Period. If you don't think you do, you're doing something extremely wrong.
/obj/screen/plane_master/proc/backdrop(mob/mymob)
/obj/screen/plane_master/floor
name = "floor plane master"
plane = FLOOR_PLANE
appearance_flags = PLANE_MASTER
blend_mode = BLEND_OVERLAY
/obj/screen/plane_master/game_world
name = "game world plane master"
plane = GAME_PLANE
appearance_flags = PLANE_MASTER //should use client color
blend_mode = BLEND_OVERLAY
/obj/screen/plane_master/game_world/backdrop(mob/mymob)
clear_filters()
if(istype(mymob) && mymob.client && mymob.client.prefs && (mymob.client.prefs.toggles & AMBIENT_OCCLUSION))
filters += FILTER_AMBIENT_OCCLUSION
/obj/screen/plane_master/lighting
name = "lighting plane master"
plane = LIGHTING_PLANE
blend_mode = BLEND_MULTIPLY
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
/obj/screen/plane_master/lighting/backdrop(mob/mymob)
mymob.overlay_fullscreen("lighting_backdrop_lit", /obj/screen/fullscreen/lighting_backdrop/lit)
mymob.overlay_fullscreen("lighting_backdrop_unlit", /obj/screen/fullscreen/lighting_backdrop/unlit)
+2 -2
View File
@@ -226,8 +226,8 @@
A.screen_loc = "CENTER[x]:16,SOUTH+[y]:7"
else
A.screen_loc = "CENTER+[x]:16,SOUTH+[y]:7"
A.layer = 20
A.plane = HUD_PLANE
A.layer = ABOVE_HUD_LAYER
A.plane = ABOVE_HUD_PLANE
x++
if(x == 4)
+5 -6
View File
@@ -9,9 +9,10 @@
/obj/screen
name = ""
icon = 'icons/mob/screen_gen.dmi'
layer = HUD_LAYER_SCREEN
layer = HUD_LAYER
plane = HUD_PLANE
unacidable = 1
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF
unacidable = TRUE
var/obj/master = null //A reference to the object in the slot. Grabs or items, generally.
var/datum/hud/hud = null
appearance_flags = NO_CLIENT_COLOR
@@ -36,6 +37,8 @@
/obj/screen/close
name = "close"
layer = ABOVE_HUD_LAYER
plane = ABOVE_HUD_PLANE
/obj/screen/close/Click()
if(master)
@@ -47,7 +50,6 @@
/obj/screen/drop
name = "drop"
icon_state = "act_drop"
layer = 19
/obj/screen/drop/Click()
usr.drop_item_v()
@@ -143,7 +145,6 @@
name = "resist"
icon = 'icons/mob/screen_midnight.dmi'
icon_state = "act_resist"
layer = 19
/obj/screen/resist/Click()
if(isliving(usr))
@@ -327,7 +328,6 @@
/obj/screen/inventory
var/slot_id //The indentifier for the slot. It has nothing to do with ID cards.
var/list/object_overlays = list()
layer = 19
/obj/screen/inventory/MouseEntered()
..()
@@ -417,7 +417,6 @@
return 1
/obj/screen/swap_hand
layer = 19
name = "swap hand"
/obj/screen/swap_hand/Click()
+2 -2
View File
@@ -65,8 +65,8 @@ var/const/tk_maxrange = 15
flags = NOBLUDGEON | ABSTRACT | DROPDEL
//item_state = null
w_class = WEIGHT_CLASS_GIGANTIC
layer = 20
plane = HUD_PLANE
layer = ABOVE_HUD_LAYER
plane = ABOVE_HUD_PLANE
var/last_throw = 0
var/atom/movable/focus = null
-98
View File
@@ -1,98 +0,0 @@
/var/lighting_overlays_initialised = FALSE
/var/list/lighting_update_lights = list() // List of lighting sources queued for update.
/var/list/lighting_update_corners = list() // List of lighting corners queued for update.
/var/list/lighting_update_overlays = list() // List of lighting overlays queued for update.
/var/list/lighting_update_lights_old = list() // List of lighting sources currently being updated.
/var/list/lighting_update_corners_old = list() // List of lighting corners currently being updated.
/var/list/lighting_update_overlays_old = list() // List of lighting overlays currently being updated.
/datum/controller/process/lighting
// Queues of update counts, waiting to be rolled into stats lists
var/list/stats_queues = list(
"Source" = list(), "Corner" = list(), "Overlay" = list())
// Stats lists
var/list/stats_lists = list(
"Source" = list(), "Corner" = list(), "Overlay" = list())
var/update_stats_every = (1 SECONDS)
var/next_stats_update = 0
var/stat_updates_to_keep = 5
/datum/controller/process/lighting/setup()
name = "lighting"
schedule_interval = 0 // run as fast as you possibly can
sleep_interval = 10 // Yield every 10% of a tick
defer_usage = 80 // Defer at 80% of a tick
create_all_lighting_overlays()
lighting_overlays_initialised = TRUE
// Pre-process lighting once before the round starts. Wait 30 seconds so the away mission has time to load.
spawn(300)
doWork(1)
/datum/controller/process/lighting/doWork(roundstart)
lighting_update_lights_old = lighting_update_lights //We use a different list so any additions to the update lists during a delay from scheck() don't cause things to be cut from the list without being updated.
lighting_update_lights = list()
for(var/datum/light_source/L in lighting_update_lights_old)
if(L.check() || L.destroyed || L.force_update)
L.remove_lum()
if(!L.destroyed)
L.apply_lum()
else if(L.vis_update) //We smartly update only tiles that became (in) visible to use.
L.smart_vis_update()
L.vis_update = FALSE
L.force_update = FALSE
L.needs_update = FALSE
SCHECK
lighting_update_corners_old = lighting_update_corners //Same as above.
lighting_update_corners = list()
for(var/A in lighting_update_corners_old)
var/datum/lighting_corner/C = A
C.update_overlays()
C.needs_update = FALSE
SCHECK
lighting_update_overlays_old = lighting_update_overlays //Same as above.
lighting_update_overlays = list()
for(var/A in lighting_update_overlays_old)
var/atom/movable/lighting_overlay/O = A
O.update_overlay()
O.needs_update = 0
SCHECK
stats_queues["Source"] += lighting_update_lights_old.len
stats_queues["Corner"] += lighting_update_corners_old.len
stats_queues["Overlay"] += lighting_update_overlays_old.len
if(next_stats_update <= world.time)
next_stats_update = world.time + update_stats_every
for(var/stat_name in stats_queues)
var/stat_sum = 0
var/list/stats_queue = stats_queues[stat_name]
for(var/count in stats_queue)
stat_sum += count
stats_queue.Cut()
var/list/stats_list = stats_lists[stat_name]
stats_list.Insert(1, stat_sum)
if(stats_list.len > stat_updates_to_keep)
stats_list.Cut(stats_list.len)
/datum/controller/process/lighting/statProcess()
..()
stat(null, "[total_lighting_sources] sources, [total_lighting_corners] corners, [total_lighting_overlays] overlays")
for(var/stat_type in stats_lists)
stat(null, "[stat_type] updates: [jointext(stats_lists[stat_type], " | ")]")
-41
View File
@@ -1,41 +0,0 @@
var/global/datum/controller/process/npcai/npcai_master
/datum/controller/process/npcai
var/current_cycle
/datum/controller/process/npcai/setup()
name = "npc ai"
schedule_interval = 20 // every 2 seconds
start_delay = 16
log_startup_progress("NPC ticker starting up.")
/datum/controller/process/npcai/started()
..()
if(!GLOB.simple_animal_list)
GLOB.simple_animal_list = list()
if(!GLOB.snpc_list)
GLOB.snpc_list = list()
/datum/controller/process/npcai/statProcess()
..()
stat(null, "[GLOB.simple_animal_list.len] simple animals")
stat(null, "[GLOB.snpc_list.len] SNPC's")
/datum/controller/process/npcai/doWork()
for(last_object in GLOB.simple_animal_list)
var/mob/living/simple_animal/M = last_object
if(istype(M) && !QDELETED(M))
if(!M.client && M.stat == CONSCIOUS)
try
M.process_ai()
catch(var/exception/e)
catchException(e, M)
SCHECK
else
catchBadType(M)
GLOB.simple_animal_list -= M
current_cycle++
DECLARE_GLOBAL_CONTROLLER(npcai, npcai_master)
-36
View File
@@ -1,36 +0,0 @@
var/global/datum/controller/process/ticker/tickerProcess
/datum/controller/process/ticker
var/lastTickerTimeDuration
var/lastTickerTime
/datum/controller/process/ticker/setup()
name = "ticker"
schedule_interval = 20 // every 2 seconds
lastTickerTime = world.timeofday
log_startup_progress("Time ticker starting up.")
if(!ticker)
ticker = new
spawn(0)
if(ticker)
ticker.pregame()
DECLARE_GLOBAL_CONTROLLER(ticker, tickerProcess)
/datum/controller/process/ticker/doWork()
var/currentTime = world.timeofday
if(currentTime < lastTickerTime) // check for midnight rollover
lastTickerTimeDuration = (currentTime - (lastTickerTime - TICKS_IN_DAY)) / TICKS_IN_SECOND
else
lastTickerTimeDuration = (currentTime - lastTickerTime) / TICKS_IN_SECOND
lastTickerTime = currentTime
ticker.process_decrepit()
/datum/controller/process/ticker/proc/getLastTickerTimeDuration()
return lastTickerTimeDuration
+2 -3
View File
@@ -605,8 +605,7 @@
config.event_delay_upper[EVENT_LEVEL_MAJOR] = MinutesToTicks(values[3])
if("starlight")
var/vvalue = text2num(value)
config.starlight = vvalue >= 0 ? vvalue : 0
config.starlight = 1
if("player_reroute_cap")
var/vvalue = text2num(value)
@@ -787,7 +786,7 @@
config.sql_enabled = 0
log_config("WARNING: DB_CONFIG DEFINITION MISMATCH!")
spawn(60)
if(ticker.current_state == GAME_STATE_PREGAME)
if(SSticker.current_state == GAME_STATE_PREGAME)
going = 0
spawn(600)
to_chat(world, "<span class='alert'>DB_CONFIG MISMATCH, ROUND START DELAYED. <BR>Please check database version for recent upstream changes!</span>")
-111
View File
@@ -9,114 +9,3 @@
* Called in gameticker.dm when a round starts.
*/
/hook/roundstart
/**
* Roundend hook.
* Called in gameticker.dm when a round ends.
*/
/hook/roundend
/**
* LateSpawn hook.
* Called in newplayer.dm when a humanoid character joins the round after it started.
* Parameters: var/mob/living/carbon/human
*/
/hook/latespawn
/**
* Death hook.
* Called in death.dm when someone dies.
* Parameters: var/mob/living/carbon/human, var/gibbed
*/
/hook/death
/**
* Cloning hook.
* Called in cloning.dm when someone is brought back by the wonders of modern science.
* Parameters: var/mob/living/carbon/human
*/
/hook/clone
/**
* Debrained hook.
* Called in brain_item.dm when someone gets debrained.
* Parameters: var/obj/item/brain
*/
/hook/debrain
/**
* Borged hook.
* Called in robot_parts.dm when someone gets turned into a cyborg.
* Parameters: var/mob/living/silicon/robot
*/
/hook/borgify
/**
* Podman hook.
* Called in podmen.dm when someone is brought back as a Diona.
* Parameters: var/mob/living/carbon/primitive/diona
*/
/hook/harvest_podman
/**
* Payroll revoked hook.
* Called in Accounts_DB.dm when someone's payroll is stolen at the Accounts terminal.
* Parameters: var/datum/money_account
*/
/hook/revoke_payroll
/**
* Account suspension hook.
* Called in Accounts_DB.dm when someone's account is suspended or unsuspended at the Accounts terminal.
* Parameters: var/datum/money_account
*/
/hook/change_account_status
/**
* Employee reassignment hook.
* Called in card.dm when someone's card is reassigned at the HoP's desk.
* Parameters: var/obj/item/card/id
*/
/hook/reassign_employee
/**
* Employee terminated hook.
* Called in card.dm when someone's card is terminated at the HoP's desk.
* Parameters: var/obj/item/card/id
*/
/hook/terminate_employee
/**
* Crate sold hook.
* Called in supplyshuttle.dm when a crate is sold on the shuttle.
* Parameters: var/obj/structure/closet/crate/sold, var/area/shuttle
*/
/hook/sell_crate
/**
* Captain spawned hook.
* Called in supervisor.dm when a captain spawns
* Parameters: var/mob/living/carbon/human/captain
*/
/hook/captain_spawned
/**
* Mob login hook.
* Called in login.dm when a player logs in to a mob.
* Parameters: var/client/client, var/mob/mob
*/
/hook/mob_login
/**
* Mob logout hook.
* Called in logout.dm when a player logs out of a mob.
* Parameters: var/client/client, var/mob/mob
*/
/hook/mob_logout
/**
* Mob area change hook.
* Called in area.dm when a mob moves from one area to another.
* Parameters: var/mob/mob, var/area/newarea, var/area/oldarea
*/
/hook/mob_area_change
+2 -2
View File
@@ -194,8 +194,8 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
to_chat(world, "<span class='boldannounce'>[msg]</span>")
log_world(msg)
if(config.developer_express_start & ticker.current_state == GAME_STATE_PREGAME)
ticker.current_state = GAME_STATE_SETTING_UP
if(config.developer_express_start & SSticker.current_state == GAME_STATE_PREGAME)
SSticker.current_state = GAME_STATE_SETTING_UP
if(!current_runlevel)
SetRunLevel(1)
+41
View File
@@ -0,0 +1,41 @@
SUBSYSTEM_DEF(idlenpcpool)
name = "Idling NPC Pool"
flags = SS_POST_FIRE_TIMING|SS_BACKGROUND
priority = FIRE_PRIORITY_IDLE_NPC
wait = 60
runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
var/list/currentrun = list()
var/static/list/idle_mobs_by_zlevel[][]
/datum/controller/subsystem/idlenpcpool/stat_entry()
var/list/idlelist = GLOB.simple_animals[AI_IDLE]
var/list/zlist = GLOB.simple_animals[AI_Z_OFF]
..("IdleNPCS:[idlelist.len]|Z:[zlist.len]")
/datum/controller/subsystem/idlenpcpool/Initialize(start_timeofday)
idle_mobs_by_zlevel = new /list(world.maxz,0)
return ..()
/datum/controller/subsystem/idlenpcpool/fire(resumed = FALSE)
if(!resumed)
var/list/idlelist = GLOB.simple_animals[AI_IDLE]
src.currentrun = idlelist.Copy()
//cache for sanic speed (lists are references anyways)
var/list/currentrun = src.currentrun
while(currentrun.len)
var/mob/living/simple_animal/SA = currentrun[currentrun.len]
--currentrun.len
if(!SA)
GLOB.simple_animals[AI_IDLE] -= SA
continue
if(!SA.ckey)
if(SA.stat != DEAD)
SA.handle_automated_movement()
if(SA.stat != DEAD)
SA.consider_wakeup()
if(MC_TICK_CHECK)
return
+12 -5
View File
@@ -1,7 +1,8 @@
SUBSYSTEM_DEF(jobs)
name = "Jobs"
init_order = INIT_ORDER_JOBS // 12
flags = SS_NO_FIRE
wait = 3000 // 5 minutes (Deciseconds)
runlevels = RUNLEVEL_GAME
//List of all jobs
var/list/occupations = list()
@@ -21,6 +22,12 @@ SUBSYSTEM_DEF(jobs)
LoadJobs("config/jobs.txt")
return ..()
// Only fires every 5 minutes
/datum/controller/subsystem/jobs/fire()
if(!config.sql_enabled || !config.use_exp_tracking)
return
update_exp(5,0)
/datum/controller/subsystem/jobs/proc/SetupOccupations(var/list/faction = list("Station"))
occupations = list()
var/list/all_jobs = subtypesof(/datum/job)
@@ -270,9 +277,9 @@ SUBSYSTEM_DEF(jobs)
SetupOccupations()
//Holder for Triumvirate is stored in the ticker, this just processes it
if(ticker)
if(SSticker)
for(var/datum/job/ai/A in occupations)
if(ticker.triai)
if(SSticker.triai)
A.spawn_positions = 3
//Get the players who are ready
@@ -473,10 +480,10 @@ SUBSYSTEM_DEF(jobs)
T = S.loc
if(T)
H.loc = T
H.forceMove(T)
// Moving wheelchair if they have one
if(H.buckled && istype(H.buckled, /obj/structure/chair/wheelchair))
H.buckled.loc = H.loc
H.buckled.forceMove(H.loc)
H.buckled.dir = H.dir
if(job)
+87
View File
@@ -0,0 +1,87 @@
GLOBAL_LIST_EMPTY(lighting_update_lights) // List of lighting sources queued for update.
GLOBAL_LIST_EMPTY(lighting_update_corners) // List of lighting corners queued for update.
GLOBAL_LIST_EMPTY(lighting_update_objects) // List of lighting objects queued for update.
SUBSYSTEM_DEF(lighting)
name = "Lighting"
wait = 2
init_order = INIT_ORDER_LIGHTING
flags = SS_TICKER
/datum/controller/subsystem/lighting/stat_entry()
..("L:[GLOB.lighting_update_lights.len]|C:[GLOB.lighting_update_corners.len]|O:[GLOB.lighting_update_objects.len]")
/datum/controller/subsystem/lighting/Initialize(timeofday)
if(!initialized)
if(config.starlight)
for(var/I in GLOB.all_areas)
var/area/A = I
if(A.dynamic_lighting == DYNAMIC_LIGHTING_IFSTARLIGHT)
A.luminosity = 0
create_all_lighting_objects()
initialized = TRUE
fire(FALSE, TRUE)
return ..()
/datum/controller/subsystem/lighting/fire(resumed, init_tick_checks)
MC_SPLIT_TICK_INIT(3)
if(!init_tick_checks)
MC_SPLIT_TICK
var/i = 0
for(i in 1 to GLOB.lighting_update_lights.len)
var/datum/light_source/L = GLOB.lighting_update_lights[i]
L.update_corners()
L.needs_update = LIGHTING_NO_UPDATE
if(init_tick_checks)
CHECK_TICK
else if(MC_TICK_CHECK)
break
if(i)
GLOB.lighting_update_lights.Cut(1, i+1)
i = 0
if(!init_tick_checks)
MC_SPLIT_TICK
for (i in 1 to GLOB.lighting_update_corners.len)
var/datum/lighting_corner/C = GLOB.lighting_update_corners[i]
C.update_objects()
C.needs_update = FALSE
if(init_tick_checks)
CHECK_TICK
else if(MC_TICK_CHECK)
break
if(i)
GLOB.lighting_update_corners.Cut(1, i+1)
i = 0
if(!init_tick_checks)
MC_SPLIT_TICK
for (i in 1 to GLOB.lighting_update_objects.len)
var/atom/movable/lighting_object/O = GLOB.lighting_update_objects[i]
if(QDELETED(O))
continue
O.update()
O.needs_update = FALSE
if(init_tick_checks)
CHECK_TICK
else if(MC_TICK_CHECK)
break
if(i)
GLOB.lighting_update_objects.Cut(1, i+1)
/datum/controller/subsystem/lighting/Recover()
initialized = SSlighting.initialized
..()

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