From cda93af6431b2c2f9bb17ef7db6a741eb967c15b Mon Sep 17 00:00:00 2001 From: Putnam Date: Sat, 29 Aug 2020 01:41:42 -0700 Subject: [PATCH 01/17] Fixes dynamic... again. --- .../gamemodes/dynamic/dynamic_storytellers.dm | 54 ++++++++++--------- 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/code/game/gamemodes/dynamic/dynamic_storytellers.dm b/code/game/gamemodes/dynamic/dynamic_storytellers.dm index 148de9568a..21178baa12 100644 --- a/code/game/gamemodes/dynamic/dynamic_storytellers.dm +++ b/code/game/gamemodes/dynamic/dynamic_storytellers.dm @@ -126,8 +126,9 @@ Property weights are: for(var/property in property_weights) if(property in rule.property_weights) // just treat it as 0 if it's not in there property_weight += rule.property_weights[property] * property_weights[property] - if(property_weight > 0) - drafted_rules[rule] = rule.get_weight() * property_weight * rule.weight_mult + var/calced_weight = (rule.get_weight() + property_weight) * rule.weight_mult + if(calced_weight > 0) // negatives in the list might cause problems + drafted_rules[rule] = calced_weight return drafted_rules /datum/dynamic_storyteller/proc/midround_draft() @@ -144,21 +145,22 @@ Property weights are: for(var/property in property_weights) if(property in rule.property_weights) // just treat it as 0 if it's not in there property_weight += rule.property_weights[property] * property_weights[property] - if(property_weight > 0) - var/threat_weight = 1 - if(!(rule.flags & TRAITOR_RULESET) || (rule.flags & MINOR_RULESET)) // makes the traitor rulesets always possible anyway - var/cost_difference = abs(rule.cost-(mode.threat_level-mode.threat)) - /* Basically, the closer the cost is to the current threat-level-away-from-threat, the more likely it is to - pick this particular ruleset. - Let's use a toy example: there's 60 threat level and 10 threat spent. - We want to pick a ruleset that's close to that, so we run the below equation, on two rulesets. - Ruleset 1 has 30 cost, ruleset 2 has 5 cost. - When we do the math, ruleset 1's threat_weight is 0.538, and ruleset 2's is 0.238, meaning ruleset 1 - is 2.26 times as likely to be picked, all other things considered. - Of course, we don't want it to GUARANTEE the closest, that's no fun, so it's just a weight. - */ - threat_weight = abs(1-abs(1-LOGISTIC_FUNCTION(2,0.05,cost_difference,0))) - drafted_rules[rule] = rule.get_weight() * property_weight * rule.weight_mult * threat_weight + var/threat_weight = 1 + if(!(rule.flags & TRAITOR_RULESET) || (rule.flags & MINOR_RULESET)) // makes the traitor rulesets always possible anyway + var/cost_difference = abs(rule.cost-(mode.threat_level-mode.threat)) + /* Basically, the closer the cost is to the current threat-level-away-from-threat, the more likely it is to + pick this particular ruleset. + Let's use a toy example: there's 60 threat level and 10 threat spent. + We want to pick a ruleset that's close to that, so we run the below equation, on two rulesets. + Ruleset 1 has 30 cost, ruleset 2 has 5 cost. + When we do the math, ruleset 1's threat_weight is 0.538, and ruleset 2's is 0.238, meaning ruleset 1 + is 2.26 times as likely to be picked, all other things considered. + Of course, we don't want it to GUARANTEE the closest, that's no fun, so it's just a weight. + */ + threat_weight = abs(1-abs(1-LOGISTIC_FUNCTION(2,0.05,cost_difference,0))) + var/calced_weight = (rule.get_weight() + property_weight) * rule.weight_mult * threat_weight + if(calced_weight > 0) + drafted_rules[rule] = calced_weight return drafted_rules /datum/dynamic_storyteller/proc/latejoin_draft(mob/living/carbon/human/newPlayer) @@ -180,12 +182,13 @@ Property weights are: for(var/property in property_weights) if(property in rule.property_weights) property_weight += rule.property_weights[property] * property_weights[property] - if(property_weight > 0) - var/threat_weight = 1 - if(!(rule.flags & TRAITOR_RULESET) || (rule.flags & MINOR_RULESET)) - var/cost_difference = abs(rule.cost-(mode.threat_level-mode.threat)) - threat_weight = 1-abs(1-(LOGISTIC_FUNCTION(2,0.05,cost_difference,0))) - drafted_rules[rule] = rule.get_weight() * property_weight * rule.weight_mult * threat_weight + var/threat_weight = 1 + if(!(rule.flags & TRAITOR_RULESET) || (rule.flags & MINOR_RULESET)) + var/cost_difference = abs(rule.cost-(mode.threat_level-mode.threat)) + threat_weight = 1-abs(1-(LOGISTIC_FUNCTION(2,0.05,cost_difference,0))) + var/calced_weight = (rule.get_weight() + property_weight) * rule.weight_mult * threat_weight + if(calced_weight > 0) + drafted_rules[rule] = calced_weight return drafted_rules /datum/dynamic_storyteller/proc/event_draft() @@ -196,8 +199,9 @@ Property weights are: for(var/property in property_weights) if(property in rule.property_weights) property_weight += rule.property_weights[property] * property_weights[property] - if(property_weight > 0) - drafted_rules[rule] = rule.get_weight() + property_weight * rule.weight_mult + var/calced_weight = (rule.get_weight() + property_weight) * rule.weight_mult + if(calced_weight > 0) + drafted_rules[rule] = calced_weight return drafted_rules From 126ebf1f5e08194763817c739bcb9a71b2f89161 Mon Sep 17 00:00:00 2001 From: Putnam Date: Sat, 29 Aug 2020 01:50:22 -0700 Subject: [PATCH 02/17] Update dynamic_storytellers.dm --- code/game/gamemodes/dynamic/dynamic_storytellers.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/dynamic/dynamic_storytellers.dm b/code/game/gamemodes/dynamic/dynamic_storytellers.dm index 21178baa12..ba87342679 100644 --- a/code/game/gamemodes/dynamic/dynamic_storytellers.dm +++ b/code/game/gamemodes/dynamic/dynamic_storytellers.dm @@ -22,14 +22,14 @@ var/datum/game_mode/dynamic/mode = null // Cached as soon as it's made, by dynamic. /** -Property weights are: +Property weights are added to the config weight of the ruleset. They are: "story_potential" -- essentially how many different ways the antag can be played. "trust" -- How much it makes the crew trust each other. Negative values means they're suspicious. Team antags are like this. "chaos" -- How chaotic it makes the round. Has some overlap with "valid" and somewhat contradicts "extended". "valid" -- How likely the non-antag-enemy crew are to get involved, e.g. nukies encouraging the warden to let everyone into the armory, wizard moving around and being a nuisance, nightmare busting lights. "extended" -- How much the antag is conducive to a long round. Nukies and cults are bad for this; Wizard is less bad; and so on. -"conversion" -- Basically a bool. Conversion antags, well, convert. It's its own class for a good reason. +"conversion" -- Basically a bool. Conversion antags, well, convert. It's in its own class 'cause people kinda hate conversion. */ /datum/dynamic_storyteller/proc/start_injection_cooldowns() From 20cd9f0862a05603ea503dd87c2994391a94eea6 Mon Sep 17 00:00:00 2001 From: lolman360 Date: Sat, 29 Aug 2020 21:28:20 +1000 Subject: [PATCH 03/17] Update shuttle.dmi --- icons/turf/shuttle.dmi | Bin 57395 -> 58032 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/turf/shuttle.dmi b/icons/turf/shuttle.dmi index 985b9991a09988bc691b38a4585479d8d18c1fb9..fbca824f475428836fd7f6a452f46403ac84a134 100644 GIT binary patch delta 30630 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 E0ED8HHvj+t delta 29936 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 From 9dff898afe9dccfa632fdbbbe4f57fcf1741f5f2 Mon Sep 17 00:00:00 2001 From: Detective Google <48196179+Detective-Google@users.noreply.github.com> Date: Sat, 29 Aug 2020 14:13:24 -0500 Subject: [PATCH 04/17] improvements --- .../Snaxi/IcemoonUnderground_Above.dmm | 434 +- .../Snaxi/IcemoonUnderground_Below.dmm | 50 +- _maps/map_files/Snaxi/Snaxi.dmm | 5201 +++++++++-------- 3 files changed, 3100 insertions(+), 2585 deletions(-) diff --git a/_maps/map_files/Snaxi/IcemoonUnderground_Above.dmm b/_maps/map_files/Snaxi/IcemoonUnderground_Above.dmm index 403f155854..153ad4265d 100644 --- a/_maps/map_files/Snaxi/IcemoonUnderground_Above.dmm +++ b/_maps/map_files/Snaxi/IcemoonUnderground_Above.dmm @@ -112,7 +112,7 @@ /obj/machinery/light/small{ dir = 8 }, -/turf/closed/mineral/random/snow, +/turf/open/floor/plating/asteroid/snow/icemoon, /area/icemoon/underground/unexplored/rivers) "eH" = ( /obj/machinery/airalarm{ @@ -581,7 +581,7 @@ desc = "A horn off of a bicycle. This one has been charred to hell and back, yet somehow it still honks."; name = "charred bike horn" }, -/turf/closed/mineral/random/snow, +/turf/open/floor/plating/asteroid/snow/icemoon, /area/icemoon/underground/unexplored/rivers) "nN" = ( /turf/closed/wall/r_wall, @@ -722,6 +722,9 @@ }, /turf/open/floor/plasteel, /area/mine/living_quarters) +"rs" = ( +/turf/open/floor/plating/asteroid/snow/icemoon, +/area/icemoon/underground/unexplored/rivers) "ry" = ( /obj/effect/turf_decal/tile/purple{ dir = 8 @@ -809,6 +812,9 @@ }, /turf/open/floor/plasteel/white, /area/mine/living_quarters) +"sL" = ( +/turf/open/transparent/openspace/icemoon, +/area/icemoon/underground/unexplored/rivers) "sM" = ( /obj/structure/table, /obj/item/storage/firstaid/toxin{ @@ -2367,7 +2373,7 @@ /obj/machinery/light/small{ dir = 1 }, -/turf/closed/mineral/random/snow, +/turf/open/floor/plating/asteroid/snow/icemoon, /area/icemoon/underground/unexplored/rivers) "WE" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -29940,9 +29946,9 @@ ah ah ah ah +rs ah -ah -ah +rs ah ah ah @@ -30199,8 +30205,8 @@ ah ah ah ah -ah -ah +rs +rs ah ah ah @@ -30456,8 +30462,8 @@ ah ah ah ah -ah -ah +rs +rs ah ah ah @@ -30712,10 +30718,10 @@ ah ah ah nE -ah -ah -ah -ah +rs +sL +sL +rs ah ah ah @@ -30968,11 +30974,11 @@ ah ah ah ah -ah -ah -ah -ah -ah +rs +rs +rs +sL +rs ah ah ah @@ -31498,8 +31504,8 @@ ah ah ah ah -ah -ah +rs +rs ah ah ah @@ -31749,14 +31755,14 @@ ah ah ah ah +rs +rs +rs +rs ah -ah -ah -ah -ah -ah -ah -ah +rs +rs +rs ah ah ah @@ -32005,14 +32011,14 @@ Gw op nd ah -ah -ah -ah -ah -ah -ah -ah -ah +sL +rs +rs +rs +rs +rs +rs +rs ah ah ah @@ -32262,15 +32268,15 @@ GI Lg nd ah -ah -ah -ah +sL +sL +rs op WE op -ah -ah -ah +rs +rs +rs ah ah ah @@ -32519,17 +32525,17 @@ GN Lu nd ah -ah -ah -ah +rs +rs +rs op sa op -ah -ah -ah -ah -ah +rs +rs +rs +rs +rs ah ah ah @@ -32782,11 +32788,11 @@ nd op WM op -ah -ah -ah -ah -ah +rs +rs +rs +rs +rs ah ah ah @@ -33039,10 +33045,10 @@ Rx ry WO op -ah -ah -ah -ah +rs +rs +rs +rs ah ah ah @@ -33296,9 +33302,9 @@ sa sa sa op -ah -ah -ah +rs +rs +rs ah ah ah @@ -33553,8 +33559,8 @@ TA sa Xf op -ah -ah +rs +rs ah ah ah @@ -33810,8 +33816,8 @@ TA sa sa op -ah -ah +rs +rs ah ah ah @@ -37651,8 +37657,8 @@ ah ah ah ah -ah -ah +rs +rs op sa Ho @@ -37908,8 +37914,8 @@ ah ah ah ah -ah -ah +rs +rs op ET HY @@ -38165,18 +38171,18 @@ ah ah ah ah -ah -ah +rs +rs op op Iq op op -ah -ah -ah -ah -ah +rs +rs +rs +rs +rs ah ah ah @@ -38422,19 +38428,19 @@ ah ah ah ah -ah -ah -ah +rs +rs +rs op Iv op -ah -ah -ah -ah -ah -ah -ah +rs +rs +rs +rs +rs +rs +rs ah ah ah @@ -38680,18 +38686,18 @@ ah ah ah ah -ah -ah +rs +rs op Ho op -ah -ah -ah -ah -ah -ah -ah +rs +rs +sL +rs +rs +rs +rs ah ah ah @@ -38937,18 +38943,18 @@ ah ah ah ah -ah -ah +sL +rs op Ho op -ah -ah -ah -ah -ah -ah -ah +rs +sL +sL +sL +rs +rs +rs ah ah ah @@ -39193,21 +39199,21 @@ ah ah ah ah -ah -ah -ah +sL +sL +rs op Ho op -ah -ah -ah -ah -ah -ah -ah -ah -ah +rs +sL +sL +sL +rs +rs +rs +rs +rs ah ah ah @@ -39444,26 +39450,26 @@ ah ah ah ah +rs +rs +rs ah ah ah ah -ah -ah -ah -ah -ah +rs +rs er IB er -ah -ah -ah -ah -ah -ah -ah -ah +rs +sL +sL +rs +rs +rs +rs +rs ah ah ah @@ -39700,24 +39706,24 @@ ah ah ah ah +rs +rs +rs +rs +rs ah ah ah -ah -ah -ah -ah -ah -ah -ah +rs +rs er IB er -ah -ah -ah -ah -ah +rs +sL +sL +rs +rs ah ah ah @@ -39957,24 +39963,24 @@ ah ah ah ah -ah +rs eZ fB er +rs ah ah ah -ah -ah -ah +rs +rs er IB er -ah -ah -ah -ah -ah +rs +rs +sL +sL +rs ah ah ah @@ -40213,25 +40219,25 @@ ah ah ah ah -ah -ah +rs +rs er fC er +rs +rs ah ah -ah -ah -ah -ah +rs +rs er IF er -ah -ah -ah -ah -ah +rs +rs +sL +sL +rs ah ah ah @@ -40470,25 +40476,25 @@ ah ah ah ah -ah +rs er er fD er er +rs ah -ah -ah -ah +rs +rs Be er IK er er -ah -ah -ah -ah +rs +rs +rs +rs ah ah ah @@ -40743,8 +40749,8 @@ IM gS er eq -ah -ah +rs +rs ah ah ah @@ -40983,7 +40989,7 @@ ah ah ah ah -ah +rs eq eH fb @@ -41000,8 +41006,8 @@ IB fC Nt eq -ah -ah +rs +rs ah ah ah @@ -41240,7 +41246,7 @@ ah ah ah ah -ah +rs er eI fc @@ -41497,7 +41503,7 @@ ah ah ah ah -ah +rs er eJ fd @@ -41774,8 +41780,8 @@ er Tk NK er -ah -ah +rs +rs ah ah ah @@ -42009,7 +42015,7 @@ ah ah ah ah -ah +rs dW ei es @@ -42031,9 +42037,9 @@ Rf Tn NP VC -ah -ah -ah +rs +rs +rs ah ah ah @@ -42265,8 +42271,8 @@ ah ah ah ah -ah -ah +rs +rs dX ej et @@ -42288,8 +42294,8 @@ er To UJ er -ah -ah +rs +rs ah ah ah @@ -42522,8 +42528,8 @@ ah ah ah ah -ah -ah +rs +rs dX ej eu @@ -42780,7 +42786,7 @@ ah ah ah ah -ah +rs dW ek ew @@ -44069,9 +44075,9 @@ ah ah ah ex -ah -ah -ah +rs +rs +rs ex ah ah @@ -44324,13 +44330,13 @@ ah ah ah ah -ah -ah -ah -ah -ah -ah -ah +rs +rs +rs +rs +rs +rs +rs ah ah ah @@ -44581,13 +44587,13 @@ ah ah ah ah -ah -ah -ah -ah -ah -ah -ah +rs +rs +rs +rs +rs +rs +rs ah ah ah @@ -44839,11 +44845,11 @@ ah ah ah ah -ah -ah -ah -ah -ah +rs +rs +rs +rs +rs ah ah ah @@ -45097,9 +45103,9 @@ ah ah ah ah -ah -ah -ah +rs +rs +rs ah ah ah diff --git a/_maps/map_files/Snaxi/IcemoonUnderground_Below.dmm b/_maps/map_files/Snaxi/IcemoonUnderground_Below.dmm index 42971e4315..79e5080644 100644 --- a/_maps/map_files/Snaxi/IcemoonUnderground_Below.dmm +++ b/_maps/map_files/Snaxi/IcemoonUnderground_Below.dmm @@ -5,6 +5,9 @@ "b" = ( /turf/closed/mineral/random/high_chance/snow, /area/icemoon/underground/unexplored/rivers) +"c" = ( +/turf/open/floor/plating/asteroid/snow/icemoon, +/area/icemoon/underground/unexplored/rivers) "d" = ( /turf/closed/wall, /area/icemoon/underground/explored) @@ -19,6 +22,9 @@ /obj/item/gps/mining, /turf/open/floor/plating/asteroid/snow/icemoon, /area/icemoon/underground/explored) +"G" = ( +/turf/open/floor/plating/asteroid/snow/icemoon, +/area/mine/maintenance) "N" = ( /obj/item/flashlight/lantern{ on = 1 @@ -33,6 +39,22 @@ /obj/structure/ladder, /turf/open/floor/plating/asteroid/snow/icemoon, /area/icemoon/underground/explored) +"X" = ( +/obj/machinery/telecomms/relay/preset/mining, +/obj/machinery/bluespace_beacon, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced, +/obj/machinery/door/window/eastright{ + dir = 8; + req_access_txt = "48" + }, +/turf/open/floor/circuit, +/area/icemoon/underground/explored) (1,1,1) = {" a @@ -39499,9 +39521,9 @@ a a a a -a -a -a +c +c +c a a a @@ -40011,13 +40033,13 @@ a a a a -a +c e i h h e -a +c a a a @@ -40268,13 +40290,13 @@ a a a a -a +c h h T h h -a +c a a a @@ -40525,13 +40547,13 @@ a a a a -a +c e N h -h +G e -a +c a a a @@ -40786,7 +40808,7 @@ a d O h -e +X d a a @@ -41041,9 +41063,9 @@ a a a a -a -a -a +c +c +c a a a diff --git a/_maps/map_files/Snaxi/Snaxi.dmm b/_maps/map_files/Snaxi/Snaxi.dmm index 45e6e4dee0..ed574fa1a4 100644 --- a/_maps/map_files/Snaxi/Snaxi.dmm +++ b/_maps/map_files/Snaxi/Snaxi.dmm @@ -254,10 +254,11 @@ /turf/open/floor/plasteel, /area/hallway/primary/aft) "aar" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/sign/departments/botany, -/turf/open/floor/plating, -/area/hydroponics) +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/solar/starboard/fore) "aas" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/disposalpipe/segment{ @@ -310,6 +311,9 @@ dir = 1 }, /obj/machinery/disposal/bin, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 5 + }, /turf/open/floor/plasteel, /area/crew_quarters/fitness) "aaw" = ( @@ -516,13 +520,6 @@ }, /turf/open/floor/plasteel/grimy, /area/crew_quarters/fitness/recreation) -"aaM" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/machinery/atmospherics/components/binary/valve{ - dir = 4 - }, -/turf/open/floor/plating/asteroid/snow/icemoon, -/area/icemoon/surface/outdoors) "aaN" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/machinery/quantumpad{ @@ -602,7 +599,8 @@ /obj/structure/sign/departments/restroom{ pixel_x = 32 }, -/turf/open/floor/carpet, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/wood, /area/crew_quarters/dorms) "aaV" = ( /obj/structure/sign/directions/evac{ @@ -673,8 +671,8 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/structure/sign/mining{ - pixel_x = 32 +/obj/machinery/light{ + dir = 4 }, /turf/open/floor/plasteel, /area/hallway/primary/central) @@ -942,7 +940,7 @@ /obj/structure/sign/poster/official/fashion{ pixel_y = -32 }, -/turf/open/floor/carpet, +/turf/open/floor/wood, /area/crew_quarters/dorms) "abB" = ( /obj/structure/cable{ @@ -1080,13 +1078,14 @@ /turf/open/floor/plasteel, /area/hallway/primary/port) "abL" = ( -/obj/structure/table, -/obj/item/mmi, -/obj/item/mmi, -/obj/item/mmi, /obj/structure/sign/poster/official/state_laws{ pixel_y = -32 }, +/obj/machinery/camera{ + c_tag = "Robotics Lab South"; + dir = 1; + network = list("ss13","rd") + }, /turf/open/floor/plasteel/white, /area/science/robotics/lab) "abM" = ( @@ -1184,14 +1183,8 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "abU" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 5 - }, /turf/open/floor/plating/snowed/smoothed/icemoon, -/area/icemoon/surface/outdoors) +/area/solar/starboard/fore) "abV" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -1358,7 +1351,9 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/visible, +/obj/machinery/atmospherics/components/binary/valve{ + dir = 4 + }, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) "acV" = ( @@ -1568,8 +1563,9 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 9 + dir = 4 }, +/obj/machinery/light/floor, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) "aeG" = ( @@ -1711,6 +1707,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/visible{ dir = 9 }, +/obj/machinery/light/floor, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) "akB" = ( @@ -1858,7 +1855,6 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/eastright{ base_state = "left"; - dir = 8; icon_state = "left"; name = "Chemistry Desk"; req_access_txt = "33" @@ -1866,6 +1862,10 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/machinery/door/window/eastright{ + dir = 8; + name = "Chemistry Desk" + }, /turf/open/floor/plasteel/white, /area/medical/chemistry) "anw" = ( @@ -2075,8 +2075,8 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, -/obj/machinery/door/airlock/external, /obj/structure/fans/tiny, +/obj/machinery/door/airlock/external/glass, /turf/open/floor/plasteel, /area/hallway/primary/port) "arE" = ( @@ -2164,6 +2164,7 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, +/obj/machinery/light/floor, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) "asE" = ( @@ -2505,17 +2506,10 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/highsecurity{ - name = "AI Upload Access"; - req_access_txt = "16" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel/dark, +/turf/closed/wall/r_wall, /area/ai_monitored/turret_protected/ai_upload) "axc" = ( /obj/structure/table, @@ -2604,17 +2598,9 @@ /obj/structure/plasticflaps/opaque, /turf/open/floor/plasteel/dark, /area/science/lab) -"axL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 10 - }, -/turf/open/floor/plating/asteroid/snow/icemoon, -/area/icemoon/surface/outdoors) "axN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/visible{ - dir = 10 - }, -/turf/open/floor/plating/asteroid/snow/icemoon, +/obj/structure/fluff/railing, +/turf/open/transparent/openspace/icemoon, /area/icemoon/surface/outdoors) "ayk" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -2626,7 +2612,14 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/closed/wall/r_wall, +/obj/machinery/door/airlock/highsecurity{ + name = "AI Upload Access"; + req_access_txt = "16" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) "aym" = ( /obj/structure/cable{ @@ -2741,20 +2734,34 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/conveyor_switch/oneway{ - dir = 8; - id = "robo2" - }, /obj/machinery/firealarm{ dir = 8; pixel_x = 24 }, +/obj/structure/table, +/obj/item/storage/firstaid/regular{ + empty = 1; + name = "First-Aid (empty)" + }, +/obj/item/storage/firstaid/regular{ + empty = 1; + name = "First-Aid (empty)" + }, +/obj/item/storage/firstaid/regular{ + empty = 1; + name = "First-Aid (empty)" + }, +/obj/item/healthanalyzer, +/obj/item/healthanalyzer, +/obj/item/healthanalyzer, /turf/open/floor/plasteel/white, /area/science/robotics/lab) "ayC" = ( -/obj/machinery/mecha_part_fabricator, -/turf/open/floor/plasteel/dark, -/area/science/robotics/lab) +/obj/structure/fluff/railing/corner{ + dir = 8 + }, +/turf/open/transparent/openspace/icemoon, +/area/icemoon/surface/outdoors) "ayD" = ( /obj/structure/cable{ icon_state = "0-4" @@ -2805,6 +2812,7 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, +/obj/machinery/light/floor, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/maintenance/department/electrical) "azq" = ( @@ -2890,20 +2898,11 @@ /turf/open/floor/plasteel, /area/hallway/primary/port) "azH" = ( -/obj/machinery/conveyor{ - dir = 8; - id = "robo2" +/obj/structure/fluff/railing{ + dir = 4 }, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/glass{ - amount = 20; - pixel_x = -3; - pixel_y = 6 - }, -/turf/open/floor/plasteel/dark, -/area/science/robotics/lab) +/turf/open/transparent/openspace/icemoon, +/area/icemoon/surface/outdoors) "aAe" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /obj/structure/disposalpipe/segment{ @@ -3136,24 +3135,11 @@ /turf/open/floor/plasteel/white, /area/science/robotics/lab) "aCr" = ( -/obj/structure/table, -/obj/item/storage/firstaid/regular{ - empty = 1; - name = "First-Aid (empty)" +/obj/structure/fluff/railing{ + dir = 8 }, -/obj/item/storage/firstaid/regular{ - empty = 1; - name = "First-Aid (empty)" - }, -/obj/item/storage/firstaid/regular{ - empty = 1; - name = "First-Aid (empty)" - }, -/obj/item/healthanalyzer, -/obj/item/healthanalyzer, -/obj/item/healthanalyzer, -/turf/open/floor/plasteel/white, -/area/science/robotics/lab) +/turf/open/transparent/openspace/icemoon, +/area/icemoon/surface/outdoors) "aCV" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -3199,8 +3185,7 @@ /area/hallway/primary/port) "aDc" = ( /obj/effect/landmark/start/scientist, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plasteel/white, +/turf/open/floor/circuit, /area/science/lab) "aDd" = ( /obj/structure/cable{ @@ -3226,10 +3211,6 @@ /obj/machinery/vending/clothing, /turf/open/floor/plasteel, /area/hallway/secondary/entry) -"aDf" = ( -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plasteel/white, -/area/science/lab) "aDg" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 @@ -3380,8 +3361,10 @@ /turf/open/floor/plasteel, /area/security/checkpoint/medical) "aEE" = ( -/obj/machinery/rnd/destructive_analyzer, -/turf/open/floor/circuit, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel/white, /area/science/lab) "aEF" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ @@ -3390,25 +3373,24 @@ /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) "aEG" = ( -/turf/open/floor/circuit, -/area/science/lab) -"aEH" = ( -/obj/machinery/computer/rdconsole/core{ - dir = 1 +/obj/structure/fluff/railing{ + dir = 10 }, +/turf/open/transparent/openspace/icemoon, +/area/icemoon/surface/outdoors) +"aEH" = ( /obj/machinery/light, /turf/open/floor/circuit, /area/science/lab) "aEI" = ( -/obj/machinery/rnd/production/protolathe/department/science, +/obj/machinery/rnd/destructive_analyzer, /turf/open/floor/circuit, /area/science/lab) "aEJ" = ( /turf/closed/wall/r_wall, /area/hallway/secondary/entry) "aEK" = ( -/obj/machinery/rnd/production/circuit_imprinter/department/science, -/obj/item/reagent_containers/glass/beaker/sulphuric, +/obj/machinery/rnd/production/protolathe/department/science, /turf/open/floor/circuit, /area/science/lab) "aEL" = ( @@ -3606,35 +3588,11 @@ /turf/open/floor/circuit, /area/science/robotics/mechbay) "aHK" = ( -/obj/structure/rack, -/obj/item/storage/toolbox/mechanical{ - pixel_x = -2; - pixel_y = -1 +/obj/structure/fluff/railing{ + dir = 6 }, -/obj/item/storage/toolbox/electrical{ - pixel_x = 1; - pixel_y = 6 - }, -/obj/item/clothing/head/welding{ - pixel_x = -3; - pixel_y = 5 - }, -/obj/item/clothing/head/welding{ - pixel_x = -3; - pixel_y = 5 - }, -/obj/item/clothing/glasses/welding, -/obj/item/clothing/glasses/welding, -/obj/item/multitool{ - pixel_x = 3 - }, -/obj/item/multitool{ - pixel_x = 3 - }, -/obj/item/storage/belt/utility, -/obj/item/storage/belt/utility, -/turf/open/floor/plasteel/white, -/area/science/robotics/lab) +/turf/open/transparent/openspace/icemoon, +/area/icemoon/surface/outdoors) "aHU" = ( /obj/machinery/rnd/production/techfab/department/service, /turf/open/floor/plating, @@ -3749,11 +3707,12 @@ /turf/open/floor/plasteel/dark, /area/hallway/secondary/entry) "aKa" = ( -/obj/machinery/atmospherics/components/binary/valve/digital{ - dir = 4 +/obj/structure/cable{ + icon_state = "0-2" }, -/turf/closed/wall/r_wall, -/area/storage/atmos) +/obj/machinery/power/tracker, +/turf/open/floor/plating/asteroid/snow/ice/icemoon/solarpanel, +/area/solar/port/fore) "aKf" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/disposalpipe/segment{ @@ -4062,14 +4021,14 @@ /turf/open/floor/wood, /area/security/courtroom) "aNL" = ( -/obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/firedoor/border_only{ dir = 1; name = "north facing firelock" }, /obj/structure/fans/tiny, -/turf/open/floor/carpet, +/obj/machinery/door/airlock/external/glass, +/turf/open/floor/plasteel, /area/crew_quarters/dorms) "aNS" = ( /obj/machinery/turnstile{ @@ -4136,18 +4095,12 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - areastring = "/area/storage/atmos"; - dir = 8; - name = "Atmospherics APC"; - pixel_x = -24 - }, /obj/structure/extinguisher_cabinet{ pixel_y = -30 }, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, -/area/storage/atmos) +/area/maintenance/department/electrical) "aOq" = ( /obj/structure/cable{ icon_state = "2-4" @@ -4159,7 +4112,7 @@ dir = 8 }, /turf/open/floor/plating, -/area/storage/atmos) +/area/maintenance/department/electrical) "aOr" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, @@ -4203,9 +4156,11 @@ /turf/open/floor/plating, /area/security/checkpoint/medical) "aPC" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/storage/atmos) +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/solar/port/fore) "aPD" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ @@ -4213,10 +4168,17 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, -/area/storage/atmos) +/area/maintenance/department/electrical) "aPE" = ( -/turf/closed/wall/r_wall, -/area/storage/atmos) +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/power/solar{ + id = "auxsolareast"; + name = "Port Auxiliary Solar Array" + }, +/turf/open/floor/plating/asteroid/snow/ice/icemoon/solarpanel, +/area/solar/port/fore) "aPY" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ @@ -4286,7 +4248,7 @@ icon_state = "2-4" }, /turf/open/floor/plating/snowed/smoothed/icemoon, -/area/icemoon/surface/outdoors) +/area/solar/starboard/fore) "aQT" = ( /obj/structure/cable{ icon_state = "1-2" @@ -4352,6 +4314,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 9 }, +/obj/machinery/light/floor, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) "aSI" = ( @@ -4700,6 +4663,13 @@ }, /turf/open/floor/plating, /area/quartermaster/storage) +"bfo" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/wood, +/area/crew_quarters/dorms) "bfB" = ( /obj/structure/cable{ icon_state = "1-2" @@ -4755,6 +4725,12 @@ /obj/machinery/vending/coffee, /turf/open/floor/plasteel/dark, /area/maintenance/department/bridge) +"bjR" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/crew_quarters/dorms) "bjU" = ( /obj/machinery/airalarm{ dir = 8; @@ -4804,13 +4780,6 @@ /obj/machinery/holopad, /turf/open/floor/plasteel/dark, /area/maintenance/department/bridge) -"blD" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "blI" = ( /obj/machinery/hydroponics/soil, /obj/item/seeds/ambrosia, @@ -4977,6 +4946,12 @@ }, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) +"bqb" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 8 + }, +/turf/open/floor/wood, +/area/crew_quarters/dorms) "bqx" = ( /obj/structure/table/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -5185,9 +5160,6 @@ /area/icemoon/surface/outdoors) "buF" = ( /obj/machinery/light, -/obj/structure/window/plasma/reinforced{ - dir = 4 - }, /obj/structure/table, /obj/item/clothing/gloves/color/yellow, /obj/item/clothing/gloves/color/yellow, @@ -5200,6 +5172,9 @@ dir = 8 }, /obj/item/pipe_dispenser, +/obj/structure/window/reinforced{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/engine/engineering) "buI" = ( @@ -6106,9 +6081,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/airalarm{ - pixel_y = 28 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -6218,9 +6190,6 @@ /obj/effect/turf_decal/tile/brown{ dir = 4 }, -/obj/machinery/light{ - dir = 4 - }, /turf/open/floor/plasteel, /area/hallway/primary/central) "bCM" = ( @@ -6414,6 +6383,17 @@ /obj/machinery/vending/wardrobe/science_wardrobe, /turf/open/floor/plasteel/white, /area/science/misc_lab) +"bEp" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/grille, +/obj/structure/cable, +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/plating/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors) "bEJ" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /obj/effect/turf_decal/tile/purple{ @@ -6921,7 +6901,7 @@ /obj/structure/window/reinforced, /obj/structure/table/reinforced, /obj/machinery/button/door{ - id = "xenobio2"; + id = "xenobiospec"; name = "Containment Blast Doors"; pixel_y = 4; req_access_txt = "55" @@ -6982,7 +6962,7 @@ req_access_txt = "55" }, /obj/machinery/door/poddoor/preopen{ - id = "xenobio2"; + id = "xenobiospec"; name = "containment blast door" }, /turf/open/floor/engine, @@ -7138,35 +7118,9 @@ /obj/machinery/disposal/bin, /turf/open/floor/plasteel/cult, /area/lawoffice) -"bJQ" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/obj/machinery/door/airlock/external{ - name = "Arrivals Airlock" - }, -/obj/structure/fans/tiny, -/turf/open/floor/plating, -/area/hallway/secondary/exit/departure_lounge) "bKl" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, /obj/effect/landmark/event_spawn, -/turf/open/floor/plasteel, +/turf/open/transparent/glass/reinforced, /area/crew_quarters/fitness) "bKo" = ( /obj/machinery/door/airlock/public/glass{ @@ -7245,7 +7199,7 @@ icon_state = "0-4" }, /turf/open/floor/plating/asteroid/snow/ice/icemoon/solarpanel, -/area/icemoon/surface/outdoors) +/area/solar/port/aft) "bLI" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 @@ -7477,6 +7431,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/recharge_station, /turf/open/floor/plasteel, /area/maintenance/department/electrical) "bOp" = ( @@ -7621,16 +7576,16 @@ dir = 8; name = "west facing firelock" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/machinery/door/poddoor/preopen{ - id = "xenobio2"; + id = "xenobiospec"; name = "containment blast door" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/open/floor/engine, /area/science/xenobiology) "bPW" = ( @@ -8578,23 +8533,14 @@ "chp" = ( /turf/open/floor/plating, /area/maintenance/aft) -"chN" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "chZ" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/maintenance/solars/port/fore) +"cih" = ( +/obj/structure/cable, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/solar/port/aft) "cio" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ @@ -8822,7 +8768,7 @@ icon_state = "0-4" }, /turf/open/floor/plating/snowed/smoothed/icemoon, -/area/icemoon/surface/outdoors) +/area/solar/starboard/fore) "cly" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple, /turf/open/floor/plating/snowed/smoothed/icemoon, @@ -9154,6 +9100,12 @@ }, /turf/open/floor/plasteel/grimy, /area/crew_quarters/fitness/recreation) +"cvN" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "cwm" = ( /obj/machinery/vending/boozeomat, /obj/machinery/firealarm{ @@ -9506,15 +9458,6 @@ }, /turf/open/floor/plating, /area/bridge) -"cDO" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "cDS" = ( /obj/structure/bodycontainer/morgue{ dir = 8 @@ -9542,6 +9485,12 @@ /obj/structure/reflector/single, /turf/open/floor/plating, /area/engine/storage) +"cEs" = ( +/obj/machinery/atmospherics/pipe/simple/supply/visible, +/obj/structure/disposalpipe/segment, +/obj/machinery/light/floor, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors) "cFm" = ( /obj/structure/reagent_dispensers/peppertank{ pixel_x = -30 @@ -9698,7 +9647,7 @@ }, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, -/area/storage/atmos) +/area/maintenance/department/electrical) "cKQ" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 @@ -9723,7 +9672,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/wood, /area/crew_quarters/fitness) "cLC" = ( /obj/effect/turf_decal/tile/brown{ @@ -9770,7 +9719,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/carpet, +/turf/open/floor/wood, /area/crew_quarters/dorms) "cNE" = ( /obj/structure/cable{ @@ -10043,6 +9992,13 @@ "cTO" = ( /turf/closed/wall/r_wall, /area/quartermaster/miningoffice) +"cTV" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel, +/area/crew_quarters/dorms) "cUd" = ( /obj/structure/cable{ icon_state = "1-2" @@ -10062,6 +10018,40 @@ }, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) +"cUs" = ( +/obj/effect/landmark/start/ai, +/obj/item/radio/intercom{ + freerange = 1; + name = "Common Channel"; + pixel_x = 25; + pixel_y = -4 + }, +/obj/item/radio/intercom{ + freerange = 1; + frequency = 1447; + name = "Private Channel"; + pixel_x = 25; + pixel_y = -13 + }, +/obj/item/radio/intercom{ + freerange = 1; + listening = 0; + name = "Custom Channel"; + pixel_x = 25; + pixel_y = 7 + }, +/obj/machinery/button/door{ + id = "AI Chamber entrance shutters"; + name = "AI Chamber entrance shutters control"; + pixel_x = -7; + pixel_y = -24; + req_access_txt = "16" + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/open/floor/circuit, +/area/ai_monitored/turret_protected/ai) "cUC" = ( /obj/structure/chair, /obj/effect/landmark/start/geneticist, @@ -10090,6 +10080,12 @@ }, /turf/open/floor/pod/dark, /area/maintenance/starboard) +"cVa" = ( +/obj/structure/fluff/railing{ + dir = 9 + }, +/turf/open/transparent/openspace/icemoon, +/area/engine/atmospherics_engine) "cVu" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/blue{ @@ -10143,6 +10139,10 @@ }, /turf/open/floor/plasteel, /area/quartermaster/storage) +"cWI" = ( +/obj/structure/cable, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/solar/starboard/aft) "cWO" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 4 @@ -10167,11 +10167,9 @@ /turf/open/floor/plasteel/dark, /area/security/prison) "cXI" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/closed/wall/r_wall, -/area/ai_monitored/turret_protected/ai) +/obj/structure/cable, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/solar/port/fore) "cXO" = ( /obj/structure/cable, /obj/effect/landmark/start/ai/secondary, @@ -10495,21 +10493,23 @@ name = "Port Solar Array" }, /turf/open/floor/plating/asteroid/snow/ice/icemoon/solarpanel, -/area/icemoon/surface/outdoors) +/area/solar/port/aft) "dfy" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/structure/cable{ icon_state = "1-4" }, /obj/structure/cable{ icon_state = "2-4" }, +/obj/effect/landmark/event_spawn, +/obj/machinery/flasher{ + id = "AI"; + pixel_x = -26; + pixel_y = 3 + }, /obj/machinery/ai_slipper{ uses = 10 }, -/obj/effect/landmark/event_spawn, /turf/open/floor/circuit/off, /area/ai_monitored/turret_protected/ai) "dfV" = ( @@ -10817,8 +10817,8 @@ dir = 4 }, /obj/machinery/door/airlock/atmos{ - name = "Atmospherics"; - req_access_txt = "24" + name = "Antimatter Engine"; + req_access_txt = "10" }, /obj/machinery/door/firedoor/border_only{ dir = 8; @@ -10886,10 +10886,11 @@ /obj/structure/cable{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 6 +/obj/structure/cable{ + icon_state = "2-8" }, -/turf/open/floor/carpet, +/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, +/turf/open/floor/wood, /area/crew_quarters/dorms) "duI" = ( /obj/structure/cable{ @@ -10934,6 +10935,7 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, +/obj/machinery/light/floor, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) "dvs" = ( @@ -10946,7 +10948,7 @@ /obj/machinery/door/firedoor/border_only{ name = "south facing firelock" }, -/turf/open/floor/carpet, +/turf/open/floor/plasteel, /area/crew_quarters/dorms) "dvw" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -11053,12 +11055,6 @@ }, /turf/open/floor/pod/dark, /area/maintenance/starboard) -"dAi" = ( -/obj/structure/sign/warning/pods{ - pixel_x = -32 - }, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) "dAs" = ( /obj/structure/cable{ icon_state = "1-2" @@ -11158,36 +11154,11 @@ /turf/open/floor/plasteel, /area/quartermaster/storage) "dDC" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ +/obj/structure/fluff/railing{ dir = 1 }, -/obj/structure/closet/crate/engineering{ - name = "Antimatter Engine Crate" - }, -/obj/machinery/power/am_control_unit, -/obj/item/am_shielding_container, -/obj/item/am_shielding_container, -/obj/item/am_shielding_container, -/obj/item/am_shielding_container, -/obj/item/am_shielding_container, -/obj/item/am_shielding_container, -/obj/item/am_shielding_container, -/obj/item/am_shielding_container, -/obj/item/am_shielding_container, -/obj/item/am_shielding_container, -/obj/item/am_shielding_container, -/obj/item/am_shielding_container, -/obj/item/am_containment, -/obj/item/am_containment, -/turf/open/floor/plasteel/dark, -/area/engine/secure_construction) +/turf/open/transparent/openspace/icemoon, +/area/icemoon/surface/outdoors) "dDK" = ( /obj/machinery/atmospherics/pipe/simple/supply/visible{ dir = 6 @@ -11265,9 +11236,11 @@ /turf/closed/wall, /area/quartermaster/qm) "dFJ" = ( -/obj/effect/turf_decal/stripes/corner, -/turf/open/floor/plasteel/white, -/area/science/lab) +/obj/structure/fluff/railing{ + dir = 5 + }, +/turf/open/transparent/openspace/icemoon, +/area/icemoon/surface/outdoors) "dGb" = ( /obj/structure/cable{ icon_state = "1-8" @@ -11354,7 +11327,7 @@ /obj/machinery/door/firedoor/border_only{ name = "south facing firelock" }, -/turf/open/floor/carpet, +/turf/open/floor/carpet/blue, /area/crew_quarters/dorms) "dJc" = ( /obj/structure/cable{ @@ -11386,7 +11359,7 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/turf/open/floor/carpet, +/turf/open/floor/wood, /area/crew_quarters/dorms) "dKw" = ( /obj/structure/cable{ @@ -11437,6 +11410,11 @@ "dMj" = ( /turf/closed/wall/r_wall, /area/ai_monitored/nuke_storage) +"dMo" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/light/floor, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors) "dMI" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -12102,6 +12080,7 @@ dir = 1; sortType = 26 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/plasteel, /area/crew_quarters/fitness) "egM" = ( @@ -12218,15 +12197,6 @@ }, /turf/open/floor/plasteel/dark, /area/security/brig) -"ejw" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "ekw" = ( /obj/structure/chair{ dir = 1 @@ -12287,6 +12257,18 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/dark, /area/hallway/secondary/exit/departure_lounge) +"eoH" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/carpet, +/area/crew_quarters/dorms) "eoL" = ( /obj/structure/chair{ dir = 4 @@ -12354,9 +12336,6 @@ /turf/open/floor/plasteel/dark, /area/engine/engineering) "ery" = ( -/obj/machinery/light{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -12371,10 +12350,6 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_x = -28 - }, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) "erG" = ( @@ -12587,6 +12562,12 @@ }, /turf/open/floor/plasteel/white, /area/science/mixing) +"eyc" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/closed/wall, +/area/crew_quarters/dorms) "eyP" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ @@ -12690,6 +12671,13 @@ }, /turf/open/floor/plating, /area/maintenance/solars/port/aft) +"eCS" = ( +/obj/machinery/door/airlock{ + id_tag = "Dorm5"; + name = "Room Four" + }, +/turf/open/floor/carpet/purple, +/area/crew_quarters/dorms) "eDr" = ( /obj/structure/cable{ icon_state = "4-8" @@ -12870,7 +12858,7 @@ /area/hallway/primary/central) "eHK" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, /turf/open/floor/plating, @@ -12982,25 +12970,6 @@ }, /turf/open/floor/plasteel, /area/maintenance/aft) -"eLl" = ( -/obj/structure/window{ - dir = 1 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/obj/structure/window{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "eLm" = ( /obj/structure/cable{ icon_state = "4-8" @@ -13174,10 +13143,6 @@ }, /turf/open/floor/wood, /area/crew_quarters/bar) -"eOO" = ( -/obj/structure/weightmachine/weightlifter, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "eOZ" = ( /obj/machinery/atmospherics/components/binary/pump/on, /turf/open/floor/plasteel/dark, @@ -13417,6 +13382,20 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall/mineral/wood, /area/maintenance/bar) +"eXy" = ( +/obj/effect/turf_decal/stripes/corner, +/turf/open/floor/plasteel/white, +/area/science/lab) +"eXO" = ( +/obj/structure/table, +/obj/item/mmi, +/obj/item/mmi, +/obj/item/mmi, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/science/robotics/lab) "eYe" = ( /obj/machinery/conveyor{ dir = 4; @@ -13489,7 +13468,7 @@ icon_state = "1-4" }, /turf/open/floor/plating/snowed/smoothed/icemoon, -/area/icemoon/surface/outdoors) +/area/solar/starboard/aft) "faR" = ( /obj/structure/window/reinforced{ dir = 8 @@ -13497,7 +13476,7 @@ /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, /obj/effect/landmark/blobstart, /turf/open/floor/plating, -/area/storage/atmos) +/area/maintenance/department/electrical) "faV" = ( /obj/machinery/light{ dir = 4 @@ -13819,6 +13798,13 @@ /obj/machinery/space_heater, /turf/open/floor/plating, /area/icemoon/surface/outdoors) +"fkA" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/wood, +/area/crew_quarters/dorms) "fkC" = ( /obj/machinery/atmospherics/pipe/simple/green/visible, /turf/closed/wall/r_wall, @@ -13914,9 +13900,14 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "fne" = ( -/obj/effect/landmark/start/roboticist, -/turf/open/floor/plasteel/dark, -/area/science/robotics/lab) +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/solar/port/fore) "fni" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/carbon_output{ dir = 8 @@ -13957,6 +13948,11 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel, /area/engine/engineering) +"fol" = ( +/obj/machinery/rnd/production/circuit_imprinter/department/science, +/obj/item/reagent_containers/glass/beaker/sulphuric, +/turf/open/floor/circuit, +/area/science/lab) "foy" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -13986,17 +13982,6 @@ /turf/open/floor/plating, /area/maintenance/disposal) "fpS" = ( -/obj/structure/table, -/obj/item/hemostat, -/obj/item/retractor, -/obj/item/scalpel{ - pixel_y = 12 - }, -/obj/item/circular_saw, -/obj/item/cautery{ - pixel_x = 4 - }, -/obj/item/surgical_drapes, /obj/machinery/airalarm{ pixel_y = 23 }, @@ -14004,7 +13989,14 @@ c_tag = "Robotics Lab"; network = list("ss13","rd") }, -/turf/open/floor/plasteel/white, +/obj/machinery/mecha_part_fabricator, +/obj/item/stack/sheet/glass{ + amount = 20; + pixel_x = -3; + pixel_y = 6 + }, +/obj/item/stack/sheet/metal/fifty, +/turf/open/floor/plasteel/dark, /area/science/robotics/lab) "fqj" = ( /obj/machinery/field/generator, @@ -14088,7 +14080,7 @@ icon_state = "1-8" }, /turf/open/floor/plating/snowed/smoothed/icemoon, -/area/icemoon/surface/outdoors) +/area/solar/port/aft) "fsA" = ( /obj/structure/bodycontainer/morgue, /obj/effect/turf_decal/tile/blue{ @@ -14115,11 +14107,8 @@ /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) "ftH" = ( -/obj/machinery/mineral/ore_redemption{ - input_dir = 2; - output_dir = 1 - }, -/turf/open/floor/plating, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/space/basic, /area/quartermaster/miningdock) "ftM" = ( /obj/structure/cable{ @@ -14189,11 +14178,6 @@ /turf/open/floor/plasteel, /area/engine/engineering) "fvz" = ( -/obj/structure/table/optable{ - name = "Robotics Operating Table" - }, -/obj/item/tank/internals/anesthetic, -/obj/item/clothing/mask/breath, /obj/structure/extinguisher_cabinet{ pixel_y = 30 }, @@ -14355,6 +14339,9 @@ c_tag = "Bathrooms"; dir = 1 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 8 + }, /turf/open/floor/plasteel/freezer, /area/crew_quarters/dorms) "fBG" = ( @@ -14376,9 +14363,6 @@ /turf/open/floor/engine, /area/engine/atmospherics_engine) "fCQ" = ( -/obj/structure/toilet/secret/low_loot{ - pixel_y = 14 - }, /obj/machinery/button/door{ id = "Bath2"; name = "Door Bolt Control"; @@ -14391,6 +14375,7 @@ dir = 8 }, /obj/effect/landmark/blobstart, +/obj/machinery/recharge_station, /turf/open/floor/plasteel/freezer, /area/crew_quarters/dorms) "fDi" = ( @@ -14416,6 +14401,13 @@ "fDJ" = ( /turf/open/floor/plasteel/white, /area/medical/medbay/zone3) +"fEz" = ( +/obj/machinery/computer/operating, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/science/robotics/lab) "fET" = ( /obj/effect/turf_decal/tile/neutral, /obj/machinery/camera{ @@ -14514,7 +14506,18 @@ dir = 4 }, /turf/open/floor/plating, -/area/storage/atmos) +/area/maintenance/department/electrical) +"fIk" = ( +/obj/machinery/button/door{ + id = "holoprivacy"; + name = "Holodeck Privacy"; + pixel_x = 24; + pixel_y = 7 + }, +/turf/open/floor/engine{ + name = "Holodeck Projector Floor" + }, +/area/holodeck/rec_center) "fIu" = ( /obj/structure/cable{ icon_state = "1-8" @@ -14733,11 +14736,11 @@ pixel_y = -28 }, /turf/open/floor/plating, -/area/storage/atmos) +/area/maintenance/department/electrical) "fNh" = ( /obj/structure/cable, /turf/open/floor/plating/snowed/smoothed/icemoon, -/area/icemoon/surface/outdoors) +/area/solar/starboard/fore) "fNC" = ( /obj/structure/cable{ icon_state = "1-2" @@ -14869,6 +14872,9 @@ dir = 8; name = "west facing firelock" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /turf/open/floor/plating, /area/crew_quarters/dorms) "fPN" = ( @@ -14955,6 +14961,13 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/white, /area/medical/medbay/central) +"fSb" = ( +/obj/machinery/airalarm{ + dir = 4; + pixel_x = -22 + }, +/turf/open/floor/wood, +/area/crew_quarters/dorms) "fSw" = ( /obj/structure/cable{ icon_state = "2-4" @@ -14998,8 +15011,14 @@ /obj/machinery/light{ dir = 4 }, -/turf/open/floor/carpet, +/turf/open/floor/plasteel, /area/crew_quarters/dorms) +"fUc" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/solar/port/aft) "fUm" = ( /obj/structure/cable{ icon_state = "1-2" @@ -15044,7 +15063,7 @@ icon_state = "2-4" }, /turf/open/floor/plating/snowed/smoothed/icemoon, -/area/icemoon/surface/outdoors) +/area/solar/starboard/fore) "fVT" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/engine, @@ -15273,6 +15292,12 @@ /obj/item/storage/fancy/donut_box, /turf/open/floor/plasteel, /area/security/checkpoint/supply) +"gdH" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, +/turf/open/floor/plasteel/freezer, +/area/crew_quarters/dorms) "gdL" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 @@ -15441,6 +15466,12 @@ }, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/engine/engineering) +"gjZ" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 9 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "gkl" = ( /obj/machinery/jukebox, /turf/open/floor/wood, @@ -15504,28 +15535,6 @@ }, /turf/open/floor/plasteel, /area/engine/engineering) -"gls" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/machinery/door/window/westright{ - name = "Red Corner" - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "gmf" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, @@ -15699,9 +15708,6 @@ /turf/closed/wall, /area/security/courtroom) "grZ" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/structure/table, /obj/item/aiModule/core/full/custom, /obj/item/aiModule/core/freeformcore, @@ -15713,6 +15719,9 @@ dir = 1; network = list("aiupload") }, +/obj/structure/cable{ + icon_state = "1-4" + }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai_upload) "gsr" = ( @@ -15814,12 +15823,11 @@ /turf/open/floor/plasteel/dark, /area/bridge) "guI" = ( -/obj/machinery/light/floor, -/obj/structure/disposalpipe/segment{ - dir = 5 +/obj/structure/cable{ + icon_state = "0-8" }, /turf/open/floor/plating/snowed/smoothed/icemoon, -/area/icemoon/surface/outdoors) +/area/solar/port/fore) "guR" = ( /obj/structure/table/glass, /obj/effect/turf_decal/tile/yellow{ @@ -16063,7 +16071,7 @@ dir = 1 }, /turf/open/floor/plasteel, -/area/storage/atmos) +/area/maintenance/department/electrical) "gCG" = ( /obj/structure/closet/firecloset, /turf/open/floor/plating, @@ -16078,15 +16086,10 @@ /turf/open/floor/plasteel, /area/engine/atmos) "gCO" = ( -/obj/machinery/light, -/obj/machinery/door/airlock/public/glass{ - name = "Holodeck Door" - }, -/obj/structure/fans/tiny, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/wood, /area/crew_quarters/dorms) "gCS" = ( /obj/structure/bodycontainer/morgue, @@ -16240,6 +16243,12 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/port) +"gIW" = ( +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/solar/starboard/aft) "gJi" = ( /obj/machinery/atmospherics/pipe/simple/orange/visible, /obj/machinery/atmospherics/pipe/simple/green/visible{ @@ -16486,7 +16495,7 @@ }, /obj/effect/landmark/event_spawn, /turf/open/floor/plasteel, -/area/storage/atmos) +/area/maintenance/department/electrical) "gPE" = ( /obj/machinery/portable_atmospherics/pump, /obj/machinery/firealarm{ @@ -16662,7 +16671,7 @@ icon_state = "2-8" }, /turf/open/floor/plating/snowed/smoothed/icemoon, -/area/icemoon/surface/outdoors) +/area/solar/starboard/fore) "gTH" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -16692,11 +16701,18 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/light/floor, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) "gUc" = ( -/obj/machinery/light, -/turf/open/floor/plasteel/white, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/camera{ + c_tag = "Dorms Central"; + dir = 1 + }, +/turf/open/floor/carpet, /area/crew_quarters/dorms) "gUw" = ( /obj/structure/plasticflaps, @@ -16773,7 +16789,8 @@ /obj/structure/cable{ icon_state = "2-8" }, -/turf/open/floor/plasteel/white, +/obj/effect/landmark/start/roboticist, +/turf/open/floor/plasteel/dark, /area/science/robotics/lab) "gXE" = ( /obj/structure/table, @@ -17108,13 +17125,16 @@ /turf/open/floor/plasteel/white, /area/medical/chemistry) "hiO" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, /obj/effect/turf_decal/tile/neutral, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 6 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plasteel, /area/crew_quarters/fitness) "hjv" = ( @@ -17158,6 +17178,14 @@ }, /turf/open/floor/plating/asteroid/snow/icemoon, /area/icemoon/surface/outdoors) +"hlQ" = ( +/obj/item/radio/intercom{ + name = "Station Intercom (General)"; + pixel_x = 30 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/wood, +/area/crew_quarters/dorms) "hlT" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -17168,9 +17196,6 @@ /obj/structure/cable{ icon_state = "2-8" }, -/obj/structure/cable{ - icon_state = "1-2" - }, /turf/open/floor/circuit/off, /area/ai_monitored/turret_protected/ai) "hmM" = ( @@ -17195,6 +17220,15 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/port) +"hnN" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/structure/disposalpipe/segment, +/obj/machinery/light/floor, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors) "hnO" = ( /obj/machinery/atmospherics/components/unary/cryo_cell, /turf/open/floor/plasteel/white, @@ -17219,20 +17253,10 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "hop" = ( -/obj/structure/window{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/landmark/start/assistant, /turf/open/floor/plasteel, /area/crew_quarters/fitness) "hoq" = ( @@ -17342,6 +17366,7 @@ /obj/machinery/light{ dir = 1 }, +/obj/machinery/vending/cigarette, /turf/open/floor/plasteel, /area/crew_quarters/fitness) "hrN" = ( @@ -17361,15 +17386,14 @@ /turf/open/floor/plasteel, /area/quartermaster/miningdock) "hrS" = ( -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/solar/port/fore) "hse" = ( /obj/structure/cable{ - icon_state = "1-4" + icon_state = "0-4" }, -/turf/open/floor/circuit/off, -/area/ai_monitored/turret_protected/ai) +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/solar/port/fore) "hsl" = ( /turf/open/floor/plating, /area/maintenance/starboard) @@ -17419,12 +17443,6 @@ }, /turf/open/floor/wood, /area/bridge/meeting_room) -"hsQ" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "hta" = ( /obj/structure/cable{ icon_state = "1-2" @@ -17471,11 +17489,14 @@ /turf/open/floor/engine/co2, /area/engine/atmos) "huF" = ( -/obj/machinery/mineral/stacking_unit_console{ - machinedir = 4 +/obj/structure/cable{ + icon_state = "1-8" }, -/turf/closed/wall, -/area/maintenance/disposal) +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/solar/port/fore) "huQ" = ( /obj/machinery/power/terminal{ dir = 1 @@ -17507,6 +17528,14 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) +"hvG" = ( +/obj/machinery/light, +/obj/machinery/airalarm{ + dir = 1; + pixel_y = -22 + }, +/turf/open/floor/wood, +/area/crew_quarters/dorms) "hwg" = ( /obj/machinery/computer/teleporter{ dir = 8 @@ -17567,7 +17596,7 @@ }, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, -/area/storage/atmos) +/area/maintenance/department/electrical) "hxP" = ( /obj/machinery/door/airlock/medical/glass{ id_tag = "MedbayFoyer"; @@ -17589,6 +17618,18 @@ /obj/structure/closet/secure_closet/personal/cabinet, /turf/open/floor/carpet, /area/quartermaster/miningoffice) +"hyx" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/airalarm{ + pixel_y = 28 + }, +/turf/open/floor/plasteel, +/area/quartermaster/miningdock) "hyz" = ( /obj/machinery/vending/autodrobe, /turf/open/floor/plasteel, @@ -17680,7 +17721,7 @@ dir = 1; name = "north facing firelock" }, -/turf/open/floor/carpet, +/turf/open/floor/plasteel, /area/crew_quarters/dorms) "hBb" = ( /obj/machinery/camera{ @@ -17710,6 +17751,10 @@ /obj/machinery/vending/medical, /turf/open/floor/plasteel/white, /area/medical/virology) +"hBM" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel/white, +/area/science/lab) "hBQ" = ( /obj/structure/cable{ icon_state = "2-4" @@ -17720,6 +17765,16 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/port) +"hCx" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Dormitory" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8; + name = "west facing firelock" + }, +/turf/open/floor/carpet, +/area/crew_quarters/dorms) "hCD" = ( /obj/structure/cable{ icon_state = "4-8" @@ -17829,7 +17884,7 @@ dir = 4 }, /turf/open/floor/plasteel, -/area/storage/atmos) +/area/maintenance/department/electrical) "hFG" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -17855,7 +17910,7 @@ icon_state = "0-8" }, /turf/open/floor/plating/snowed/smoothed/icemoon, -/area/icemoon/surface/outdoors) +/area/solar/starboard/fore) "hGU" = ( /obj/structure/closet/secure_closet/personal/cabinet{ pixel_x = -8 @@ -17896,6 +17951,12 @@ }, /turf/open/floor/plasteel, /area/engine/atmospherics_engine) +"hHV" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/freezer, +/area/crew_quarters/dorms) "hHW" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -18001,7 +18062,7 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 }, -/turf/open/floor/carpet, +/turf/open/floor/wood, /area/crew_quarters/dorms) "hKt" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -18127,7 +18188,7 @@ /area/engine/secure_construction) "hNT" = ( /obj/effect/landmark/event_spawn, -/turf/open/floor/carpet, +/turf/open/floor/wood, /area/crew_quarters/dorms) "hNZ" = ( /obj/effect/turf_decal/tile/yellow{ @@ -18154,7 +18215,7 @@ }, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, -/area/storage/atmos) +/area/maintenance/department/electrical) "hOw" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/tile/neutral{ @@ -18403,6 +18464,10 @@ }, /turf/open/floor/plasteel, /area/quartermaster/storage) +"hUg" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/turf/open/floor/wood, +/area/crew_quarters/dorms) "hUo" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ @@ -18554,6 +18619,10 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) +"hWp" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/turf/open/floor/wood, +/area/crew_quarters/dorms) "hWW" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 @@ -18866,28 +18935,6 @@ /obj/machinery/space_heater, /turf/open/floor/plasteel, /area/engine/atmos) -"igK" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/machinery/door/window/eastleft{ - name = "Blue Corner" - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "igO" = ( /obj/machinery/vending/boozeomat, /turf/open/floor/wood{ @@ -18916,17 +18963,6 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/flasher{ - id = "AI"; - pixel_x = -26; - pixel_y = 3 - }, -/obj/machinery/turretid{ - icon_state = "control_stun"; - name = "AI Chamber turret control"; - pixel_x = -25; - pixel_y = -3 - }, /turf/open/floor/circuit/off, /area/ai_monitored/turret_protected/ai) "ihE" = ( @@ -18937,6 +18973,7 @@ dir = 10 }, /obj/machinery/atmospherics/components/unary/portables_connector/visible, +/obj/machinery/portable_atmospherics/canister, /turf/open/floor/plasteel, /area/science/mixing) "ihJ" = ( @@ -18970,6 +19007,9 @@ /obj/machinery/power/smes, /turf/open/floor/plating, /area/maintenance/department/electrical) +"ihY" = ( +/turf/open/floor/plasteel/dark, +/area/science/robotics/lab) "iiM" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -19305,6 +19345,12 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) +"iru" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/circuit/off, +/area/ai_monitored/turret_protected/ai) "irN" = ( /obj/machinery/requests_console{ department = "AI"; @@ -19363,7 +19409,7 @@ }, /obj/machinery/light, /turf/open/floor/plating, -/area/storage/atmos) +/area/maintenance/department/electrical) "itw" = ( /obj/structure/cable{ icon_state = "4-8" @@ -19437,7 +19483,7 @@ dir = 1; name = "north facing firelock" }, -/turf/open/floor/carpet, +/turf/open/floor/plasteel, /area/crew_quarters/dorms) "iuP" = ( /obj/machinery/door/airlock/external{ @@ -19446,15 +19492,6 @@ }, /turf/open/floor/engine, /area/engine/atmospherics_engine) -"ivM" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/obj/machinery/door/airlock/external{ - name = "Escape Airlock" - }, -/turf/open/floor/plating, -/area/hallway/secondary/exit/departure_lounge) "ivQ" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -19488,6 +19525,13 @@ }, /turf/open/floor/plasteel, /area/quartermaster/storage) +"iwH" = ( +/obj/structure/extinguisher_cabinet{ + pixel_x = 27 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/wood, +/area/crew_quarters/dorms) "ixf" = ( /obj/structure/cable{ icon_state = "1-2" @@ -19501,6 +19545,12 @@ /obj/item/hand_tele, /turf/open/floor/plasteel/dark, /area/teleporter) +"ixO" = ( +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/solar/port/aft) "ixZ" = ( /obj/structure/chair/office/dark, /mob/living/simple_animal/pet/cat/Runtime{ @@ -19791,6 +19841,13 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/item/radio/intercom{ + name = "Station Intercom (General)"; + pixel_x = -28 + }, +/obj/machinery/light{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) "iFl" = ( @@ -19976,7 +20033,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/carpet, +/turf/open/floor/wood, /area/crew_quarters/dorms) "iJK" = ( /obj/structure/table/reinforced, @@ -20018,6 +20075,13 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/aft) +"iMk" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plating, +/area/ai_monitored/turret_protected/aisat/service) "iML" = ( /obj/machinery/light, /obj/machinery/requests_console{ @@ -20030,14 +20094,15 @@ /turf/open/floor/carpet, /area/crew_quarters/heads/hop) "iMX" = ( -/obj/structure/cable, -/obj/machinery/power/terminal, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/porta_turret/ai{ + dir = 4 + }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai_upload) "iNi" = ( -/obj/structure/window/plasma/reinforced{ - dir = 8 - }, /obj/machinery/computer/rdconsole/production{ dir = 4 }, @@ -20047,6 +20112,9 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/engine/engineering) "iNE" = ( @@ -20062,22 +20130,6 @@ }, /turf/open/floor/engine, /area/engine/engineering) -"iNK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "iNV" = ( /obj/structure/cable{ icon_state = "1-2" @@ -20102,12 +20154,6 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, -/obj/structure/window/plasma/reinforced{ - dir = 8 - }, -/obj/structure/window/plasma/reinforced{ - dir = 1 - }, /obj/machinery/rnd/production/protolathe/department/engineering, /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -20119,6 +20165,12 @@ c_tag = "Engineering Storage"; dir = 4 }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/engine/engineering) "iOG" = ( @@ -20163,6 +20215,13 @@ /obj/machinery/light, /turf/open/floor/plasteel, /area/hallway/primary/port) +"iQu" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/wood, +/area/crew_quarters/dorms) "iQv" = ( /obj/machinery/door/airlock/public/glass{ name = "Courtroom"; @@ -20204,12 +20263,12 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "iRF" = ( -/obj/machinery/door/airlock/external, /obj/machinery/door/firedoor/border_only{ dir = 1; name = "north facing firelock" }, /obj/structure/fans/tiny, +/obj/machinery/door/airlock/external/glass, /turf/open/floor/plating, /area/hallway/primary/aft) "iRO" = ( @@ -20246,9 +20305,13 @@ /turf/open/floor/plasteel/cult, /area/lawoffice) "iSB" = ( -/obj/machinery/light/floor, -/turf/open/floor/plating/asteroid/snow/icemoon, -/area/icemoon/surface/outdoors) +/obj/structure/cable, +/obj/machinery/power/solar{ + id = "auxsolareast"; + name = "Port Auxiliary Solar Array" + }, +/turf/open/floor/plating/asteroid/snow/ice/icemoon/solarpanel, +/area/solar/port/fore) "iTP" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/carpet, @@ -20404,7 +20467,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 }, -/turf/open/floor/carpet, +/turf/open/floor/wood, /area/crew_quarters/dorms) "iZu" = ( /obj/machinery/firealarm{ @@ -20709,7 +20772,7 @@ /area/quartermaster/storage) "jjB" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, -/turf/open/floor/carpet, +/turf/open/floor/wood, /area/crew_quarters/dorms) "jjC" = ( /obj/structure/closet/crate, @@ -20776,7 +20839,7 @@ }, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, -/area/storage/atmos) +/area/maintenance/department/electrical) "jmU" = ( /obj/effect/turf_decal/tile/brown{ dir = 1 @@ -20898,10 +20961,11 @@ /turf/open/floor/plasteel/dark, /area/hallway/primary/fore) "jso" = ( -/obj/machinery/light/small{ - dir = 8 +/obj/machinery/power/smes{ + charge = 5e+006 }, -/turf/open/floor/circuit/off, +/obj/structure/cable, +/turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) "jsu" = ( /obj/structure/cable{ @@ -20952,11 +21016,11 @@ /turf/open/floor/plasteel/dark, /area/hallway/primary/fore) "jvV" = ( -/obj/machinery/mineral/stacking_unit_console{ - machinedir = 8 +/obj/structure/cable{ + icon_state = "0-2" }, -/turf/closed/wall, -/area/maintenance/disposal) +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/solar/port/fore) "jwc" = ( /obj/structure/cable{ icon_state = "1-2" @@ -21027,7 +21091,7 @@ name = "Starboard Solar Array" }, /turf/open/floor/plating/asteroid/snow/ice/icemoon/solarpanel, -/area/icemoon/surface/outdoors) +/area/solar/starboard/aft) "jxS" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /obj/structure/cable{ @@ -21122,22 +21186,6 @@ }, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) -"jAT" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/effect/landmark/start/assistant, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "jBk" = ( /obj/structure/cable{ icon_state = "1-2" @@ -21256,6 +21304,12 @@ /obj/effect/landmark/start/paramedic, /turf/open/floor/plasteel/white, /area/medical/paramedic) +"jEm" = ( +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/solar/starboard/aft) "jER" = ( /obj/machinery/vending/kink, /turf/open/floor/plating, @@ -21569,7 +21623,7 @@ }, /obj/effect/turf_decal/stripes/corner, /turf/open/floor/plasteel, -/area/storage/atmos) +/area/maintenance/department/electrical) "jOB" = ( /obj/structure/cable{ icon_state = "4-8" @@ -21604,6 +21658,12 @@ }, /turf/open/floor/plating, /area/engine/atmospherics_engine) +"jPf" = ( +/obj/machinery/computer/rdconsole/core{ + dir = 8 + }, +/turf/open/floor/circuit, +/area/science/lab) "jPh" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 @@ -21824,6 +21884,9 @@ "jWr" = ( /turf/closed/wall/r_wall, /area/storage/tech) +"jWw" = ( +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/solar/starboard/aft) "jWx" = ( /obj/structure/table/glass, /obj/item/stack/sheet/mineral/plasma, @@ -21882,7 +21945,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/carpet, +/turf/open/floor/wood, /area/crew_quarters/dorms) "jYS" = ( /obj/structure/chair{ @@ -21941,6 +22004,13 @@ /obj/machinery/smartfridge, /turf/open/floor/plasteel, /area/hydroponics) +"kbE" = ( +/obj/structure/chair/comfy/brown{ + color = "#596479"; + dir = 8 + }, +/turf/open/transparent/glass/reinforced, +/area/crew_quarters/fitness) "kbR" = ( /obj/structure/table, /obj/item/storage/firstaid/regular{ @@ -22027,15 +22097,18 @@ }, /turf/open/floor/plasteel, /area/storage/auxiliary) +"kdy" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/freezer, +/area/crew_quarters/dorms) "kdA" = ( /obj/structure/table/glass, /obj/machinery/firealarm{ dir = 4; pixel_x = -24 }, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, /turf/open/floor/plasteel/white, /area/science/lab) "kdM" = ( @@ -22124,24 +22197,11 @@ /turf/open/floor/carpet, /area/chapel/office) "kge" = ( -/obj/structure/window{ - dir = 8 - }, -/obj/structure/window{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ +/obj/structure/chair/comfy/brown{ + color = "#596479"; dir = 4 }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/landmark/start/assistant, -/turf/open/floor/plasteel, +/turf/open/transparent/glass/reinforced, /area/crew_quarters/fitness) "kgx" = ( /obj/structure/table, @@ -22245,6 +22305,14 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/fore) +"kjx" = ( +/obj/machinery/door/window/eastright{ + dir = 8; + name = "Robotics Surgery"; + req_access_txt = "29" + }, +/turf/open/floor/plasteel/dark, +/area/science/robotics/lab) "kkn" = ( /obj/structure/cable{ icon_state = "4-8" @@ -22412,7 +22480,7 @@ icon_state = "2-8" }, /turf/open/floor/plating/snowed/smoothed/icemoon, -/area/icemoon/surface/outdoors) +/area/solar/starboard/fore) "kol" = ( /obj/machinery/light{ dir = 1 @@ -22934,6 +23002,13 @@ }, /turf/open/floor/wood, /area/crew_quarters/bar) +"kHJ" = ( +/obj/structure/grille, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/open/floor/plating/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors) "kHP" = ( /obj/machinery/atmospherics/pipe/manifold/yellow/visible{ dir = 4 @@ -22963,6 +23038,12 @@ }, /turf/open/floor/plating, /area/maintenance/solars/port/fore) +"kIV" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 + }, +/turf/open/floor/wood, +/area/crew_quarters/dorms) "kJk" = ( /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 9 @@ -23063,7 +23144,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, @@ -23071,6 +23151,7 @@ dir = 4 }, /obj/structure/fans/tiny, +/obj/machinery/door/airlock/external/glass, /turf/open/floor/plasteel, /area/hallway/primary/port) "kMy" = ( @@ -23153,9 +23234,6 @@ /turf/open/floor/plasteel, /area/quartermaster/storage) "kPu" = ( -/obj/structure/window/plasma/reinforced{ - dir = 4 - }, /obj/structure/table, /obj/item/stack/sheet/metal/fifty, /obj/item/stack/sheet/metal/fifty, @@ -23166,6 +23244,9 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/structure/window/reinforced{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/engine/engineering) "kPA" = ( @@ -23227,9 +23308,6 @@ }, /turf/open/floor/plating/asteroid/snow/icemoon, /area/maintenance/aft/secondary) -"kRk" = ( -/turf/open/floor/plasteel/white, -/area/crew_quarters/dorms) "kRz" = ( /obj/structure/cable{ icon_state = "1-8" @@ -23363,6 +23441,13 @@ "kVO" = ( /turf/closed/wall, /area/hallway/primary/aft) +"kWz" = ( +/obj/machinery/door/airlock{ + id_tag = "Dorm6"; + name = "Room Five" + }, +/turf/open/floor/carpet/purple, +/area/crew_quarters/dorms) "kWC" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -23373,6 +23458,17 @@ /obj/machinery/door/airlock/maintenance, /turf/open/floor/plating, /area/maintenance/aft/secondary) +"kXL" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Snow Airlock" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/machinery/door/firedoor/border_only{ + dir = 1; + name = "north facing firelock" + }, +/turf/open/floor/plasteel, +/area/crew_quarters/dorms) "kXY" = ( /obj/structure/cable{ icon_state = "4-8" @@ -23486,7 +23582,7 @@ name = "Port Auxiliary Solar Array" }, /turf/open/floor/plating/asteroid/snow/ice/icemoon/solarpanel, -/area/icemoon/surface/outdoors) +/area/solar/starboard/fore) "lbv" = ( /obj/machinery/atmospherics/components/binary/pump, /obj/machinery/door/firedoor/border_only{ @@ -23495,6 +23591,19 @@ }, /turf/open/floor/plasteel/white, /area/science/xenobiology) +"lcv" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/light/floor, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors) "ldt" = ( /obj/structure/cable{ icon_state = "1-2" @@ -23593,15 +23702,15 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/door/airlock/public/glass{ - name = "Hydroponics"; - req_access_txt = "35" - }, /obj/machinery/door/firedoor/border_only{ dir = 1; name = "north facing firelock" }, /obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock{ + name = "Hydroponics"; + req_access_txt = "35" + }, /turf/open/floor/plasteel, /area/hydroponics) "lfD" = ( @@ -23621,6 +23730,12 @@ /obj/structure/closet/cardboard, /turf/open/floor/plating, /area/maintenance/starboard) +"lgg" = ( +/obj/structure/fluff/railing{ + dir = 5 + }, +/turf/open/transparent/openspace/icemoon, +/area/engine/atmospherics_engine) "lgn" = ( /obj/structure/cable{ icon_state = "1-2" @@ -23673,14 +23788,12 @@ /turf/open/floor/plasteel, /area/maintenance/aft) "lhr" = ( -/obj/structure/cable{ - icon_state = "0-8" +/obj/machinery/mineral/stacking_unit_console{ + machinedir = 1; + pixel_x = -30 }, -/obj/machinery/power/smes{ - charge = 5e+006 - }, -/turf/open/floor/circuit, -/area/ai_monitored/turret_protected/ai_upload) +/turf/open/floor/plasteel, +/area/maintenance/disposal) "lhB" = ( /obj/machinery/camera{ c_tag = "Northwestern Hall 7"; @@ -23710,29 +23823,27 @@ /obj/structure/cable{ icon_state = "2-8" }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, -/obj/effect/landmark/start/assistant, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 }, /turf/open/floor/plasteel, /area/crew_quarters/fitness) "liL" = ( -/obj/structure/cable{ - icon_state = "0-2" - }, /obj/machinery/ai_slipper{ uses = 10 }, -/obj/machinery/power/apc/highcap/five_k{ - areastring = "/area/ai_monitored/turret_protected/ai"; +/obj/machinery/door/window{ + base_state = "rightsecure"; dir = 4; - name = "AI Chamber APC"; - pixel_x = 24 + icon_state = "rightsecure"; + layer = 4.1; + name = "Secondary AI Core Access"; + obj_integrity = 300; + pixel_x = 4; + req_access_txt = "16" + }, +/obj/structure/cable{ + icon_state = "2-4" }, /turf/open/floor/circuit/off, /area/ai_monitored/turret_protected/ai) @@ -23757,11 +23868,11 @@ /turf/open/floor/pod/dark, /area/medical/paramedic) "lki" = ( -/obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, /obj/structure/fans/tiny, +/obj/machinery/door/airlock/external/glass, /turf/open/floor/plasteel, /area/hallway/primary/port) "lkP" = ( @@ -23992,7 +24103,7 @@ dir = 4 }, /turf/open/floor/plasteel, -/area/storage/atmos) +/area/maintenance/department/electrical) "lqW" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 @@ -24544,7 +24655,12 @@ dir = 4 }, /obj/effect/turf_decal/tile/neutral, -/obj/structure/weightmachine/stacklifter, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 9 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, /turf/open/floor/plasteel, /area/crew_quarters/fitness) "lJi" = ( @@ -24571,12 +24687,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/icemoon/surface/outdoors) -"lJN" = ( -/obj/machinery/light{ - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/crew_quarters/dorms) "lKT" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -24591,12 +24701,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/wood, /area/crew_quarters/theatre) -"lLv" = ( -/obj/structure/chair/comfy/beige{ - dir = 8 - }, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) "lLD" = ( /obj/structure/cable{ icon_state = "1-2" @@ -24672,6 +24776,19 @@ }, /turf/open/floor/carpet/orange, /area/engine/secure_construction) +"lOa" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Dormitory" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8; + name = "west facing firelock" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/crew_quarters/dorms) "lOs" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel, @@ -24716,27 +24833,35 @@ /obj/machinery/atmospherics/pipe/simple/orange/visible, /turf/open/floor/plasteel, /area/engine/atmospherics_engine) -"lQp" = ( +"lQd" = ( /obj/structure/cable{ - icon_state = "1-2" + icon_state = "4-8" }, -/obj/machinery/porta_turret/ai{ - dir = 4 +/obj/structure/cable{ + icon_state = "1-8" }, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/turret_protected/ai) +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/solar/starboard/aft) +"lQp" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1; + name = "waste relief valve" + }, +/turf/open/floor/plasteel, +/area/engine/atmos) "lQs" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/wood, /area/hallway/secondary/exit/departure_lounge) "lQJ" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 4 +/obj/structure/fluff/railing{ + dir = 9 }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) +/turf/open/transparent/openspace/icemoon, +/area/icemoon/surface/outdoors) "lRx" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 @@ -25107,7 +25232,9 @@ dir = 4 }, /obj/effect/turf_decal/tile/green, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark/side{ + dir = 5 + }, /area/hydroponics) "mbM" = ( /obj/effect/turf_decal/tile/blue{ @@ -25216,6 +25343,13 @@ }, /turf/open/floor/plasteel/white, /area/crew_quarters/heads/cmo) +"mfU" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Holodeck Door" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/wood, +/area/crew_quarters/dorms) "mgo" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/firedoor/border_only{ @@ -25391,7 +25525,7 @@ icon_state = "4-8" }, /turf/open/floor/plating/snowed/smoothed/icemoon, -/area/icemoon/surface/outdoors) +/area/solar/port/fore) "mmO" = ( /obj/structure/cable{ icon_state = "1-2" @@ -25475,11 +25609,11 @@ /turf/open/floor/plating, /area/medical/virology) "mps" = ( -/obj/machinery/atmospherics/components/binary/valve{ - dir = 4 +/obj/structure/chair/comfy/beige{ + dir = 8 }, -/turf/open/floor/plating/asteroid/snow/icemoon, -/area/icemoon/surface/outdoors) +/turf/open/floor/carpet, +/area/crew_quarters/dorms) "mqb" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 8 @@ -25499,6 +25633,15 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/aft) +"mqd" = ( +/obj/item/paper/fluff{ + info = "Crystal has been moved to a lockbox in secure storage until further notice."; + name = "Note from an engineer"; + pixel_x = -5; + pixel_y = 3 + }, +/turf/open/floor/engine, +/area/engine/supermatter) "mqm" = ( /obj/structure/cable{ icon_state = "1-2" @@ -25591,7 +25734,7 @@ /turf/open/floor/plating, /area/maintenance/aft/secondary) "mtP" = ( -/turf/open/floor/carpet, +/turf/open/floor/plasteel, /area/crew_quarters/dorms) "mtY" = ( /obj/structure/cable{ @@ -25846,17 +25989,28 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/quartermaster/miningdock) +"mEH" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/wood, +/area/crew_quarters/dorms) "mEI" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/eastright{ base_state = "left"; - dir = 2; + dir = 1; icon_state = "left"; name = "Chemistry Desk"; req_access_txt = "33" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/door/window/eastright{ + dir = 2; + name = "Chemistry Desk" + }, /turf/open/floor/plasteel/white, /area/medical/chemistry) "mFg" = ( @@ -25917,6 +26071,16 @@ /obj/machinery/space_heater, /turf/open/floor/plating, /area/icemoon/surface/outdoors) +"mHm" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/wood, +/area/crew_quarters/dorms) "mHT" = ( /obj/structure/closet/l3closet/scientist, /obj/item/extinguisher, @@ -26527,7 +26691,7 @@ }, /obj/structure/bed, /obj/effect/spawner/lootdrop/bedsheet, -/turf/open/floor/carpet, +/turf/open/floor/carpet/blue, /area/crew_quarters/dorms) "mWD" = ( /obj/structure/cable{ @@ -26618,6 +26782,10 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/machinery/door/window/eastright{ + dir = 1; + name = "Chemistry Desk" + }, /turf/open/floor/plasteel/white, /area/medical/chemistry) "mZk" = ( @@ -26635,7 +26803,11 @@ name = "Station Intercom (General)"; pixel_x = 30 }, -/turf/open/floor/carpet, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/wood, /area/crew_quarters/dorms) "nbr" = ( /obj/structure/cable{ @@ -26975,13 +27147,13 @@ /turf/open/floor/plating, /area/security/checkpoint/medical) "nlF" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Holodeck Door" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel/white, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/carpet, /area/crew_quarters/dorms) "nlM" = ( /obj/machinery/light{ @@ -26994,19 +27166,6 @@ /obj/machinery/rnd/production/techfab/department/cargo, /turf/open/floor/plasteel, /area/quartermaster/miningdock) -"nmL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/effect/landmark/start/assistant, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "nmM" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -27147,7 +27306,6 @@ /area/storage/auxiliary) "nrY" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, @@ -27155,7 +27313,8 @@ name = "south facing firelock" }, /obj/structure/fans/tiny, -/turf/open/floor/carpet, +/obj/machinery/door/airlock/external/glass, +/turf/open/floor/plasteel, /area/crew_quarters/dorms) "nsf" = ( /obj/machinery/door/firedoor, @@ -27244,6 +27403,12 @@ dir = 4; network = list("aicore") }, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "2-4" + }, /turf/open/floor/circuit/off, /area/ai_monitored/turret_protected/ai) "ntX" = ( @@ -27258,7 +27423,7 @@ }, /obj/machinery/power/tracker, /turf/open/floor/plating/asteroid/snow/ice/icemoon/solarpanel, -/area/icemoon/surface/outdoors) +/area/solar/starboard/fore) "nuJ" = ( /obj/structure/cable{ icon_state = "1-8" @@ -27362,7 +27527,7 @@ icon_state = "0-2" }, /turf/open/floor/plating/snowed/smoothed/icemoon, -/area/icemoon/surface/outdoors) +/area/solar/starboard/fore) "nyT" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall/r_wall, @@ -27450,7 +27615,7 @@ pixel_x = -24; specialfunctions = 4 }, -/turf/open/floor/carpet, +/turf/open/floor/carpet/blue, /area/crew_quarters/dorms) "nBk" = ( /obj/structure/cable{ @@ -27572,16 +27737,26 @@ /turf/open/floor/plasteel, /area/engine/engineering) "nDd" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/structure/closet/crate/engineering{ + name = "Antimatter Engine Crate" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/visible, -/obj/machinery/light/floor, -/turf/open/floor/plating/snowed/smoothed/icemoon, -/area/icemoon/surface/outdoors) +/obj/machinery/power/am_control_unit, +/obj/item/am_shielding_container, +/obj/item/am_shielding_container, +/obj/item/am_shielding_container, +/obj/item/am_shielding_container, +/obj/item/am_shielding_container, +/obj/item/am_shielding_container, +/obj/item/am_shielding_container, +/obj/item/am_shielding_container, +/obj/item/am_shielding_container, +/obj/item/am_shielding_container, +/obj/item/am_shielding_container, +/obj/item/am_shielding_container, +/obj/item/am_containment, +/obj/item/am_containment, +/turf/open/floor/carpet/orange, +/area/engine/secure_construction) "nDl" = ( /obj/structure/cable{ icon_state = "4-8" @@ -27597,8 +27772,21 @@ icon_state = "0-8" }, /obj/structure/grille, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plating/asteroid/snow/icemoon, /area/icemoon/surface/outdoors) +"nDN" = ( +/obj/machinery/atmospherics/pipe/simple/supply/visible{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/light/floor, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors) "nEa" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -27640,6 +27828,16 @@ }, /turf/open/floor/carpet, /area/hallway/primary/port) +"nEH" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/wood, +/area/crew_quarters/dorms) "nEI" = ( /obj/structure/dresser, /obj/machinery/camera{ @@ -27792,6 +27990,13 @@ /obj/machinery/atmospherics/pipe/simple/orange/visible, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) +"nJB" = ( +/obj/machinery/light, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/crew_quarters/dorms) "nJI" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/southleft{ @@ -27921,10 +28126,15 @@ /area/hallway/primary/port) "nOY" = ( /obj/machinery/camera{ - c_tag = "Dorms West"; + c_tag = "Dorms Northeast"; dir = 8 }, -/turf/open/floor/carpet, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = 24 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/wood, /area/crew_quarters/dorms) "nPd" = ( /obj/structure/cable{ @@ -28021,6 +28231,13 @@ /obj/machinery/atmospherics/pipe/simple/general/visible, /turf/closed/wall/r_wall, /area/science/mixing) +"nRA" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/chair/comfy/beige, +/turf/open/floor/carpet, +/area/crew_quarters/dorms) "nRS" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -28184,6 +28401,12 @@ }, /turf/open/floor/plasteel/dark, /area/security/main) +"nYd" = ( +/obj/machinery/atmospherics/components/binary/valve{ + dir = 4 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors) "nYv" = ( /obj/structure/chair{ dir = 8 @@ -28639,7 +28862,7 @@ dir = 4; name = "east facing firelock" }, -/turf/open/floor/plasteel, +/turf/open/floor/wood, /area/crew_quarters/fitness) "ojs" = ( /obj/structure/cable{ @@ -28824,6 +29047,18 @@ }, /turf/open/floor/engine/n2, /area/engine/atmos) +"onO" = ( +/obj/machinery/power/apc/highcap/five_k{ + areastring = "/area/ai_monitored/turret_protected/ai"; + dir = 4; + name = "AI Chamber APC"; + pixel_x = 24 + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/open/floor/circuit/off, +/area/ai_monitored/turret_protected/ai) "onY" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/green/visible{ @@ -28860,45 +29095,8 @@ /turf/open/floor/plasteel, /area/engine/break_room) "ooR" = ( -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/effect/landmark/start/ai, -/obj/item/radio/intercom{ - freerange = 1; - frequency = 1447; - name = "Private Channel"; - pixel_x = -25; - pixel_y = -10 - }, -/obj/item/radio/intercom{ - freerange = 1; - listening = 0; - name = "Custom Channel"; - pixel_y = 27 - }, -/obj/item/radio/intercom{ - freerange = 1; - name = "Common Channel"; - pixel_x = -25 - }, -/obj/machinery/button/door{ - id = "AI Chamber entrance shutters"; - name = "AI Chamber entrance shutters control"; - pixel_x = 8; - pixel_y = 23; - req_access_txt = "16" - }, -/obj/machinery/door/window{ - base_state = "rightsecure"; - dir = 4; - icon_state = "rightsecure"; - name = "Primary AI Core Access"; - obj_integrity = 300; - req_access_txt = "16" - }, -/turf/open/floor/circuit, -/area/ai_monitored/turret_protected/ai) +/turf/open/floor/plating/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/unexplored/rivers/no_monsters) "opq" = ( /obj/machinery/computer/rdservercontrol{ dir = 1 @@ -28917,11 +29115,8 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" - }, /obj/structure/fans/tiny, +/obj/machinery/door/airlock/external/glass, /turf/open/floor/plasteel, /area/maintenance/aft) "opY" = ( @@ -28995,6 +29190,10 @@ }, /turf/open/floor/plasteel, /area/security/checkpoint/medical) +"ord" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel, +/area/crew_quarters/dorms) "orN" = ( /obj/structure/cable{ icon_state = "2-4" @@ -29253,10 +29452,7 @@ /area/engine/engineering) "oBj" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" - }, +/obj/machinery/door/airlock/external/glass, /turf/open/floor/plasteel, /area/maintenance/aft) "oBl" = ( @@ -29281,7 +29477,7 @@ c_tag = "Dorms South"; dir = 4 }, -/turf/open/floor/carpet, +/turf/open/floor/wood, /area/crew_quarters/dorms) "oBF" = ( /obj/structure/cable{ @@ -29401,6 +29597,12 @@ }, /turf/open/floor/wood, /area/hallway/primary/central) +"oGZ" = ( +/obj/structure/fluff/railing{ + dir = 6 + }, +/turf/open/transparent/openspace/icemoon, +/area/engine/atmospherics_engine) "oHl" = ( /obj/structure/closet/crate/secure/engineering{ name = "TEG crate" @@ -29601,15 +29803,13 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) "oME" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/firealarm{ + dir = 4; + pixel_x = -24 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 4 - }, -/obj/machinery/light/floor, -/turf/open/floor/plating/snowed/smoothed/icemoon, -/area/icemoon/surface/outdoors) +/obj/machinery/vending/snack/random, +/turf/open/floor/wood, +/area/crew_quarters/dorms) "oNv" = ( /obj/structure/table/wood, /turf/open/floor/wood, @@ -29679,17 +29879,27 @@ /obj/effect/landmark/start/head_of_personnel, /turf/open/floor/carpet, /area/crew_quarters/heads/hop) +"oPk" = ( +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/solar/starboard/aft) "oPP" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/eastright{ base_state = "left"; - dir = 2; + dir = 1; icon_state = "left"; name = "Chemistry Desk"; req_access_txt = "33" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/door/window/eastright{ + dir = 2; + name = "Chemistry Desk" + }, /turf/open/floor/plasteel/white, /area/medical/chemistry) "oPS" = ( @@ -29798,6 +30008,12 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, /area/engine/storage) +"oUT" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/crew_quarters/dorms) "oUV" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -29994,17 +30210,7 @@ /turf/open/floor/plasteel, /area/storage/primary) "pbf" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 }, /turf/open/floor/plasteel, @@ -30085,13 +30291,11 @@ /turf/open/floor/carpet, /area/hallway/secondary/exit/departure_lounge) "pce" = ( -/obj/machinery/door/airlock/external{ - name = "Auxiliary Airlock" - }, /obj/machinery/door/firedoor/border_only{ name = "south facing firelock" }, /obj/structure/fans/tiny, +/obj/machinery/door/airlock/external/glass, /turf/open/floor/plating, /area/hallway/secondary/exit/departure_lounge) "pcl" = ( @@ -30233,23 +30437,11 @@ dir = 4 }, /obj/machinery/disposal/bin, -/turf/open/floor/carpet, +/turf/open/floor/wood, /area/crew_quarters/dorms) "pgk" = ( -/obj/structure/window{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/turf/open/floor/plasteel, +/obj/structure/table, +/turf/open/transparent/glass/reinforced, /area/crew_quarters/fitness) "pgp" = ( /turf/closed/wall, @@ -30419,7 +30611,7 @@ icon_state = "2-8" }, /turf/open/floor/plating/snowed/smoothed/icemoon, -/area/icemoon/surface/outdoors) +/area/solar/port/aft) "pkJ" = ( /turf/open/floor/wood{ icon_state = "wood-broken6" @@ -30553,6 +30745,13 @@ "pqj" = ( /turf/open/floor/plasteel, /area/hallway/primary/fore) +"pqm" = ( +/obj/machinery/camera{ + c_tag = "Dorms Northwest"; + dir = 4 + }, +/turf/open/floor/wood, +/area/crew_quarters/dorms) "pqs" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 @@ -30692,7 +30891,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/carpet, +/turf/open/floor/wood, /area/crew_quarters/dorms) "ptv" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/on/layer1, @@ -30705,6 +30904,16 @@ }, /turf/open/floor/engine, /area/engine/atmospherics_engine) +"ptH" = ( +/obj/machinery/computer/holodeck{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/wood, +/area/crew_quarters/dorms) "ptU" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ @@ -30718,7 +30927,7 @@ dir = 4 }, /obj/machinery/door/poddoor/preopen{ - id = "xenobio2"; + id = "xenobiospec"; name = "containment blast door" }, /turf/open/floor/engine, @@ -30887,6 +31096,15 @@ }, /turf/open/floor/circuit/telecomms/mainframe, /area/tcommsat/server) +"pvP" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/solar/starboard/aft) "pvV" = ( /obj/machinery/airalarm{ pixel_y = 26 @@ -30923,6 +31141,9 @@ /area/engine/storage) "pwE" = ( /obj/effect/landmark/start/cyborg, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat/service) "pwL" = ( @@ -31078,14 +31299,12 @@ /turf/open/floor/plasteel/freezer, /area/security/prison) "pze" = ( -/obj/machinery/door/airlock/external{ - name = "Auxiliary Airlock" - }, /obj/machinery/door/firedoor/border_only{ dir = 1; name = "north facing firelock" }, /obj/structure/fans/tiny, +/obj/machinery/door/airlock/external/glass, /turf/open/floor/plating, /area/quartermaster/miningdock) "pzk" = ( @@ -31176,6 +31395,11 @@ }, /turf/open/floor/wood, /area/crew_quarters/heads/captain) +"pDg" = ( +/obj/structure/table, +/obj/item/paicard, +/turf/open/floor/carpet, +/area/crew_quarters/dorms) "pDh" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 @@ -31346,8 +31570,12 @@ /turf/open/floor/plasteel, /area/storage/primary) "pIf" = ( -/turf/open/floor/plasteel/dark, -/area/science/robotics/lab) +/obj/machinery/vending/cigarette, +/turf/open/floor/wood, +/area/crew_quarters/dorms) +"pIs" = ( +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/solar/port/aft) "pIz" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 @@ -31376,6 +31604,18 @@ }, /turf/open/floor/plasteel/dark, /area/maintenance/department/bridge) +"pJm" = ( +/obj/structure/table/optable{ + name = "Robotics Operating Table" + }, +/obj/item/tank/internals/anesthetic, +/obj/item/clothing/mask/breath, +/obj/item/radio/intercom{ + name = "Station Intercom (General)"; + pixel_y = 29 + }, +/turf/open/floor/plasteel/dark, +/area/science/robotics/lab) "pJS" = ( /turf/closed/wall, /area/quartermaster/storage) @@ -31651,6 +31891,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 10 }, +/obj/machinery/light/floor, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) "pQg" = ( @@ -31806,7 +32047,6 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, @@ -31814,7 +32054,8 @@ name = "south facing firelock" }, /obj/structure/fans/tiny, -/turf/open/floor/carpet, +/obj/machinery/door/airlock/external/glass, +/turf/open/floor/plasteel, /area/crew_quarters/dorms) "pXl" = ( /obj/machinery/computer/cloning{ @@ -32022,7 +32263,7 @@ icon_state = "4-8" }, /turf/open/floor/plating/snowed/smoothed/icemoon, -/area/icemoon/surface/outdoors) +/area/solar/port/fore) "qfT" = ( /obj/machinery/holopad, /turf/open/floor/carpet, @@ -32103,6 +32344,10 @@ }, /turf/open/floor/engine, /area/engine/engineering) +"qim" = ( +/obj/machinery/light, +/turf/open/floor/wood, +/area/crew_quarters/dorms) "qip" = ( /obj/structure/disposalpipe/trunk{ dir = 8 @@ -32147,6 +32392,18 @@ }, /turf/open/floor/plasteel, /area/storage/primary) +"qjF" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/solar/starboard/aft) "qkg" = ( /obj/effect/turf_decal/tile/green{ dir = 4 @@ -32238,23 +32495,7 @@ /turf/closed/wall, /area/quartermaster/miningdock) "qnx" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/plasteel, +/turf/open/transparent/glass/reinforced, /area/crew_quarters/fitness) "qnC" = ( /obj/structure/cable, @@ -32338,7 +32579,7 @@ }, /obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/plasma, /turf/open/floor/plating, -/area/storage/atmos) +/area/maintenance/department/electrical) "qqo" = ( /obj/machinery/light{ dir = 4 @@ -32704,7 +32945,7 @@ }, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, -/area/storage/atmos) +/area/maintenance/department/electrical) "qAI" = ( /obj/structure/cable{ icon_state = "4-8" @@ -32731,6 +32972,13 @@ }, /turf/open/floor/carpet, /area/hallway/primary/central) +"qBl" = ( +/obj/machinery/mineral/ore_redemption{ + input_dir = 4; + output_dir = 8 + }, +/turf/open/floor/plating, +/area/quartermaster/miningdock) "qBu" = ( /obj/machinery/atmospherics/components/binary/pump, /turf/open/floor/plasteel, @@ -32867,7 +33115,7 @@ name = "Station Intercom (General)"; pixel_y = 29 }, -/turf/open/floor/carpet, +/turf/open/floor/carpet/blue, /area/crew_quarters/dorms) "qFZ" = ( /obj/structure/closet/emcloset, @@ -32948,12 +33196,19 @@ /area/hallway/primary/fore) "qHC" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/plating, /area/engine/atmos) "qHL" = ( -/obj/structure/chair/comfy/beige{ - dir = 1 +/obj/machinery/door/airlock/public/glass{ + name = "Dormitory" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4; + name = "east facing firelock" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 }, /turf/open/floor/carpet, /area/crew_quarters/dorms) @@ -32988,13 +33243,10 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/structure/chair/stool{ - pixel_y = 8 - }, /obj/machinery/camera{ - c_tag = "Dorms Central" + c_tag = "Dorms East" }, -/turf/open/floor/carpet, +/turf/open/floor/wood, /area/crew_quarters/dorms) "qIR" = ( /obj/machinery/button/massdriver{ @@ -33023,6 +33275,18 @@ /obj/effect/turf_decal/tile/green, /turf/open/floor/plasteel/white, /area/medical/virology) +"qIW" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/solar/starboard/aft) "qJs" = ( /obj/structure/chair, /obj/effect/turf_decal/stripes/line{ @@ -33076,9 +33340,6 @@ /turf/open/floor/plasteel/white, /area/science/xenobiology) "qKA" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -33086,6 +33347,9 @@ dir = 8 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 10 + }, /turf/open/floor/plasteel, /area/crew_quarters/fitness) "qKP" = ( @@ -33184,6 +33448,14 @@ }, /turf/open/floor/plasteel/freezer, /area/medical/surgery) +"qOJ" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/visible, +/obj/machinery/light/floor, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors) "qOL" = ( /obj/effect/landmark/event_spawn, /turf/open/floor/carpet, @@ -33337,6 +33609,12 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/port) +"qSF" = ( +/obj/structure/chair/comfy/beige{ + dir = 1 + }, +/turf/open/floor/carpet, +/area/crew_quarters/dorms) "qSJ" = ( /obj/machinery/airalarm{ pixel_y = 28 @@ -33527,6 +33805,12 @@ }, /turf/open/floor/engine, /area/engine/engineering) +"qZb" = ( +/obj/structure/fluff/railing{ + dir = 10 + }, +/turf/open/transparent/openspace/icemoon, +/area/engine/atmospherics_engine) "qZO" = ( /obj/machinery/atmospherics/pipe/simple/supply/visible{ dir = 4 @@ -33566,14 +33850,20 @@ /turf/closed/wall/r_wall, /area/maintenance/starboard) "raM" = ( -/obj/machinery/door/airlock/external, -/obj/machinery/door/firedoor/border_only{ - dir = 8; - name = "west facing firelock" +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "holoprivacy"; + name = "Holodeck Shutters" }, -/obj/structure/fans/tiny, /turf/open/floor/plating, /area/crew_quarters/dorms) +"rbb" = ( +/obj/machinery/space_heater, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/dorms) "rbg" = ( /obj/structure/disposalpipe/sorting/mail/flip{ dir = 8; @@ -34095,7 +34385,7 @@ name = "Starboard Solar Array" }, /turf/open/floor/plating/asteroid/snow/ice/icemoon/solarpanel, -/area/icemoon/surface/outdoors) +/area/solar/starboard/aft) "roS" = ( /obj/machinery/computer/card/minor/cmo{ dir = 4 @@ -34327,9 +34617,9 @@ /turf/open/floor/engine, /area/engine/engineering) "ruo" = ( -/obj/machinery/atmospherics/pipe/simple/supply/visible, -/turf/open/floor/plating/asteroid/snow/icemoon, -/area/icemoon/surface/outdoors) +/obj/machinery/vending/cola/random, +/turf/open/floor/wood, +/area/crew_quarters/dorms) "ruD" = ( /obj/machinery/airalarm{ dir = 1; @@ -34412,7 +34702,7 @@ name = "Port Solar Array" }, /turf/open/floor/plating/asteroid/snow/ice/icemoon/solarpanel, -/area/icemoon/surface/outdoors) +/area/solar/port/aft) "rxJ" = ( /obj/item/stack/cable_coil/random, /turf/open/floor/plating/asteroid/snow/icemoon, @@ -34547,7 +34837,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/portable_atmospherics/canister, /turf/open/floor/plasteel, /area/science/mixing) "rDE" = ( @@ -34570,6 +34859,18 @@ }, /turf/open/floor/plating, /area/maintenance/department/electrical) +"rEF" = ( +/obj/structure/bed, +/obj/effect/spawner/lootdrop/bedsheet, +/obj/machinery/button/door{ + id = "Dorm6"; + name = "Dorm Bolt Control"; + normaldoorcontrol = 1; + pixel_x = 25; + specialfunctions = 4 + }, +/turf/open/floor/carpet/purple, +/area/crew_quarters/dorms) "rFk" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/freezer, @@ -34705,6 +35006,12 @@ }, /turf/open/floor/circuit/off, /area/ai_monitored/turret_protected/ai) +"rKC" = ( +/obj/machinery/camera{ + c_tag = "Dorms West" + }, +/turf/open/floor/carpet, +/area/crew_quarters/dorms) "rLb" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -34804,28 +35111,16 @@ /turf/open/floor/plasteel, /area/hallway/primary/port) "rPU" = ( -/obj/machinery/conveyor{ - dir = 4; - id = "robo1" +/obj/machinery/light{ + dir = 8 }, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/glass{ - amount = 20; - pixel_x = -3; - pixel_y = 6 - }, -/turf/open/floor/plasteel/dark, -/area/science/robotics/lab) +/turf/open/floor/wood, +/area/crew_quarters/dorms) "rQs" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/hallway/primary/fore) "rQu" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, /obj/machinery/firealarm{ dir = 8; pixel_x = 24 @@ -34865,9 +35160,27 @@ /turf/open/floor/plasteel/white, /area/medical/chemistry) "rRk" = ( -/obj/structure/chair/comfy/beige, +/obj/machinery/door/airlock/public/glass{ + name = "Dormitory" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4; + name = "east facing firelock" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/carpet, /area/crew_quarters/dorms) +"rRQ" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/science/lab) "rRV" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 @@ -34936,6 +35249,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 }, +/obj/machinery/light/floor, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) "rTW" = ( @@ -35052,9 +35366,7 @@ /turf/open/floor/wood, /area/crew_quarters/bar) "rYc" = ( -/obj/machinery/computer/arcade/battle{ - dir = 8 - }, +/obj/machinery/vending/cigarette, /turf/open/floor/wood, /area/crew_quarters/bar) "rYi" = ( @@ -35100,6 +35412,13 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/port) +"sae" = ( +/obj/machinery/firealarm{ + dir = 8; + pixel_x = 24 + }, +/turf/open/floor/plasteel/dark, +/area/science/robotics/lab) "sat" = ( /obj/machinery/light, /turf/open/floor/plasteel/white, @@ -35184,6 +35503,12 @@ /turf/open/floor/plasteel, /area/maintenance/aft) "scF" = ( +/obj/machinery/turretid{ + icon_state = "control_stun"; + name = "AI Chamber turret control"; + pixel_x = 24; + pixel_y = -3 + }, /obj/structure/cable{ icon_state = "1-2" }, @@ -35674,6 +35999,16 @@ }, /turf/open/floor/engine/n2o, /area/engine/atmos) +"stP" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/grille, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/plating/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors) "stW" = ( /obj/structure/table/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -35688,7 +36023,7 @@ "sub" = ( /obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/co2, /turf/open/floor/plating, -/area/storage/atmos) +/area/maintenance/department/electrical) "sup" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -35751,14 +36086,8 @@ /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) "swQ" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/turf/open/floor/plating/asteroid/snow/icemoon, -/area/icemoon/surface/outdoors) +/turf/open/floor/wood, +/area/crew_quarters/dorms) "sxa" = ( /obj/machinery/requests_console{ department = "Medbay"; @@ -35963,20 +36292,16 @@ /turf/closed/wall/r_wall, /area/crew_quarters/heads/captain) "sFw" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 - }, /obj/machinery/light, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/effect/turf_decal/tile/blue{ +/obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel, /area/crew_quarters/fitness) "sGC" = ( @@ -36059,7 +36384,7 @@ /turf/open/floor/engine, /area/engine/engineering) "sIT" = ( -/obj/structure/reagent_dispensers/fueltank, +/obj/machinery/recharge_station, /turf/open/floor/pod/dark, /area/medical/paramedic) "sJs" = ( @@ -36091,9 +36416,6 @@ /turf/open/floor/plasteel/dark, /area/hallway/secondary/entry) "sKN" = ( -/obj/structure/window/plasma/reinforced{ - dir = 8 - }, /obj/machinery/rnd/production/circuit_imprinter, /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -36101,6 +36423,9 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/engine/engineering) "sLg" = ( @@ -36152,6 +36477,12 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) +"sLF" = ( +/obj/structure/sign/mining{ + pixel_x = 32 + }, +/turf/open/floor/plasteel, +/area/quartermaster/miningdock) "sLN" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /turf/open/floor/plasteel, @@ -36216,6 +36547,32 @@ name = "Robotics Lab APC"; pixel_x = 25 }, +/obj/structure/table, +/obj/item/storage/toolbox/mechanical{ + pixel_x = -2; + pixel_y = -1 + }, +/obj/item/storage/toolbox/electrical{ + pixel_x = 1; + pixel_y = 6 + }, +/obj/item/clothing/head/welding{ + pixel_x = -3; + pixel_y = 5 + }, +/obj/item/clothing/head/welding{ + pixel_x = -3; + pixel_y = 5 + }, +/obj/item/clothing/glasses/welding, +/obj/item/clothing/glasses/welding, +/obj/item/multitool{ + pixel_x = 3 + }, +/obj/item/multitool{ + pixel_x = 3 + }, +/obj/item/storage/belt/utility, /turf/open/floor/plasteel/white, /area/science/robotics/lab) "sOi" = ( @@ -36310,6 +36667,15 @@ }, /turf/open/floor/plating/asteroid/snow/icemoon, /area/icemoon/surface/outdoors) +"sQk" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/solar/starboard/aft) "sRh" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 @@ -36396,8 +36762,24 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "sTq" = ( +/obj/structure/fluff/railing{ + dir = 1 + }, /turf/open/transparent/openspace/icemoon, /area/engine/atmospherics_engine) +"sTt" = ( +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = -6; + pixel_y = 4 + }, +/obj/item/pen/fourcolor, +/obj/item/paper_bin/bundlenatural{ + pixel_x = 6; + pixel_y = 4 + }, +/turf/open/floor/carpet, +/area/crew_quarters/dorms) "sTz" = ( /obj/effect/turf_decal/bot_white, /obj/structure/window/reinforced{ @@ -36884,22 +37266,9 @@ /turf/open/floor/plasteel/dark, /area/hallway/primary/fore) "tgd" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/structure/window{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, /turf/open/floor/plasteel, /area/crew_quarters/fitness) "tht" = ( @@ -37181,7 +37550,7 @@ icon_state = "1-8" }, /turf/open/floor/plating/snowed/smoothed/icemoon, -/area/icemoon/surface/outdoors) +/area/solar/port/aft) "tod" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -37288,6 +37657,7 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, +/obj/machinery/light/floor, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) "tqp" = ( @@ -37357,7 +37727,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/carpet, +/turf/open/floor/wood, /area/crew_quarters/dorms) "ttl" = ( /obj/structure/cable{ @@ -37555,6 +37925,18 @@ }, /turf/open/floor/plasteel, /area/quartermaster/miningoffice) +"tzb" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/power/terminal{ + dir = 1 + }, +/turf/open/floor/circuit/off, +/area/ai_monitored/turret_protected/ai) "tzB" = ( /obj/machinery/atmospherics/pipe/simple{ dir = 6 @@ -37749,6 +38131,12 @@ /obj/machinery/atmospherics/components/binary/pump/on, /turf/open/floor/plasteel, /area/engine/atmos) +"tEC" = ( +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/solar/port/aft) "tEQ" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -37776,11 +38164,12 @@ /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) "tFu" = ( -/obj/structure/cable{ - icon_state = "2-4" +/obj/item/radio/intercom{ + name = "Station Intercom (General)"; + pixel_x = 30 }, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/turret_protected/ai) +/turf/open/floor/wood, +/area/crew_quarters/dorms) "tFN" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 4 @@ -37816,11 +38205,9 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/door/airlock/external{ - name = "Escape Airlock" - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/structure/fans/tiny, +/obj/machinery/door/airlock/external/glass, /turf/open/floor/carpet, /area/hallway/primary/port) "tHr" = ( @@ -37894,9 +38281,12 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) "tJi" = ( -/obj/machinery/vending/wardrobe/robo_wardrobe, -/turf/open/floor/plasteel/white, -/area/science/robotics/lab) +/obj/structure/closet/secure_closet/personal/cabinet, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/carpet/purple, +/area/crew_quarters/dorms) "tJA" = ( /obj/structure/cable{ icon_state = "1-2" @@ -37966,6 +38356,16 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel, /area/quartermaster/miningoffice) +"tLb" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/visible{ + dir = 4 + }, +/obj/machinery/light/floor, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors) "tLA" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -38109,17 +38509,14 @@ /turf/open/floor/plasteel/freezer, /area/medical/surgery) "tOz" = ( -/obj/machinery/light{ - dir = 1 +/obj/machinery/firealarm{ + dir = 4; + pixel_x = -24 }, -/obj/machinery/door/airlock/public/glass{ - name = "Holodeck Door" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 6 }, -/obj/structure/fans/tiny, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/turf/open/floor/plasteel/white, +/turf/open/floor/wood, /area/crew_quarters/dorms) "tOE" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -38140,10 +38537,12 @@ name = "Fitness Room APC"; pixel_y = -24 }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/structure/cable{ + icon_state = "1-4" + }, /turf/open/floor/plasteel, /area/crew_quarters/fitness) "tPB" = ( @@ -38231,18 +38630,11 @@ /turf/open/floor/plasteel/dark, /area/maintenance/department/bridge) "tRC" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/obj/structure/window{ - dir = 8 +/obj/structure/cable{ + icon_state = "4-8" }, /turf/open/floor/plasteel, /area/crew_quarters/fitness) @@ -38270,11 +38662,13 @@ /turf/open/floor/plasteel/white, /area/science/xenobiology) "tSd" = ( -/obj/structure/cable{ - icon_state = "2-8" +/obj/item/radio/intercom{ + dir = 4; + name = "Station Intercom (General)"; + pixel_y = 29 }, -/turf/closed/wall/r_wall, -/area/ai_monitored/turret_protected/ai) +/turf/open/floor/carpet/purple, +/area/crew_quarters/dorms) "tSB" = ( /obj/machinery/atmospherics/pipe/simple{ dir = 4 @@ -38350,6 +38744,12 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) +"tUq" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/open/floor/wood, +/area/crew_quarters/dorms) "tUF" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -38409,6 +38809,17 @@ }, /turf/open/floor/plasteel, /area/science/robotics/mechbay) +"tWs" = ( +/obj/machinery/door/airlock/external/glass, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only{ + name = "south facing firelock" + }, +/obj/structure/fans/tiny, +/turf/open/floor/plasteel, +/area/crew_quarters/dorms) "tXn" = ( /obj/structure/cable{ icon_state = "4-8" @@ -38431,7 +38842,7 @@ pixel_x = -24; specialfunctions = 4 }, -/turf/open/floor/carpet, +/turf/open/floor/carpet/blue, /area/crew_quarters/dorms) "tYT" = ( /obj/structure/cable{ @@ -38720,7 +39131,7 @@ /area/engine/atmos) "ugk" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/carpet, +/turf/open/floor/wood, /area/crew_quarters/dorms) "uha" = ( /obj/structure/cable{ @@ -38803,7 +39214,7 @@ /obj/machinery/door/firedoor/border_only{ name = "south facing firelock" }, -/turf/open/floor/carpet, +/turf/open/floor/carpet/blue, /area/crew_quarters/dorms) "ukJ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -38814,6 +39225,10 @@ }, /turf/open/floor/plasteel/freezer, /area/crew_quarters/kitchen) +"ule" = ( +/obj/structure/sign/departments/botany, +/turf/closed/wall, +/area/hydroponics) "ulh" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 @@ -38862,14 +39277,14 @@ /turf/open/floor/plating, /area/crew_quarters/heads/hop) "umC" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, /obj/effect/turf_decal/tile/neutral, +/obj/structure/cable{ + icon_state = "2-4" + }, /turf/open/floor/plasteel, /area/crew_quarters/fitness) "umD" = ( @@ -38892,7 +39307,7 @@ dir = 4 }, /obj/structure/closet/wardrobe/white, -/turf/open/floor/carpet, +/turf/open/floor/wood, /area/crew_quarters/dorms) "unA" = ( /obj/effect/spawner/structure/window/reinforced, @@ -39031,7 +39446,7 @@ /obj/structure/cable, /obj/machinery/power/smes, /turf/open/floor/plating, -/area/storage/atmos) +/area/maintenance/department/electrical) "utS" = ( /obj/structure/table, /obj/item/clothing/suit/apron/surgical, @@ -39046,11 +39461,18 @@ }, /turf/open/floor/plasteel/freezer, /area/medical/surgery) +"utY" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/wood, +/area/crew_quarters/dorms) "uup" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, -/area/storage/atmos) +/area/maintenance/department/electrical) "uut" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 @@ -39105,13 +39527,9 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/effect/landmark/start/assistant, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 }, /turf/open/floor/plasteel, /area/crew_quarters/fitness) @@ -39194,6 +39612,12 @@ }, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) +"uyV" = ( +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/solar/port/aft) "uyW" = ( /obj/structure/cable{ icon_state = "0-4" @@ -39384,13 +39808,13 @@ name = "Dormitory APC"; pixel_y = 24 }, -/turf/open/floor/carpet, +/turf/open/floor/wood, /area/crew_quarters/dorms) "uFq" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, -/obj/machinery/door/airlock/external{ +/obj/machinery/door/airlock/external/glass{ name = "Arrivals Airlock" }, /turf/open/floor/plating, @@ -39566,12 +39990,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/structure/window/plasma/reinforced{ - dir = 4 - }, -/obj/structure/window/plasma/reinforced{ - dir = 1 - }, /obj/structure/table, /obj/item/stack/sheet/glass/fifty, /obj/item/stack/sheet/glass/fifty, @@ -39582,6 +40000,12 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/engine/engineering) "uKy" = ( @@ -39769,12 +40193,14 @@ /obj/structure/cable, /obj/machinery/power/tracker, /turf/open/floor/plating/asteroid/snow/ice/icemoon/solarpanel, -/area/icemoon/surface/outdoors) +/area/solar/starboard/aft) "uRg" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/closet/bombcloset, -/turf/open/floor/plasteel/white, -/area/science/mixing) +/obj/machinery/door/airlock{ + id_tag = "Dorm7"; + name = "Room Six" + }, +/turf/open/floor/carpet/purple, +/area/crew_quarters/dorms) "uRi" = ( /obj/structure/cable{ icon_state = "4-8" @@ -39843,8 +40269,14 @@ /turf/open/floor/plasteel, /area/engine/atmos) "uUi" = ( -/obj/machinery/computer/operating, -/turf/open/floor/plasteel/white, +/obj/machinery/mecha_part_fabricator, +/obj/item/stack/sheet/glass{ + amount = 20; + pixel_x = -3; + pixel_y = 6 + }, +/obj/item/stack/sheet/metal/fifty, +/turf/open/floor/plasteel/dark, /area/science/robotics/lab) "uUk" = ( /obj/structure/disposalpipe/segment{ @@ -39937,6 +40369,7 @@ "uWn" = ( /obj/structure/table, /obj/item/toy/cards/deck, +/obj/item/storage/crayons, /turf/open/floor/plasteel/grimy, /area/crew_quarters/fitness/recreation) "uWo" = ( @@ -39968,6 +40401,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/light/floor, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) "uWW" = ( @@ -40246,11 +40680,9 @@ /turf/open/floor/circuit, /area/science/robotics/mechbay) "vdW" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/turf/closed/wall/r_wall, -/area/ai_monitored/turret_protected/ai_upload) +/obj/structure/table/wood, +/turf/open/floor/carpet/purple, +/area/crew_quarters/dorms) "vem" = ( /obj/structure/table/wood, /obj/machinery/keycard_auth{ @@ -40268,7 +40700,7 @@ codes_txt = "patrol;next_patrol=CHW"; location = "Dorm" }, -/turf/open/floor/carpet, +/turf/open/floor/wood, /area/crew_quarters/dorms) "veF" = ( /obj/structure/table/wood, @@ -40407,7 +40839,7 @@ /obj/machinery/light{ dir = 1 }, -/turf/open/floor/carpet, +/turf/open/floor/wood, /area/crew_quarters/dorms) "vhf" = ( /obj/effect/spawner/structure/window/reinforced, @@ -40485,6 +40917,11 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/fore) +"vko" = ( +/obj/machinery/atmospherics/pipe/simple/supply/visible, +/obj/machinery/light/floor, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors) "vkw" = ( /obj/structure/cable{ icon_state = "1-2" @@ -40608,13 +41045,10 @@ /turf/open/floor/plasteel, /area/quartermaster/storage) "vow" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Holodeck Door" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/turf/open/floor/plasteel/white, +/turf/open/floor/wood, /area/crew_quarters/dorms) "voD" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -40703,7 +41137,7 @@ pixel_x = -24; specialfunctions = 4 }, -/turf/open/floor/carpet, +/turf/open/floor/carpet/blue, /area/crew_quarters/dorms) "vqZ" = ( /obj/structure/window/plasma/reinforced{ @@ -40736,7 +41170,7 @@ "vrg" = ( /obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/n2o, /turf/open/floor/plating, -/area/storage/atmos) +/area/maintenance/department/electrical) "vrx" = ( /turf/closed/wall/r_wall, /area/crew_quarters/dorms) @@ -40812,7 +41246,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/carpet, +/turf/open/floor/wood, /area/crew_quarters/dorms) "vuk" = ( /obj/effect/spawner/structure/window/plasma/reinforced, @@ -41015,11 +41449,17 @@ /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) "vzS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/visible{ - dir = 5 +/obj/structure/bed, +/obj/effect/spawner/lootdrop/bedsheet, +/obj/machinery/button/door{ + id = "Dorm7"; + name = "Dorm Bolt Control"; + normaldoorcontrol = 1; + pixel_x = 25; + specialfunctions = 4 }, -/turf/open/floor/plating/snowed/smoothed/icemoon, -/area/icemoon/surface/outdoors) +/turf/open/floor/carpet/purple, +/area/crew_quarters/dorms) "vAh" = ( /obj/structure/cable{ icon_state = "1-2" @@ -41193,12 +41633,12 @@ icon_state = "4-8" }, /turf/open/floor/plating/snowed/smoothed/icemoon, -/area/icemoon/surface/outdoors) +/area/solar/starboard/aft) "vDI" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 6 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 }, -/turf/open/floor/carpet, +/turf/open/floor/wood, /area/crew_quarters/dorms) "vEd" = ( /obj/effect/landmark/event_spawn, @@ -41208,7 +41648,7 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/carpet, +/turf/open/floor/wood, /area/crew_quarters/dorms) "vEi" = ( /obj/structure/cable{ @@ -41295,6 +41735,7 @@ c_tag = "Northwest Paramedic Post"; network = list("ss13","medbay") }, +/obj/item/wrench/medical, /turf/open/floor/plasteel/white, /area/medical/paramedic) "vFe" = ( @@ -41306,6 +41747,18 @@ "vFM" = ( /turf/open/floor/plasteel, /area/quartermaster/sorting) +"vFT" = ( +/obj/structure/bed, +/obj/effect/spawner/lootdrop/bedsheet, +/obj/machinery/button/door{ + id = "Dorm5"; + name = "Dorm Bolt Control"; + normaldoorcontrol = 1; + pixel_x = 25; + specialfunctions = 4 + }, +/turf/open/floor/carpet/purple, +/area/crew_quarters/dorms) "vGi" = ( /obj/structure/cable{ icon_state = "1-2" @@ -41319,6 +41772,8 @@ /area/medical/virology) "vGn" = ( /obj/machinery/light, +/obj/vehicle/ridden/atv/snowmobile, +/obj/item/key, /turf/open/floor/pod/dark, /area/medical/paramedic) "vHU" = ( @@ -41430,17 +41885,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/structure/table, -/obj/item/paper_bin{ - pixel_x = -6; - pixel_y = 4 - }, -/obj/item/pen/fourcolor, -/obj/item/paper_bin/bundlenatural{ - pixel_x = 6; - pixel_y = 4 - }, -/turf/open/floor/carpet, +/turf/open/floor/wood, /area/crew_quarters/dorms) "vKO" = ( /obj/effect/spawner/structure/window/reinforced, @@ -41457,16 +41902,15 @@ /turf/open/floor/plating, /area/bridge) "vKP" = ( -/obj/structure/weightmachine/stacklifter, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, /obj/machinery/computer/security/telescreen/entertainment{ pixel_y = -32 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel, /area/crew_quarters/fitness) "vKT" = ( @@ -41477,7 +41921,7 @@ dir = 1 }, /turf/open/floor/plating, -/area/storage/atmos) +/area/maintenance/department/electrical) "vLa" = ( /obj/structure/cable{ icon_state = "4-8" @@ -41601,6 +42045,10 @@ pixel_x = 3; pixel_y = 3 }, +/obj/item/reagent_containers/glass/beaker/cryoxadone{ + pixel_x = 5; + pixel_y = 9 + }, /turf/open/floor/plasteel/white, /area/medical/paramedic) "vNY" = ( @@ -41669,15 +42117,15 @@ dir = 8 }, /area/chapel/main) -"vQk" = ( -/obj/machinery/computer/holodeck{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/crew_quarters/dorms) "vQo" = ( /turf/closed/wall/r_wall, /area/engine/supermatter) +"vQz" = ( +/obj/structure/extinguisher_cabinet{ + pixel_x = -27 + }, +/turf/open/floor/wood, +/area/crew_quarters/dorms) "vQW" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ @@ -41718,13 +42166,11 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/structure/disposalpipe/sorting/mail/flip{ dir = 4; sortType = 26 }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/plasteel, /area/crew_quarters/fitness) "vSg" = ( @@ -41875,6 +42321,22 @@ }, /turf/open/floor/plating, /area/maintenance/department/electrical) +"vVJ" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Dormitory" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8; + name = "west facing firelock" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/carpet, +/area/crew_quarters/dorms) "vVN" = ( /obj/effect/turf_decal/bot, /obj/structure/window/reinforced{ @@ -41887,7 +42349,7 @@ /area/crew_quarters/fitness) "vVZ" = ( /obj/structure/closet/secure_closet/personal/cabinet, -/turf/open/floor/carpet, +/turf/open/floor/carpet/blue, /area/crew_quarters/dorms) "vWg" = ( /obj/effect/turf_decal/delivery, @@ -42232,11 +42694,11 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "weS" = ( -/obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, /obj/structure/fans/tiny, +/obj/machinery/door/airlock/external/glass, /turf/open/floor/plating, /area/hallway/primary/aft) "wfN" = ( @@ -42262,7 +42724,7 @@ /obj/machinery/door/firedoor/border_only{ name = "south facing firelock" }, -/turf/open/floor/carpet, +/turf/open/floor/carpet/blue, /area/crew_quarters/dorms) "wgu" = ( /obj/machinery/atmospherics/pipe/simple/supply/visible{ @@ -42281,6 +42743,20 @@ /obj/structure/chair/stool/bar, /turf/open/floor/wood, /area/crew_quarters/bar) +"wgM" = ( +/obj/structure/sink{ + dir = 8; + pixel_x = -12; + pixel_y = 2 + }, +/obj/structure/mirror{ + pixel_x = -28 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/freezer, +/area/crew_quarters/dorms) "wha" = ( /obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/n2o{ dir = 1 @@ -42733,7 +43209,7 @@ name = "Port Auxiliary Solar Array" }, /turf/open/floor/plating/asteroid/snow/ice/icemoon/solarpanel, -/area/icemoon/surface/outdoors) +/area/solar/starboard/fore) "wuQ" = ( /obj/structure/table, /obj/machinery/plantgenes{ @@ -42925,7 +43401,7 @@ req_access_txt = "12;24" }, /turf/open/floor/plasteel, -/area/storage/atmos) +/area/maintenance/department/electrical) "wEm" = ( /obj/structure/barricade/wooden{ max_integrity = 10; @@ -43174,6 +43650,12 @@ /obj/machinery/chem_master/condimaster, /turf/open/floor/plasteel, /area/hydroponics) +"wMH" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/solar/starboard/aft) "wMJ" = ( /obj/structure/closet/secure_closet/bar{ req_access_txt = "25" @@ -43229,7 +43711,8 @@ icon_state = "4-8" }, /obj/effect/landmark/event_spawn, -/turf/open/floor/plasteel/white, +/obj/effect/landmark/start/roboticist, +/turf/open/floor/plasteel/dark, /area/science/robotics/lab) "wPT" = ( /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, @@ -43331,11 +43814,9 @@ /turf/open/floor/plasteel/dark, /area/security/prison) "wSc" = ( -/obj/machinery/door/airlock/external{ - name = "Escape Airlock" - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/structure/fans/tiny, +/obj/machinery/door/airlock/external/glass, /turf/open/floor/carpet, /area/hallway/primary/port) "wSy" = ( @@ -43562,6 +44043,7 @@ /obj/machinery/light{ dir = 1 }, +/obj/machinery/vending/cigarette, /turf/open/floor/plasteel, /area/hallway/primary/fore) "xaS" = ( @@ -43613,22 +44095,10 @@ /turf/open/floor/plasteel, /area/hallway/primary/fore) "xcL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/structure/window{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, /turf/open/floor/plasteel, /area/crew_quarters/fitness) "xcY" = ( @@ -43658,6 +44128,14 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/central) +"xdr" = ( +/obj/item/storage/backpack/duffelbag/med/surgery, +/obj/structure/table, +/obj/structure/extinguisher_cabinet{ + pixel_y = 30 + }, +/turf/open/floor/plasteel/dark, +/area/science/robotics/lab) "xdD" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ dir = 4 @@ -43666,9 +44144,6 @@ /turf/open/floor/plasteel, /area/engine/atmos) "xeI" = ( -/obj/machinery/conveyor_switch/oneway{ - id = "robo1" - }, /obj/structure/disposalpipe/segment{ dir = 9 }, @@ -43680,8 +44155,13 @@ /turf/open/floor/plasteel, /area/engine/atmos) "xfs" = ( -/obj/structure/table, -/obj/item/paicard, +/obj/machinery/door/airlock/public/glass{ + name = "Dormitory" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4; + name = "east facing firelock" + }, /turf/open/floor/carpet, /area/crew_quarters/dorms) "xfD" = ( @@ -43819,10 +44299,10 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, -/obj/machinery/door/airlock/external{ - name = "Escape Airlock" - }, /obj/structure/fans/tiny, +/obj/machinery/door/airlock/external/glass{ + name = "Arrivals Airlock" + }, /turf/open/floor/plating, /area/hallway/secondary/exit/departure_lounge) "xka" = ( @@ -43885,6 +44365,7 @@ /obj/machinery/light{ dir = 4 }, +/obj/machinery/vending/wardrobe/robo_wardrobe, /turf/open/floor/plasteel/white, /area/science/robotics/lab) "xmr" = ( @@ -44092,7 +44573,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/science/robotics/lab) "xtV" = ( /obj/structure/cable{ @@ -44104,6 +44585,7 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, +/obj/machinery/light/floor, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) "xui" = ( @@ -44242,11 +44724,8 @@ /turf/open/floor/engine/plasma, /area/engine/atmos) "xAv" = ( -/obj/machinery/atmospherics/pipe/simple/supply/visible{ - dir = 6 - }, -/turf/open/floor/plating/asteroid/snow/icemoon, -/area/icemoon/surface/outdoors) +/turf/open/floor/carpet, +/area/crew_quarters/dorms) "xBi" = ( /obj/structure/cable{ icon_state = "4-8" @@ -44857,6 +45336,7 @@ /obj/structure/disposalpipe/trunk{ dir = 4 }, +/obj/machinery/disposal/bin, /turf/open/floor/wood, /area/crew_quarters/bar) "xUD" = ( @@ -44919,6 +45399,10 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/port) +"xWI" = ( +/obj/machinery/vending/cigarette, +/turf/open/floor/plasteel, +/area/hallway/primary/port) "xXS" = ( /obj/machinery/rnd/server, /obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{ @@ -45156,7 +45640,7 @@ icon_state = "2-8" }, /turf/open/floor/plating/snowed/smoothed/icemoon, -/area/icemoon/surface/outdoors) +/area/solar/port/aft) "ygB" = ( /obj/structure/cable{ icon_state = "2-8" @@ -45218,6 +45702,9 @@ icon_state = "1-8" }, /obj/effect/landmark/start/cyborg, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat/service) "yiZ" = ( @@ -51538,17 +52025,17 @@ qrR qrR bTC avT -lbu -aQK -wuC +aPE +fne +iSB avT -lbu -aQK -wuC +aPE +fne +iSB avT -lbu -aQK -wuC +aPE +fne +iSB avT wuf yhx @@ -51795,17 +52282,17 @@ qrR qrR bTC avT -lbu +aPE qfJ -wuC +iSB avT -lbu +aPE qfJ -wuC +iSB avT -lbu +aPE qfJ -wuC +iSB avT avT avT @@ -51853,7 +52340,7 @@ ydp ydp buI hnP -swQ +phs ghq ghq ghq @@ -52052,17 +52539,17 @@ qrR qrR bTC avT -lbu +aPE qfJ -wuC +iSB avT -lbu +aPE qfJ -wuC +iSB avT -lbu +aPE qfJ -wuC +iSB avT avT avT @@ -52110,14 +52597,14 @@ ydp ydp buI buJ -cXI +ghq ghq hfZ shR ntV jso -shR -shR +tzb +iru hfZ ghq ghq @@ -52309,17 +52796,17 @@ avT avT avT avT -lbu +aPE qfJ -wuC +iSB avT -lbu +aPE qfJ -wuC +iSB avT -lbu +aPE qfJ -wuC +iSB avT avT yhx @@ -52367,14 +52854,14 @@ ydp bTC buI buJ -cXI +ghq ghq shR shR -shR +onO liL scF -hse +lfD shR ghq ghq @@ -52566,17 +53053,17 @@ wuf wuf avT avT -lbu +aPE qfJ -wuC +iSB avT -lbu +aPE qfJ -wuC +iSB avT -lbu +aPE qfJ -wuC +iSB avT wBg avT @@ -52585,12 +53072,12 @@ vrd vrd vrd vrd +nbC +nbC +nbC +nbC yhx -yhx -yhx -yhx -yhx -yhx +nbC yhx yhx yhx @@ -52624,12 +53111,12 @@ ydp buI fJZ phs -cXI +ghq ghq shR shR cpe -cpe +cUs cpe xIJ shR @@ -52824,15 +53311,15 @@ avT avT avT avT -hGK +guI avT avT avT -hGK +guI avT avT avT -hGK +guI avT aNg chZ @@ -52847,12 +53334,12 @@ avT avT avT avT +nbC +nbC +nbC +nbC yhx -yhx -yhx -yhx -yhx -yhx +nbC ydp ydp ydp @@ -52881,7 +53368,7 @@ ydp buI lGy ghq -cXI +ghq aJC shR qVf @@ -53077,21 +53564,21 @@ yhx yhx wuf avT -nuu -sXy -sXy -fNh -xUL -nyq -sXy -fNh -xUL -nyq -sXy -fNh -xUL -nyq -sXy +aKa +aPC +aPC +cXI +hrS +jvV +aPC +cXI +hrS +jvV +aPC +cXI +hrS +jvV +aPC eWw tnL iaq @@ -53138,12 +53625,12 @@ avT buI gJx ghq -cXI +ghq irN irr xIJ cpe -ooR +ghq cpe xIJ irr @@ -53338,15 +53825,15 @@ avT avT avT avT -clq +hse avT avT avT -clq +hse avT avT avT -clq +hse avT aNg chZ @@ -53395,9 +53882,9 @@ avT buI phs ghq -cXI +ghq +irr irr -tFu hmC rBA dfy @@ -53594,17 +54081,17 @@ fBG wuf avT avT -lbu +aPE mmM -wuC +iSB avT -lbu +aPE mmM -wuC +iSB avT -lbu +aPE mmM -wuC +iSB avT ajl avT @@ -53613,10 +54100,10 @@ vrd vrd vrd vrd -yhx -yhx -yhx -yhx +nbC +nbC +nbC +nbC bBh avT avT @@ -53643,7 +54130,7 @@ avT avT avT avT -bmX +avT avT avT avT @@ -53652,8 +54139,8 @@ ayq ghq ghq ghq -tSd -lQp +ghq +vmr rQu rKd gHG @@ -53851,17 +54338,17 @@ qrR qrR avT avT -lbu +aPE mmM -wuC +iSB avT -lbu +aPE mmM -wuC +iSB avT -lbu +aPE mmM -wuC +iSB avT avT avT @@ -53873,7 +54360,7 @@ yhx yhx yhx yhx -yhx +nbC rUq sXy sXy @@ -54108,17 +54595,17 @@ qrR qrR wuf avT -lbu +aPE mmM -wuC +iSB avT -lbu +aPE mmM -wuC +iSB avT -lbu +aPE mmM -wuC +iSB avT avT avT @@ -54130,13 +54617,13 @@ yhx yhx yhx yhx +nbC +nbC +nbC +nbC yhx -yhx -yhx -yhx -yhx -yhx -yhx +nbC +nbC avT avT avT @@ -54152,7 +54639,7 @@ ydp avT avT avT -avT +bmX apJ apJ apJ @@ -54176,7 +54663,7 @@ cwT aAC mGl grZ -vdW +cIh ghq bUB bJf @@ -54365,17 +54852,17 @@ qrR qrR wuf avT -lbu +aPE mmM -wuC +iSB avT -lbu +aPE mmM -wuC +iSB avT -lbu +aPE mmM -wuC +iSB avT avT avT @@ -54393,7 +54880,7 @@ yhx yhx yhx yhx -yhx +nbC avT avT avT @@ -54433,7 +54920,7 @@ hva vZH lac iMX -lhr +cIh ghq bUB bJf @@ -54483,7 +54970,7 @@ wuf avT avT avT -bBh +fUc avT avT avT @@ -54622,17 +55109,17 @@ qrR qrR wuf avT -lbu -gTh -wuC +aPE +huF +iSB avT -lbu -gTh -wuC +aPE +huF +iSB avT -lbu -gTh -wuC +aPE +huF +iSB avT wuf avT @@ -54650,8 +55137,8 @@ yhx yhx yhx yhx -yhx -yhx +nbC +nbC ydp ydp ydp @@ -54740,7 +55227,7 @@ avT avT avT avT -bBh +fUc avT avT avT @@ -54997,7 +55484,7 @@ rxI rxI rxI avT -hGK +tEC avT rxI rxI @@ -55206,7 +55693,7 @@ nOG vEm fet avT -avT +stP avT ydp ydp @@ -55253,9 +55740,9 @@ pjD pjD pjD pjD -fNh -xUL -nyq +cih +pIs +ixO fsh fsh fsh @@ -55461,9 +55948,9 @@ azz aAF yiT pwE -fet -avT -avT +iMk +wMr +bEp bmX avT avT @@ -55511,7 +55998,7 @@ dfx dfx dfx avT -clq +uyV avT dfx dfx @@ -55720,7 +56207,7 @@ uKG vEm fet avT -avT +kHJ avT avT avT @@ -55768,7 +56255,7 @@ avT avT avT avT -bBh +fUc avT avT avT @@ -56025,7 +56512,7 @@ rxI rxI rxI avT -hGK +tEC avT rxI rxI @@ -56281,9 +56768,9 @@ pjD pjD pjD pjD -fNh -xUL -nyq +cih +pIs +ixO fsh fsh fsh @@ -56539,7 +57026,7 @@ dfx dfx dfx avT -clq +uyV avT dfx dfx @@ -56796,7 +57283,7 @@ avT avT avT avT -bBh +fUc avT avT avT @@ -57053,7 +57540,7 @@ rxI rxI rxI avT -hGK +tEC avT rxI rxI @@ -57309,9 +57796,9 @@ pjD pjD pjD pjD -fNh -xUL -nyq +cih +pIs +ixO fsh fsh fsh @@ -57567,7 +58054,7 @@ dfx dfx dfx avT -clq +uyV avT dfx dfx @@ -57824,7 +58311,7 @@ avT avT avT avT -bBh +fUc avT avT avT @@ -58007,7 +58494,7 @@ ydp ydp avT bBh -bmX +avT avT gLH ohf @@ -58081,7 +58568,7 @@ avT avT avT qlH -bBh +fUc qlH avT avT @@ -58286,8 +58773,8 @@ aFI iek wRz erO -aBK -dFJ +tmx +tmx kdA aFI avT @@ -58544,8 +59031,8 @@ cwH lam erO aBK -aDf -aEG +aBK +aBK aFI avT avT @@ -58800,8 +59287,8 @@ lWb dfa obB aAe -aBK -aDf +eXy +aEE aEE bxM avT @@ -59057,8 +59544,8 @@ aFI ays mQK auT -aBK -aDf +hBM +fol aEI bxM avT @@ -59314,7 +59801,7 @@ aFI uJF lam jcS -aBK +hBM aDc aEH bxM @@ -59571,8 +60058,8 @@ nEi jRU uzT gWn -aBK -aDf +hBM +jPf aEK bxM avT @@ -59828,7 +60315,7 @@ eGO ayt nuJ aAw -aBK +rRQ aEJ aEJ aIP @@ -60135,11 +60622,11 @@ yhx yhx yhx yhx -yhx +nbC xUL bBh xUL -yhx +nbC yhx yhx yhx @@ -60392,11 +60879,11 @@ yhx yhx yhx yhx -yhx +nbC xUL bBh xUL -yhx +nbC yhx yhx yhx @@ -60648,12 +61135,12 @@ yhx yhx yhx yhx -yhx -yhx +nbC +nbC xUL bBh xUL -yhx +nbC yhx yhx yhx @@ -60905,12 +61392,12 @@ yhx yhx yhx yhx -yhx +nbC avT xUL bBh xUL -yhx +nbC yhx yhx yhx @@ -61159,15 +61646,15 @@ yhx yhx yhx yhx -yhx -yhx -yhx -yhx +nbC +nbC +nbC +nbC euS sXy jAq -yhx -yhx +nbC +nbC yhx yhx yhx @@ -61417,13 +61904,13 @@ yhx yhx yhx yhx -yhx +nbC avT avT bBh xUL avT -yhx +nbC yhx yhx yhx @@ -61666,21 +62153,21 @@ yhx yhx yhx yhx +nbC +nbC +nbC +nbC +nbC +nbC +nbC yhx -yhx -yhx -yhx -yhx -yhx -yhx -yhx -yhx +nbC avT avT bBh xUL avT -yhx +nbC yhx yhx yhx @@ -61920,10 +62407,10 @@ yhx yhx yhx yhx -yhx -yhx -yhx -yhx +nbC +nbC +nbC +nbC avT xUL xUL @@ -61931,13 +62418,13 @@ xUL xUL avT avT -yhx +nbC xUL xUL bBh xUL -yhx -yhx +nbC +nbC yhx yhx yhx @@ -62171,11 +62658,11 @@ yhx yhx yhx yhx -yhx -yhx -yhx -yhx -yhx +nbC +nbC +nbC +nbC +nbC yhx avT avT @@ -62193,7 +62680,7 @@ sXy sXy jAq xUL -yhx +nbC yhx yhx yhx @@ -62409,9 +62896,9 @@ odR dPx sPA sKh +dMo irt -irt -guI +srB avT avT avT @@ -62425,10 +62912,10 @@ ydp ydp ydp yhx -yhx -yhx -yhx -yhx +nbC +nbC +nbC +nbC avT avT avT @@ -62441,16 +62928,16 @@ xUL xUL xUL avT -yhx +nbC xUL xUL xUL xUL xUL avT -yhx -yhx -yhx +nbC +nbC +nbC yhx yhx yhx @@ -62666,7 +63153,7 @@ aLk aNo aOo sKh -irt +dMo srB bzc avT @@ -62682,7 +63169,7 @@ ydp ydp ydp yhx -yhx +nbC avT avT avT @@ -62696,16 +63183,16 @@ xUL xUL avT avT -yhx -yhx -yhx -yhx -yhx -yhx -yhx -yhx -yhx -yhx +nbC +nbC +nbC +nbC +nbC +nbC +nbC +nbC +nbC +nbC yhx yhx yhx @@ -62917,12 +63404,12 @@ aDb qWM hIH nuS -aPE +qsD wDR fHF -aPC -aPE -aPE +aVv +qsD +qsD hmM bzc bzc @@ -62949,11 +63436,11 @@ xUL xUL xUL avT -yhx -yhx -yhx -yhx -yhx +nbC +nbC +nbC +nbC +nbC yhx yhx yhx @@ -63174,12 +63661,12 @@ bxk bxk hIH iFl -aPC +aVv gCC qAF hOc aOp -aPE +qsD hmM bzc bzc @@ -63202,11 +63689,11 @@ avT euS jAq xUL -yhx -yhx -yhx -yhx -yhx +nbC +nbC +nbC +nbC +nbC yhx yhx yhx @@ -63431,12 +63918,12 @@ hTk vHU qTO aHD -aPC +aVv jOy lqt gPb hFv -aPC +aVv hmM bzc bzc @@ -63458,8 +63945,8 @@ avT euS jAq xUL -yhx -yhx +nbC +nbC yhx yhx yhx @@ -63688,7 +64175,7 @@ srU aFO aFY aHD -aPC +aVv hxx vKT faR @@ -63714,8 +64201,8 @@ avT euS jAq xUL -yhx -yhx +nbC +nbC yhx yhx yhx @@ -63945,7 +64432,7 @@ aDm hLZ aFY aHD -aPC +aVv cKK sub vrg @@ -63970,8 +64457,8 @@ avT euS jAq xUL -yhx -yhx +nbC +nbC yhx yhx yhx @@ -64152,9 +64639,9 @@ ydp ydp ydp ydp -ydp -ydp -avT +bum +bum +bum avT mpj gNb @@ -64202,15 +64689,15 @@ aDp eZi aFU aHD -aPE +qsD jmf fLW utp itp -aPE +qsD aQV vcG -wgu +lzB avT avT ydp @@ -64226,8 +64713,8 @@ avT euS jAq xUL -yhx -yhx +nbC +nbC yhx yhx yhx @@ -64410,8 +64897,8 @@ ydp ydp ydp ydp -ydp -avT +bum +bum avT mpj eSJ @@ -64459,12 +64946,12 @@ aDe rJk aFT jOj -aPE -aKa -aPE -aPE -aPE -aPE +qsD +mSN +qsD +qsD +qsD +qsD aQV vcG lzB @@ -64483,7 +64970,7 @@ euS jAq xUL avT -yhx +nbC yhx yhx yhx @@ -64667,7 +65154,7 @@ ydp ydp ydp ydp -ydp +bum ydp avT mpj @@ -64733,14 +65220,14 @@ ydp ydp ydp ydp -avT +bmX avT avT bBh xUL -yhx -yhx -yhx +nbC +nbC +nbC yhx yhx yhx @@ -64982,7 +65469,7 @@ xUL xUL vcG lzB -bmX +avT avT ydp ydp @@ -64995,8 +65482,8 @@ avT avT bBh xUL -yhx -yhx +nbC +nbC yhx yhx yhx @@ -65190,7 +65677,7 @@ avT avT avT xUL -vBe +xUL mbm iJl iJl @@ -65226,7 +65713,7 @@ xeI rqW rqW aGD -tJi +rqW myh qLm qTG @@ -65252,7 +65739,7 @@ avT avT bBh xUL -yhx +nbC yhx yhx yhx @@ -65479,9 +65966,9 @@ rQJ fwn awb rqW -ayC -rPU -fne +rqW +rqW +rqW rqW rqW fOA @@ -65509,7 +65996,7 @@ avT avT bBh xUL -yhx +nbC yhx yhx yhx @@ -65701,7 +66188,7 @@ ydp ydp avT avT -bmX +avT avT xUL ace @@ -65735,12 +66222,12 @@ iPX rQJ fpS wPD +ihY +rqW +rqW +rqW rqW -pIf -pIf -pIf rqW -aHK myh uJx ikk @@ -65766,7 +66253,7 @@ avT avT bBh xUL -yhx +nbC yhx yhx yhx @@ -65993,11 +66480,11 @@ rQJ fvz awb rqW -ayC -azH -fne rqW -aCr +rqW +rqW +rqW +rqW myh lHH oYn @@ -66008,7 +66495,7 @@ wUr avT avT avT -vcG +lcv wgu avT avT @@ -66023,7 +66510,7 @@ avT avT bBh xUL -yhx +nbC yhx yhx yhx @@ -66218,7 +66705,7 @@ avT avT avT avT -bGt +ace avT avT avT @@ -66475,7 +66962,7 @@ ydp avT avT avT -ace +bGt avT avT avT @@ -66510,8 +66997,8 @@ myh rQJ rQJ rQJ -myh -myh +eXO +kjx rQJ wUr wUr @@ -66767,9 +67254,9 @@ xxi ayD cGz sqg -avT -ydp -ydp +xdr +ihY +rQJ ydp ydp ydp @@ -67023,10 +67510,10 @@ oaS eqP tcj viF -ayG -avT -avT -ydp +sqg +pJm +ihY +rQJ ydp ydp ydp @@ -67281,9 +67768,9 @@ iat pEF nez sqg -avT -avT -avT +fEz +sae +rQJ ydp ydp ydp @@ -67538,9 +68025,9 @@ axr ayE nez sqg -ydp -ydp -avT +rQJ +rQJ +rQJ ydp ydp ydp @@ -67807,7 +68294,7 @@ ydp avT avT avT -vcG +lcv wgu avT avT @@ -68042,7 +68529,7 @@ ujE grz arP xWq -wje +xWI nrd wje sqg @@ -68792,7 +69279,7 @@ ace avT avT avT -bmX +avT avT avT avT @@ -69058,7 +69545,7 @@ avT avT avT vBe -xnm +tLb xUL rhX lXR @@ -69316,12 +69803,12 @@ avT avT xUL xnm -xUL +vBe eTu kHd ljT kHd -gVo +kHd rhX xUL xUL @@ -69573,7 +70060,7 @@ avT avT xUL xnm -xUL +vBe eTu kHd apK @@ -69606,7 +70093,7 @@ ydp ydp avT avT -vcG +lcv wgu avT avT @@ -69829,7 +70316,7 @@ avT avT avT vBe -xnm +tLb xUL rhX rhX @@ -70588,18 +71075,18 @@ avT avT avT ace -xUL vBe xUL -xUL -xUL -xUL vBe xUL xUL xUL vBe xUL +xUL +xUL +xUL +vBe xnm avT avT @@ -70626,9 +71113,9 @@ ydp ydp ydp ydp -avT -avT -avT +ydp +ydp +ydp avT avT avT @@ -70847,11 +71334,11 @@ avT pQd kLh kQr +qOJ lZn lZn lZn -lZn -lZn +qOJ lZn lZn lZn @@ -70881,12 +71368,12 @@ ydp ydp ydp avT -avT -avT -avT -avT -avT -avT +ydp +ydp +ydp +ydp +ydp +ydp avT avT avT @@ -71138,23 +71625,23 @@ ydp ydp avT avT +ydp +ydp +ydp +ydp +ydp +ydp avT avT avT -avT -avT -avT -avT -avT -avT -avT +xUL vcG lzB avT avT avT avT -bmX +avT ydp ydp ydp @@ -71360,7 +71847,7 @@ avT avT avT xZL -qZO +xBk avT avT avT @@ -71391,21 +71878,21 @@ ydp ydp ydp ydp +ydp avT avT +bmX +ydp +ydp +ydp +ydp +ydp +ydp +avT avT avT xUL -xUL -xUL -xUL -xUL -xUL -xUL -xUL -avT -avT -vcG +lcv wgu xUL xUL @@ -71450,7 +71937,7 @@ nxv kYF bVM avT -bmX +avT ydp ydp ydp @@ -71629,7 +72116,7 @@ avT avT avT avT -bmX +avT avT avT ydp @@ -71651,17 +72138,17 @@ ydp avT avT avT -xUL -xUL -xUL -xUL -xUL -xUL -xUL -xUL -xUL -xUL +ydp +ydp +ydp +ydp +ydp +ydp avT +avT +avT +avT +xUL vcG lzB xUL @@ -71873,8 +72360,8 @@ ydp avT avT avT -xZL -xBk +aez +qZO avT avT avT @@ -71907,18 +72394,18 @@ ydp avT avT avT +avT +ydp +ydp +ydp +ydp +ydp +ydp +ydp +avT +avT +avT xUL -xUL -xUL -xUL -xUL -xUL -xUL -xUL -xUL -xUL -xUL -avT vcG lzB avT @@ -72164,17 +72651,17 @@ ydp avT avT avT -xUL -xUL -xUL -xUL -xUL -xUL -xUL -xUL -xUL -xUL -xUL +avT +avT +ydp +ydp +ydp +ydp +ydp +avT +avT +avT +avT xUL vcG lzB @@ -72419,20 +72906,20 @@ ydp ydp ydp avT -bmX +avT +avT +avT +avT +avT +ydp +ydp +ydp +avT +avT +avT +avT avT xUL -xUL -xUL -xUL -xUL -xUL -xUL -xUL -xUL -xUL -xUL -avT vcG lzB avT @@ -72678,18 +73165,18 @@ ydp avT avT avT -xUL -xUL -xUL -xUL -xUL -xUL -xUL -xUL -xUL -xUL -xUL avT +avT +avT +avT +ydp +avT +avT +avT +avT +avT +avT +xUL vcG lzB avT @@ -72707,7 +73194,7 @@ avT avT avT avT -avT +bmX wql wql vEG @@ -72935,18 +73422,18 @@ ydp avT avT avT -xUL -xUL -xUL -xUL -xUL -xUL -xUL -xUL -xUL -xUL -xUL avT +avT +avT +avT +avT +avT +avT +avT +avT +avT +avT +xUL vcG lzB avT @@ -73192,19 +73679,19 @@ ydp ydp avT avT -xUL -xUL -xUL -xUL -xUL -xUL -xUL -xUL -xUL -xUL -xUL avT -vcG +avT +avT +avT +avT +avT +avT +ydp +ydp +avT +avT +xUL +lcv wgu avT avT @@ -73217,7 +73704,7 @@ ydp ydp ydp ydp -bmX +avT avT wql wql @@ -73429,7 +73916,8 @@ avT avT avT avT -avT +bmX +ydp ydp ydp ydp @@ -73449,18 +73937,17 @@ ydp ydp avT avT -xUL -xUL -xUL -xUL -xUL -xUL -xUL -xUL -xUL -xUL -xUL avT +avT +avT +avT +avT +avT +ydp +ydp +ydp +avT +xUL vcG lzB avT @@ -73507,7 +73994,7 @@ bUD bVM avT avT -bmX +avT avT avT avT @@ -73704,20 +74191,20 @@ ydp ydp ydp ydp +ydp +ydp +avT +avT +avT +avT +avT +avT +avT +ydp +ydp avT avT xUL -xUL -xUL -xUL -xUL -xUL -xUL -xUL -xUL -xUL -xUL -avT vcG lzB avT @@ -73929,7 +74416,7 @@ avT avT avT avT -xZL +aez qZO avT avT @@ -73961,20 +74448,20 @@ ydp ydp ydp ydp +ydp +ydp +avT +avT +avT +ydp +ydp +avT +avT +avT +avT avT avT xUL -xUL -xUL -xUL -xUL -xUL -xUL -xUL -xUL -xUL -xUL -avT vcG lzB xUL @@ -74218,20 +74705,20 @@ ydp ydp ydp ydp +ydp +avT +avT +avT +avT +ydp +ydp +ydp +avT +avT +avT avT avT xUL -xUL -xUL -xUL -xUL -xUL -xUL -xUL -xUL -xUL -xUL -avT vcG lzB xUL @@ -74477,20 +74964,20 @@ ydp ydp avT avT +ydp +ydp +avT +avT +avT +avT +avT +avT +avT +avT +avT xUL -xUL -xUL -xUL -xUL -xUL -xUL -xUL -xUL -xUL -xUL -xUL -vcG -lzB +lcv +nDN xUL xUL xUL @@ -74733,19 +75220,19 @@ ydp ydp avT avT +ydp +ydp +ydp +avT +avT +avT +avT +avT +avT +avT +avT avT xUL -xUL -xUL -xUL -xUL -xUL -xUL -xUL -xUL -xUL -xUL -avT vcG lzB xUL @@ -74800,7 +75287,7 @@ cer avT avT avT -bmX +avT avT avT avT @@ -74992,19 +75479,19 @@ avT avT avT avT -xUL -xUL -xUL -xUL -xUL -xUL -xUL -xUL -xUL -xUL avT +avT +avT +avT +avT +avT +avT +avT +avT +avT +xUL vcG -wgu +lzB xUL xUL xUL @@ -75249,17 +75736,17 @@ avT avT avT avT -avT xUL xUL xUL -avT -avT xUL xUL xUL -avT -avT +xUL +xUL +xUL +xUL +xUL vcG lzB avT @@ -75512,7 +75999,7 @@ nGx nGx nGx nGx -nGx +hnN nGx nGx nGx @@ -75526,8 +76013,8 @@ avT avT bok unA -bJQ -bJQ +xjZ +xjZ unA avT avT @@ -75762,7 +76249,7 @@ avT avT avT avT -tFr +vcG dvc sLv sLv @@ -75985,7 +76472,7 @@ avT avT avT avT -xZL +aez qZO avT avT @@ -76033,7 +76520,7 @@ avT avT avT avT -bmX +avT avT avT bok @@ -76094,7 +76581,7 @@ ruD clR avT avT -bmX +avT avT avT avT @@ -76534,7 +77021,7 @@ gky vmM jOo azc -lzB +nDN avT avT avT @@ -76559,7 +77046,7 @@ wcB unA avT avT -bmX +avT avT bwt cTD @@ -76808,7 +77295,7 @@ ncg aXh jHC bok -ivM +uFq bok unA uFq @@ -77263,12 +77750,12 @@ ydp ydp ydp ydp -avT -avT -avT -avT -avT -avT +pgp +iHM +iHM +iHM +iHM +iHM avT xZL xBk @@ -77520,15 +78007,15 @@ ydp ydp ydp ydp +pgp +sTt +nRA +pDg +qSF +iHM avT -avT -avT -bHt -nZE -nZE -nZE aez -xBk +qZO avT avT ydp @@ -77561,7 +78048,7 @@ kxI dPM xNs wwx -nDd +aAh aDQ avT avT @@ -77777,15 +78264,15 @@ ydp ydp ydp avT -avT -avT -avT +pgp +xAv +xAv mps xAv -ruo -ruo +iHM +avT acQ -aUb +xBk avT avT avT @@ -78021,28 +78508,28 @@ yhx yhx yhx yhx -ydp -ydp -ydp -ydp -ydp -ydp +nbC +nbC +nbC +pgp +pgp +pgp +pgp +pgp +pgp +pgp +pgp +pgp +pgp +pgp +rKC +bjR +xAv +xAv +pgp avT -avT -avT -avT -avT -avT -avT -avT -avT -avT -axL -aaM -nZE -nZE -abU -vBe +xZL +nYd avT avT avT @@ -78278,28 +78765,28 @@ yhx yhx yhx yhx -ydp -ydp -ydp -ydp -ydp -ydp +nbC +nbC avT -avT -avT -avT -avT -avT -iHM +pgp +tJi +vdW +pgp +tJi +vdW +pgp +tJi +vdW +pgp tOz -iHM +tUq gCO -iHM -axN -ruo -ruo -aAh -vzS +hvG +pgp +pgp +pgp +xZL +xBk avT ydp ydp @@ -78535,27 +79022,27 @@ yhx yhx yhx yhx -ydp -ydp -ydp -ydp -ydp -ydp avT avT avT -avT -avT -avT -iHM -kRk -iHM -kRk -iHM -avT -avT -avT -xZL +pgp +tSd +vzS +pgp +tSd +rEF +pgp +tSd +vFT +pgp +vow +swQ +gCO +swQ +kXL +mtP +tWs +aez xBk avT ydp @@ -78591,13 +79078,13 @@ spa dIj pIH bpT +dMo irt irt +dMo irt irt -irt -irt -irt +dMo gZS uyK aRt @@ -78792,27 +79279,27 @@ yhx yhx yhx yhx -ydp -ydp -ydp -ydp -ydp -ydp avT -avT -iHM -iHM -iHM -iHM -iHM +pgp +pgp +pgp +uRg +pgp +pgp +kWz +pgp +pgp +eCS +pgp +pgp vow -iHM -vow -iHM -iHM -iHM -iHM -xZL +swQ +gCO +swQ +kXL +mtP +tWs +aez xBk avT ydp @@ -79048,26 +79535,26 @@ yhx yhx yhx yhx -yhx -ydp -ydp -ydp -ydp -ydp -ydp -avT +ooR avT iHM -kHD -kHD -kHD -kHD -kHD -kHD -kHD -kHD -kHD -kHD +oME +rPU +swQ +fSb +pqm +swQ +swQ +rPU +swQ +swQ +vQz +vow +swQ +gCO +swQ +iHM +rbb iHM xZL xBk @@ -79103,8 +79590,8 @@ cPI hPe vAs ktw -xZL -lzB +aez +nDN avT avT avT @@ -79305,26 +79792,26 @@ ydp ydp ydp ydp -ydp -ydp -ydp -ydp -ydp -ydp -ydp avT avT iHM -kHD -kHD -kHD -kHD -kHD -kHD -kHD -kHD -kHD -kHD +pIf +swQ +swQ +swQ +swQ +jjB +ugk +ugk +ugk +ugk +ugk +fkA +ugk +hUg +qim +iHM +iHM iHM xZL xBk @@ -79346,7 +79833,7 @@ ydp ydp ydp avT -bmX +avT avT avT avT @@ -79360,7 +79847,7 @@ spa vir fkr ktw -oME +xZL lzB avT avT @@ -79562,27 +80049,27 @@ ydp ydp ydp ydp -ydp -ydp -ydp -ydp -ydp -ydp -avT avT avT iHM -kHD -kHD -kHD -kHD -kHD -kHD -kHD -kHD -kHD -kHD +ruo +tFu +swQ +swQ +hWp +ptH +iQu +iQu +iQu +iQu +mHm +bfo +swQ +gCO iHM +lJC +avT +avT xZL xBk avT @@ -79820,29 +80307,29 @@ ydp ydp ydp ydp -ydp -ydp -ydp -ydp -avT -avT -avT avT +pgp +pgp +pgp +raM +raM +raM +raM +mfU +raM +raM +raM +pgp +vVJ +hCx +lOa iHM -kHD -kHD -kHD -kHD -kHD -kHD -kHD -kHD -kHD -kHD -iHM -xZL -xBk -vBe +avT +avT +avT +aez +qZO +xUL ydp ydp ydp @@ -79957,7 +80444,7 @@ jQj avT avT avT -bmX +avT avT avT avT @@ -80078,25 +80565,25 @@ ydp ydp ydp ydp -ydp -ydp -ydp +pgp +kHD +kHD +kHD +kHD +kHD +kHD +kHD +kHD +kHD +kHD +raM +eoH +xAv +nJB +iHM +avT +avT avT -xUL -cav -xUL -iHM -kHD -kHD -kHD -kHD -kHD -kHD -kHD -kHD -kHD -kHD -iHM xZL xBk xUL @@ -80125,7 +80612,7 @@ sLv sLv sLv sLv -sLv +cEs sLv sLv sLv @@ -80335,25 +80822,25 @@ ydp ydp ydp ydp -ydp -ydp +raM +kHD +kHD +kHD +kHD +kHD +kHD +kHD +kHD +kHD +kHD +raM +nlF +xAv +oUT +iHM +avT avT avT -xUL -xUL -xUL -iHM -iHM -iHM -iHM -iHM -nlF -iHM -nlF -iHM -iHM -iHM -iHM xZL xBk avT @@ -80592,20 +81079,20 @@ ydp ydp ydp ydp -ydp -ydp -avT -avT -xUL -xUL -xUL -avT -avT -avT -avT -iHM -lJN -vQk +raM +kHD +kHD +kHD +kHD +kHD +kHD +kHD +kHD +kHD +kHD +raM +nlF +xAv gUc iHM avT @@ -80849,21 +81336,21 @@ ydp ydp ydp ydp -ydp -ydp -avT -pgp -xUL -xUL -xUL -pgp -avT -avT -avT -iHM -kRk -kRk -kRk +raM +kHD +kHD +kHD +kHD +kHD +kHD +kHD +kHD +kHD +kHD +raM +nlF +xAv +oUT iHM avT avT @@ -81106,28 +81593,28 @@ ydp ydp ydp ydp -ydp -avT -avT pgp -xUL -bSC -xUL -pgp -avT -avT -avT -iHM -vow -iHM -vow +kHD +kHD +kHD +fIk +kHD +kHD +kHD +kHD +kHD +kHD +raM +eoH +xAv +nJB iHM avT avT avT -xZL -xBk -iSB +aez +qZO +avT wdv xUL xUL @@ -81363,18 +81850,18 @@ ydp ydp ydp ydp -avT -avT -iHM -iHM +pgp +pgp pgp raM -iHM pgp -iHM -iHM -iHM -iHM +raM +raM +mfU +raM +raM +raM +pgp rRk xfs qHL @@ -81503,7 +81990,7 @@ avT avT avT avT -avT +bmX ydp ydp ydp @@ -81625,20 +82112,20 @@ xUL aNL mtP dvs -mtP -mtP -dAi -mtP -mtP -mtP -mtP -mtP -lLv -mtP +jjB +kIV +ugk +ugk +ugk +ugk +utY +mEH +ugk +hUg oBD iHM -lJC -lJC +iHM +iHM xZL xBk avT @@ -81661,7 +82148,7 @@ avT avT avT tFr -lzB +nDN avT avT avT @@ -81882,30 +82369,30 @@ xUL aNL fTM dvs -mtP +swQ naE -mtP +bqb aaU nOY -mtP -naE +iwH +hlQ duB tsK -tsK +nEH tsK iuC -tsK +cTV pXb aSE xBk xUL xUL xUL +xUL +xUL vBe xUL xUL -xUL -xUL vBe xUL xUL @@ -81915,7 +82402,7 @@ xUL vBe xUL xUL -xUL +vBe xUL vcG lzB @@ -81975,7 +82462,7 @@ anA wbT rTs hTL -uRg +hTL jab jFy qJV @@ -82140,39 +82627,39 @@ iHM pgp pgp pgp -pgp +eyc fPM pgp pgp pgp pgp vhb -mtP +swQ vDI ugk hAx -ugk +ord nrY -vsM +vko aUb xUL xUL xUL xUL xUL +vBe +xUL +xUL +vBe xUL xUL xUL xUL xUL +vBe xUL xUL -xUL -xUL -xUL -xUL -xUL -xUL +vBe xUL vcG lzB @@ -82392,19 +82879,19 @@ xUL ydp ydp ydp -bmX +avT avT pgp aab dZV -dZV -gLk +wgM +kdy pgp qFH nBd wfS iJs -mtP +swQ sgL qxk pgp @@ -82418,7 +82905,7 @@ xUL xUL xUL avT -bmX +avT avT avT avT @@ -82478,7 +82965,7 @@ vAs vAs krT pze -bEi +sLF bEi lbp bAs @@ -82654,25 +83141,25 @@ avT pgp aac gLk -gLk -gLk +hHV +kdy pgp vVZ mWy pgp iJs -mtP +swQ inA qMn pgp -wdv -wdv +pgp +pgp +xUL +xUL +xUL +xUL +vBe vBe -xUL -xUL -xUL -xUL -xUL xUL avT avT @@ -82740,7 +83227,7 @@ bFT bCO gRE thV -bCO +qBl bEa kxj aaw @@ -82911,7 +83398,7 @@ avT pgp aab aad -gLk +gdH fBs pgp pgp @@ -83457,10 +83944,10 @@ ydp ydp avT avT -bmX +avT avT tFr -lzB +nDN avT avT ydp @@ -84178,7 +84665,7 @@ ydp ydp ydp ydp -avT +bmX avT ydp ydp @@ -84693,7 +85180,7 @@ ydp ydp avT avT -bmX +avT avT avT avT @@ -84795,7 +85282,7 @@ hJE cmC aIt bCO -bBN +hyx vTF tRe eVp @@ -85080,7 +85567,7 @@ bPn avT avT avT -bmX +avT avT avT avT @@ -85259,7 +85746,7 @@ ydp avT avT tFr -lzB +nDN avT avT avT @@ -85432,23 +85919,23 @@ yhx wuf avT nuu -sXy -sXy +aar +aar fNh -xUL +abU nyq -sXy +aar fNh -xUL +abU nyq -sXy +aar fNh -xUL +abU nyq -sXy -sXy -sXy -sXy +aar +aar +aar +aar sDD eNK jwc @@ -86290,7 +86777,7 @@ vcG lzB avT avT -bmX +avT avT ydp ydp @@ -86512,7 +86999,7 @@ mGp rgm wAx wAx -wAx +ule uEz uEz wzf @@ -87026,11 +87513,11 @@ mKv sAh sAh acb -aar +urI +uEz +uEz uEz uEz -hrS -lQJ lia uvB tOY @@ -87058,7 +87545,7 @@ xUL xUL avT tFr -lzB +nDN avT avT ydp @@ -87103,7 +87590,7 @@ avT avT avT avT -bmX +avT avT avT avT @@ -87285,10 +87772,10 @@ sAh acb urI qkO -uEz -blD +qnx kge -gls +kge +qnx tgd tRC pJS @@ -87382,7 +87869,7 @@ avT avT avT avT -bmX +avT avT avT ydp @@ -87542,12 +88029,12 @@ qss qss ylW uoV -uEz -blD +qnx +pgk pgk bKl -iNK -chN +tgd +tRC pJS sWD bNF @@ -87799,9 +88286,9 @@ sAh acb urI uoV -uEz -blD -pgk +qnx +kbE +kbE qnx pbf sFw @@ -87884,7 +88371,7 @@ sXy ikA avT avT -bmX +avT avT avT avT @@ -88056,10 +88543,10 @@ sAh acb urI uoV -uEz -blD -eLl -igK +qnx +kge +kge +qnx xcL hop pJS @@ -88287,14 +88774,14 @@ ydp ydp ydp ydp -bmX +avT avT avT bBh avT aKf irQ -huF +cfp cfp gxY cfp @@ -88313,11 +88800,11 @@ qss oXl pPz uoV -uEz -hsQ -cDO -jAT -nmL +qnx +pgk +pgk +qnx +tgd vKP pJS hNg @@ -88405,7 +88892,7 @@ ydp ydp ydp ydp -avT +bmX avT ydp ydp @@ -88552,7 +89039,7 @@ avT aKf irQ jLG -piu +lhr piu xac gNI @@ -88570,12 +89057,12 @@ wAx wAx wAx hru -uEz -uEz -uEz -ejw -rTv -eOO +qnx +kbE +kbE +qnx +tgd +tRC pJS hNg bNF @@ -88802,7 +89289,7 @@ ydp ydp ydp avT -avT +bmX ydp bBh avT @@ -88830,9 +89317,9 @@ pbg uEz uEz uEz -ejw -rTv -eOO +cvN +gjZ +tRC pJS jiY bNF @@ -88857,7 +89344,7 @@ xUL xiw avT tFr -lzB +nDN avT avT avT @@ -88945,7 +89432,7 @@ ydp ydp ydp avT -bmX +avT avT ydp ydp @@ -90607,7 +91094,7 @@ bBh avT aKf gLO -jvV +cfp evO cfp kBe @@ -90656,7 +91143,7 @@ avT avT avT tFr -lzB +nDN avT avT avT @@ -91422,7 +91909,7 @@ uMF jsl gFM cuY -nGx +hnN nGx nGx nGx @@ -91679,11 +92166,11 @@ dks nEl ust sHJ +cEs sLv sLv sLv sLv -ybT asr avT avT @@ -91989,12 +92476,12 @@ yhx yhx yhx yhx -yhx +nbC avT avT bBh avT -yhx +nbC yhx yhx yhx @@ -92195,7 +92682,7 @@ lGB jJu avT avT -bmX +avT avT avT avT @@ -92246,12 +92733,12 @@ yhx yhx yhx yhx -yhx +nbC avT avT bBh avT -yhx +nbC yhx yhx yhx @@ -92399,8 +92886,8 @@ bqN avT xUL xUL -bmX avT +bmX bxL bxL bxL @@ -92408,7 +92895,7 @@ xUL bxL dri dri -dDC +uot nQp kVx eLQ @@ -92503,12 +92990,12 @@ yhx yhx yhx yhx -yhx +nbC avT avT bBh avT -yhx +nbC yhx yhx yhx @@ -92641,7 +93128,7 @@ avT avT bzc xUL -avT +bmX avT ydp ydp @@ -92660,7 +93147,7 @@ avT avT bxL bxL -bum +axN xUL xUL dri @@ -92758,14 +93245,14 @@ yhx yhx yhx yhx -yhx -yhx -yhx +nbC +nbC +nbC avT avT bBh avT -yhx +nbC yhx yhx yhx @@ -92895,7 +93382,7 @@ ydp ydp ydp avT -avT +bum bzh xUL avT @@ -92917,7 +93404,7 @@ avT bxL bxL bum -bum +axN xUL xUL rww @@ -92925,7 +93412,7 @@ rww rww ttQ lNU -bZI +nDd bZI nNV dBP @@ -93015,14 +93502,14 @@ yhx yhx yhx yhx -yhx +nbC avT avT avT avT bBh avT -yhx +nbC yhx yhx yhx @@ -93152,9 +93639,9 @@ ydp ydp ydp avT -avT -avT -bmX +bum +bum +bum avT avT ydp @@ -93174,7 +93661,7 @@ bxL bxL bum bum -bum +axN xUL xUL jrq @@ -93272,14 +93759,14 @@ yhx yhx yhx yhx -yhx +nbC avT euS sXy sXy jAq avT -yhx +nbC yhx yhx yhx @@ -93409,10 +93896,10 @@ ydp ydp ydp ydp -avT -avT -avT -avT +bum +bum +bum +bum ydp ydp ydp @@ -93431,7 +93918,7 @@ bKI bum bum bum -bum +axN xUL xUL rww @@ -93529,14 +94016,14 @@ yhx yhx yhx yhx -yhx +nbC avT bBh avT avT avT avT -yhx +nbC yhx yhx yhx @@ -93667,7 +94154,7 @@ ydp ydp avT avT -avT +bum avT avT ydp @@ -93688,7 +94175,7 @@ bKI bum bum bum -bum +axN xUL xUL dri @@ -93786,14 +94273,14 @@ yhx yhx yhx yhx -yhx +nbC avT bBh avT avT -yhx -yhx -yhx +nbC +nbC +nbC yhx yhx yhx @@ -93945,7 +94432,7 @@ bKI bum bum bum -bum +axN xUL xUL wmB @@ -94043,12 +94530,12 @@ yhx yhx yhx yhx -yhx +nbC avT bBh avT avT -yhx +nbC yhx yhx yhx @@ -94199,10 +94686,10 @@ bKI bCC bCC bKI -bum -bum -bum -bum +azH +azH +azH +aHK xUL xUL fen @@ -94245,7 +94732,7 @@ qzz uqa iIQ avT -bmX +avT avT avT ydp @@ -94300,12 +94787,12 @@ yhx yhx yhx yhx -yhx +nbC avT bBh avT avT -yhx +nbC yhx yhx yhx @@ -94557,7 +95044,7 @@ yhx yhx yhx yhx -yhx +nbC avT bBh avT @@ -94709,7 +95196,7 @@ bqN bqN bqN bxL -bum +axN xUL xUL xUL @@ -94814,12 +95301,12 @@ yhx yhx yhx yhx -yhx +nbC avT bBh avT avT -yhx +nbC yhx yhx yhx @@ -94966,8 +95453,8 @@ bqN bqN bxL bxL -bum -bum +ayC +aEG xUL xUL bKI @@ -95071,12 +95558,12 @@ yhx yhx yhx yhx -yhx +nbC avT bBh avT avT -yhx +nbC yhx yhx yhx @@ -95224,7 +95711,7 @@ bqN bqN bxL bum -bum +axN xUL xUL bKI @@ -95328,12 +95815,12 @@ yhx yhx yhx yhx -yhx +nbC avT bBh avT avT -yhx +nbC yhx yhx yhx @@ -95481,7 +95968,7 @@ bqN bxL bxL bum -bum +axN xUL xUL bKI @@ -95585,12 +96072,12 @@ yhx yhx yhx yhx -yhx +nbC avT bBh avT avT -yhx +nbC yhx yhx yhx @@ -95737,8 +96224,8 @@ bqN bqN bxL bxL -bum -bum +azH +aHK xUL xUL bKI @@ -95840,14 +96327,14 @@ yhx yhx yhx yhx -yhx -yhx -yhx +nbC +nbC +nbC avT bBh avT avT -yhx +nbC yhx yhx yhx @@ -96005,7 +96492,7 @@ bKI bKI bMT fgj -nOk +lQp lfG sdr gyE @@ -96097,14 +96584,14 @@ yhx yhx yhx yhx -yhx +nbC avT avT avT bBh avT avT -yhx +nbC yhx yhx yhx @@ -96359,9 +96846,9 @@ avT avT avT bBh -yhx -yhx -yhx +nbC +nbC +nbC yhx yhx yhx @@ -96508,9 +96995,9 @@ bqN bqN bxL bxL -bum -bum -bum +aCr +aCr +aEG xUL bOb bKI @@ -96611,7 +97098,7 @@ yhx yhx yhx yhx -yhx +nbC avT avT avT @@ -96767,7 +97254,7 @@ bqN bxL bum bum -bum +axN xUL bOb bKI @@ -96868,12 +97355,12 @@ yhx yhx yhx yhx -yhx +nbC avT avT avT bBh -yhx +nbC yhx yhx yhx @@ -97024,7 +97511,7 @@ bqN bxL bum bum -bum +axN xUL bOb bKI @@ -97073,7 +97560,7 @@ wFO mZp avT avT -bmX +avT avT avT avT @@ -97125,12 +97612,12 @@ yhx yhx yhx yhx -yhx +nbC avT avT avT bBh -yhx +nbC yhx yhx yhx @@ -97281,7 +97768,7 @@ bqN bxL bum bum -bum +axN xUL bOb bKI @@ -97382,12 +97869,12 @@ yhx yhx yhx yhx -yhx +nbC avT avT avT bBh -yhx +nbC yhx yhx yhx @@ -97538,13 +98025,13 @@ bqN bxL bum bum -bum +axN xUL bOb -xUL -xUL -xUL -xUL +dDC +bum +bum +axN xbp onY gNy @@ -97639,12 +98126,12 @@ yhx yhx yhx yhx -yhx +nbC avT avT avT bBh -yhx +nbC yhx yhx yhx @@ -97795,13 +98282,13 @@ bxL bxL bxL bum -bum +axN xUL bOb -bum -bum -bum -bum +dFJ +azH +azH +aHK xbp fen eHK @@ -97896,12 +98383,12 @@ yhx yhx yhx yhx -yhx +nbC avT avT avT bBh -yhx +nbC yhx yhx yhx @@ -98052,7 +98539,7 @@ bxL bxL bxL bum -bum +axN bDA bGW bYY @@ -98153,12 +98640,12 @@ yhx yhx yhx yhx -yhx +nbC avT avT avT bBh -yhx +nbC yhx yhx yhx @@ -98309,7 +98796,7 @@ bxL bxL bxL bum -bum +axN bFx bOb bKI @@ -98410,7 +98897,7 @@ yhx yhx yhx yhx -yhx +nbC avT avT avT @@ -98566,7 +99053,7 @@ bqN bqN bxL bum -bum +axN bFx bRD caS @@ -98667,14 +99154,14 @@ yhx yhx yhx yhx -yhx +nbC avT avT avT bBh -yhx -yhx -yhx +nbC +nbC +nbC yhx yhx yhx @@ -98823,7 +99310,7 @@ bqN bxL bxL bum -bum +axN aEF bYY ccD @@ -98924,14 +99411,14 @@ yhx yhx yhx yhx -yhx +nbC avT avT avT bBh avT avT -yhx +nbC yhx yhx yhx @@ -99079,8 +99566,8 @@ bqN bqN bxL bxL -bum -bum +azH +aHK xUL xUL bKI @@ -99181,14 +99668,14 @@ yhx yhx yhx yhx -yhx +nbC avT avT avT bBh avT avT -yhx +nbC yhx yhx yhx @@ -99340,12 +99827,13 @@ xUL xUL xUL xUL +dDC bum bum -bum -bum +axN xbp xUL +dDC bum bum bum @@ -99359,8 +99847,7 @@ bum bum bum bum -bum -bum +axN rGc jPj ucC @@ -99438,14 +99925,14 @@ yhx yhx yhx yhx -yhx -yhx -yhx +nbC +nbC +nbC avT bBh avT avT -yhx +nbC yhx yhx yhx @@ -99597,27 +100084,27 @@ xUL xUL xUL xUL -bum -bum -bum -bum +dFJ +azH +azH +aHK xbp xUL -bum -bum -bum -bum -bum -bum -bum -bum -bum -bum -bum -bum -bum -bum -bum +dFJ +azH +azH +azH +azH +azH +azH +azH +azH +azH +azH +azH +azH +azH +aHK dQW jls ucC @@ -99697,12 +100184,12 @@ yhx yhx yhx yhx -yhx +nbC avT bBh avT avT -yhx +nbC yhx yhx yhx @@ -99850,8 +100337,8 @@ bqN bqN bxL bxL -bum -bum +aCr +aEG xUL xUL xUL @@ -99954,7 +100441,7 @@ yhx yhx yhx yhx -yhx +nbC avT bBh avT @@ -100108,7 +100595,7 @@ bqN bxL bxL bum -bum +axN xUL xUL xUL @@ -100211,12 +100698,12 @@ yhx yhx yhx yhx -yhx +nbC avT bBh avT avT -yhx +nbC yhx yhx yhx @@ -100366,24 +100853,24 @@ bxL bxL bxL bum -bum -bum -bum -bum -bum -bum +aCr +aCr +aCr +aCr +aCr +aEG xbp xUL -bum -bum -bum -bum -bum -bum -bum -bum -bum -bum +lQJ +aCr +aCr +aCr +aCr +aCr +aCr +aCr +aCr +aEG rGc tdX tdX @@ -100397,7 +100884,7 @@ aNU kVD noQ leT -leT +mqd leT iCq leT @@ -100408,7 +100895,7 @@ wku xGy lBH bnU -bmX +avT avT ydp ydp @@ -100468,12 +100955,12 @@ yhx yhx yhx yhx -yhx +nbC avT bBh avT avT -yhx +nbC yhx yhx yhx @@ -100628,9 +101115,10 @@ bum bum bum bum -bum +axN xbp xUL +dDC bum bum bum @@ -100639,8 +101127,7 @@ bum bum bum bum -bum -bum +axN dQW tdX tdX @@ -100725,12 +101212,12 @@ yhx yhx yhx yhx -yhx +nbC avT bBh avT avT -yhx +nbC yhx yhx yhx @@ -100885,9 +101372,10 @@ bum bum bum bum -bum +axN xbp xUL +dDC bum bum bum @@ -100896,8 +101384,7 @@ bum bum bum bum -bum -bum +axN rGc tdX tdX @@ -100982,12 +101469,12 @@ yhx yhx yhx yhx -yhx +nbC avT bBh avT avT -yhx +nbC yhx yhx yhx @@ -101142,9 +101629,10 @@ bum bum bum bum -bum +axN xbp xUL +dDC bum bum bum @@ -101153,8 +101641,7 @@ bum bum bum bum -bum -bum +axN dQW tdX tdX @@ -101244,7 +101731,7 @@ avT bBh avT avT -yhx +nbC yhx yhx yhx @@ -101399,9 +101886,10 @@ bum bum bum bum -bum +axN xbp xUL +dDC bum bum bum @@ -101410,8 +101898,7 @@ bum bum bum bum -bum -bum +axN rGc jPj dQW @@ -101494,14 +101981,14 @@ yhx yhx yhx yhx -yhx -yhx -yhx +nbC +nbC +nbC avT bBh avT avT -yhx +nbC yhx yhx yhx @@ -101656,9 +102143,10 @@ bum bum bum bum -bum +axN xbp xUL +dDC bum bum bum @@ -101667,8 +102155,7 @@ bum bum bum bum -bum -bum +axN dQW cly cly @@ -101751,14 +102238,14 @@ yhx yhx yhx yhx -yhx +nbC avT avT avT bBh avT avT -yhx +nbC yhx yhx yhx @@ -101913,9 +102400,10 @@ bum bum bum bum -bum +axN xbp xUL +dDC bum bum bum @@ -101924,8 +102412,7 @@ bum bum bum bum -bum -bum +axN xUL xUL xUL @@ -102008,14 +102495,14 @@ yhx yhx yhx yhx -yhx +nbC avT avT avT bBh avT avT -yhx +nbC yhx yhx yhx @@ -102170,9 +102657,10 @@ bum bum bum bum -bum +axN xbp xUL +dDC bum bum bum @@ -102181,8 +102669,7 @@ bum bum bum bum -bum -bum +axN xUL xUL xUL @@ -102265,14 +102752,14 @@ yhx yhx yhx yhx -yhx +nbC avT avT avT bBh -yhx -yhx -yhx +nbC +nbC +nbC yhx yhx yhx @@ -102427,9 +102914,10 @@ bum bum bum bum -bum +axN xbp xUL +dDC bum bum bum @@ -102438,16 +102926,15 @@ bum bum bum bum -bum -bum +axN xUL xUL xUL xUL xUL -bum -bum -bum +lQJ +aCr +aCr hBq pCv iuP @@ -102522,12 +103009,12 @@ yhx yhx yhx yhx -yhx +nbC avT avT avT bBh -yhx +nbC yhx yhx yhx @@ -102679,24 +103166,24 @@ bqN bxL bxL bxL -bum -bum -bum -bum -bum -bum +azH +azH +azH +azH +azH +aHK xbp xUL -bum -bum -bum -bum -bum -bum -bum -bum -bum -bum +dFJ +azH +azH +azH +azH +azH +azH +azH +azH +aHK xUL xUL xUL @@ -102779,12 +103266,12 @@ yhx yhx yhx yhx -yhx +nbC avT avT avT bBh -yhx +nbC yhx yhx yhx @@ -103036,12 +103523,12 @@ yhx yhx yhx yhx -yhx +nbC avT avT avT bBh -yhx +nbC yhx yhx yhx @@ -103293,12 +103780,12 @@ yhx yhx yhx yhx -yhx +nbC avT avT avT bBh -yhx +nbC yhx yhx yhx @@ -103450,27 +103937,27 @@ bqN bqN bxL bxL -bum -bum -bum -bum -bum -bum +aCr +aCr +aCr +aCr +aCr +aEG xUL xUL -bum -bum -bum -bum -bum -bum -bum -bum -bum -bum -bum -bum -bum +lQJ +aCr +aCr +aCr +aCr +aCr +aCr +aCr +aCr +aCr +aCr +aCr +aEG xUL xbp sTq @@ -103550,12 +104037,12 @@ yhx yhx yhx yhx -yhx +nbC avT avT avT bBh -yhx +nbC yhx yhx yhx @@ -103712,9 +104199,10 @@ bum bum bum bum -bum +axN xUL xUL +dDC bum bum bum @@ -103726,11 +104214,10 @@ bum bum bum bum -bum -bum +axN xUL xbp -sTq +lgg hBq xBV hBq @@ -103750,7 +104237,7 @@ avT avT avT avT -bmX +avT ydp ydp ydp @@ -103807,12 +104294,12 @@ yhx yhx yhx yhx -yhx +nbC avT avT avT bBh -yhx +nbC yhx yhx yhx @@ -103969,9 +104456,10 @@ bum bum bum bum -bum +axN xUL xUL +dDC bum bum bum @@ -103983,8 +104471,7 @@ bum bum bum bum -bum -bum +axN rGc rvf umD @@ -104064,12 +104551,12 @@ yhx yhx yhx yhx -yhx +nbC avT avT avT bBh -yhx +nbC yhx yhx yhx @@ -104226,9 +104713,10 @@ bum bum bum bum -bum +axN xUL xUL +dDC bum bum bum @@ -104240,8 +104728,7 @@ bum bum bum bum -bum -bum +axN odg xbp bZa @@ -104321,13 +104808,13 @@ yhx yhx yhx yhx -yhx +nbC avT avT avT bBh -yhx -yhx +nbC +nbC yhx yhx yhx @@ -104351,7 +104838,7 @@ faJ rot avT jxB -aQK +sQk rot avT wuf @@ -104483,9 +104970,10 @@ bum bum bum bum -bum +axN xUL xUL +dDC bum bum bum @@ -104497,12 +104985,11 @@ bum bum bum bum -bum -bum +axN odg xbp -sTq -sTq +cVa +qZb lHa nQd umD @@ -104584,8 +105071,8 @@ avT avT bBh avT -yhx -yhx +nbC +nbC yhx yhx yhx @@ -104608,7 +105095,7 @@ vDy rot avT jxB -qfJ +qjF rot avT wuf @@ -104740,9 +105227,10 @@ bum bum bum bum -bum +axN xUL xUL +dDC bum bum bum @@ -104754,12 +105242,11 @@ bum bum bum bum -bum -bum +axN odg xbp -sTq -sTq +lgg +oGZ pQg tFN tFN @@ -104835,13 +105322,13 @@ yhx yhx yhx yhx -yhx -yhx -yhx +nbC +nbC +nbC avT bBh avT -yhx +nbC yhx yhx yhx @@ -104865,7 +105352,7 @@ vDy rot avT jxB -qfJ +qjF rot avT wuf @@ -104997,9 +105484,10 @@ bxL bum bum bum -bum +axN xUL xUL +dDC bum bum bum @@ -105011,8 +105499,7 @@ bum bum bum bum -bum -bum +axN dQW rvf cly @@ -105094,12 +105581,12 @@ yhx yhx yhx yhx -yhx +nbC avT bBh avT -yhx -yhx +nbC +nbC yhx yhx yhx @@ -105122,7 +105609,7 @@ vDy rot avT jxB -qfJ +qjF rot avT avT @@ -105254,9 +105741,10 @@ bxL bxL bxL bum -bum +axN xUL xUL +dDC bum bum bum @@ -105268,8 +105756,7 @@ bum bum bum bum -bum -bum +axN xUL wDd alE @@ -105351,7 +105838,7 @@ yhx yhx yhx yhx -yhx +nbC avT bBh avT @@ -105379,7 +105866,7 @@ vDy rot avT jxB -qfJ +qjF rot avT avT @@ -105514,22 +106001,22 @@ bKI bKI xUL xUL -bum -bum -bum -bum -bum -bum -bum -bum -bum -bum -bum -bum -bum -bum -bum -bum +dFJ +azH +azH +azH +azH +azH +azH +azH +azH +azH +azH +azH +aHK +xUL +xUL +xUL xUL bOb xUL @@ -105608,7 +106095,7 @@ yhx yhx yhx yhx -yhx +nbC avT bBh avT @@ -105628,15 +106115,15 @@ avT avT avT avT -hGK +jEm avT avT avT -hGK +jEm avT avT avT -hGK +jEm avT avT avT @@ -105865,7 +106352,7 @@ yhx yhx yhx yhx -yhx +nbC avT rUq sXy @@ -105877,26 +106364,26 @@ oBl uyM dUH fUm -sXy -sXy -sXy -sXy -sXy -sXy -sXy -fNh -xUL -xUL -xUL -xUL -xUL -nyq -sXy -fNh -xUL -nyq -sXy -sXy +wMH +wMH +wMH +wMH +wMH +wMH +wMH +cWI +jWw +jWw +jWw +jWw +jWw +gIW +wMH +cWI +jWw +gIW +wMH +wMH uRc avT wuf @@ -106122,8 +106609,8 @@ yhx yhx yhx yhx -yhx -yhx +nbC +nbC avT avT avT @@ -106142,15 +106629,15 @@ avT avT avT avT -clq +oPk avT avT avT -clq +oPk avT avT avT -clq +oPk avT avT avT @@ -106285,24 +106772,24 @@ bKI bKI bxL bxL -bum -bum -bum -bum -bum -bum -bum -bum -bum -bum -bum -bum -bum -bum -bum -bum -bum -bum +aCr +aCr +aCr +aCr +aCr +aCr +aCr +aCr +aCr +aCr +aCr +aCr +aCr +aCr +aCr +aCr +aCr +aCr bxL bqN bqN @@ -106311,7 +106798,7 @@ bqN avT avT avT -bmX +avT avT avT avT @@ -106399,15 +106886,15 @@ avT avT avT jxB -mmM +qIW rot avT jxB -mmM +qIW rot avT jxB -knR +lQd rot avT avT @@ -106637,11 +107124,11 @@ yhx yhx yhx yhx -yhx -yhx -yhx -yhx -yhx +nbC +nbC +nbC +nbC +nbC yhx yhx yhx @@ -106656,15 +107143,15 @@ avT avT avT jxB -mmM +qIW rot avT jxB -mmM +qIW rot avT jxB -knR +lQd rot avT avT @@ -106913,15 +107400,15 @@ avT avT avT jxB -mmM +qIW rot avT jxB -mmM +qIW rot avT jxB -knR +lQd rot avT wuf @@ -107170,15 +107657,15 @@ avT avT avT jxB -mmM +qIW rot avT jxB -mmM +qIW rot avT jxB -knR +lQd rot avT wuf @@ -107427,15 +107914,15 @@ avT avT avT jxB -gTh +pvP rot avT jxB -gTh +pvP rot avT jxB -gTh +pvP rot avT wuf From 105c98d12f8cc3737545825bc83ece0ece985624 Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Sat, 29 Aug 2020 21:30:20 +0200 Subject: [PATCH 05/17] eminence moment commants out 'teleport to ark', gives the Eminence the ability to teleport to obelisks instead. --- .../clockcult/clock_mobs/_eminence.dm | 37 ++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/code/modules/antagonists/clockcult/clock_mobs/_eminence.dm b/code/modules/antagonists/clockcult/clock_mobs/_eminence.dm index 2f6a018a4c..dfda2bf152 100644 --- a/code/modules/antagonists/clockcult/clock_mobs/_eminence.dm +++ b/code/modules/antagonists/clockcult/clock_mobs/_eminence.dm @@ -251,7 +251,8 @@ var/mob/camera/eminence/E = owner E.eminence_help() -//Returns to the Ark +/* +//Returns to the Ark - Commented out and replaced with obelisk_jump /datum/action/innate/eminence/ark_jump name = "Return to Ark" desc = "Warps you to the Ark." @@ -265,6 +266,40 @@ flash_color(owner, flash_color = "#AF0AAF", flash_time = 25) else to_chat(owner, "There is no Ark!") +*/ + +//Warps to a chosen Obelisk +/datum/action/innate/eminence/obelisk_jump + name = "Warp to Obelisk" + desc = "Warps to a chosen clockwork obelisk." + button_icon_state = "Abscond" + +/datum/action/innate/eminence/obelisk_jump/Activate() + var/list/possible_targets = list() + var/list/warpnames = list() + + for(var/obj/structure/destructible/clockwork/powered/clockwork_obelisk/O in GLOB.all_clockwork_objects) + if(!O.Adjacent(owner) && O.anchored) + var/area/A = get_area(O) + var/locname = initial(A.name) + possible_targets[avoid_assoc_duplicate_keys("[locname] [O.name]", warpnames)] = O + + if(!possible_targets.len) + to_chat(owner, "There are no Obelisks to warp to!") + return + + var/target_key = input(owner, "Choose an Obelisk to warp to.", "Obelisk Warp") as null|anything in possible_targets + var/obj/structure/destructible/clockwork/powered/clockwork_obelisk/target = possible_targets[target_key] + + if(!target_key || !owner) + return + + if(!target) + to_chat(owner, "That Obelisk does no longer exist!") + return + owner.forceMove(get_turf(target)) + owner.playsound_local(owner, 'sound/magic/magic_missile.ogg', 50, TRUE) + flash_color(owner, flash_color = "#AF0AAF", flash_time = 25) //Warps to the Station /datum/action/innate/eminence/station_jump From 6725ced4536b668be76cf51bb346dd35bbed33dd Mon Sep 17 00:00:00 2001 From: Putnam Date: Sat, 29 Aug 2020 16:45:16 -0700 Subject: [PATCH 06/17] Makes heretics actually able to be edited in the config. --- code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm | 6 +++--- code/modules/antagonists/eldritch_cult/eldritch_antag.dm | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm index 766ddcefc7..21afaab261 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm @@ -151,15 +151,15 @@ /datum/dynamic_ruleset/roundstart/heretics name = "Heretics" - antag_flag = ROLE_HERETIC + antag_flag = "heretic" antag_datum = /datum/antagonist/heretic protected_roles = list("Prisoner","Security Officer", "Warden", "Detective", "Head of Security", "Captain") restricted_roles = list("AI", "Cyborg") required_candidates = 1 weight = 3 - cost = 20 + cost = 25 scaling_cost = 15 - requirements = list(50,45,45,40,35,20,20,15,10,10) + requirements = list(60,60,60,55,50,50,50,50,50,50) antag_cap = list(1,1,1,1,2,2,2,2,3,3) diff --git a/code/modules/antagonists/eldritch_cult/eldritch_antag.dm b/code/modules/antagonists/eldritch_cult/eldritch_antag.dm index 367710b110..476a3fed59 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_antag.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_antag.dm @@ -6,6 +6,7 @@ job_rank = ROLE_HERETIC antag_hud_type = ANTAG_HUD_HERETIC antag_hud_name = "heretic" + threat = 25 var/give_equipment = TRUE var/list/researched_knowledge = list() var/total_sacrifices = 0 From 9a4c76e7876e634e840d5957573b1fbaaaf5b30b Mon Sep 17 00:00:00 2001 From: Putnam Date: Sat, 29 Aug 2020 16:47:07 -0700 Subject: [PATCH 07/17] Added property weights to heretic, too. --- code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm index 21afaab261..34c9e73532 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm @@ -160,6 +160,7 @@ cost = 25 scaling_cost = 15 requirements = list(60,60,60,55,50,50,50,50,50,50) + property_weights = list("story_potential" = 1, "trust" = -1, "chaos" = 2, "extended" = -1, "valid" = 2) antag_cap = list(1,1,1,1,2,2,2,2,3,3) From 64e379c7ed68b2c18651791b45b82453162350c6 Mon Sep 17 00:00:00 2001 From: Putnam Date: Sat, 29 Aug 2020 16:51:38 -0700 Subject: [PATCH 08/17] Added property weights to latejoin heretics, too --- code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm | 6 ++++-- code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm index 63574c6475..35da2aaa10 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm @@ -205,8 +205,10 @@ restricted_roles = list("AI","Cyborg") required_candidates = 1 weight = 4 - cost = 10 - requirements = list(40,30,20,10,10,10,10,10,10,10) + cost = 25 + requirements = list(60,60,60,55,50,50,50,50,50,50) + high_population_requirement = 50 + property_weights = list("story_potential" = 1, "trust" = -1, "chaos" = 2, "extended" = -1, "valid" = 2) repeatable = TRUE ////////////////////////////////////////////// diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm index 34c9e73532..db4ec99558 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm @@ -162,6 +162,7 @@ requirements = list(60,60,60,55,50,50,50,50,50,50) property_weights = list("story_potential" = 1, "trust" = -1, "chaos" = 2, "extended" = -1, "valid" = 2) antag_cap = list(1,1,1,1,2,2,2,2,3,3) + high_population_requirement = 50 /datum/dynamic_ruleset/roundstart/heretics/pre_execute() From d8d67d3d3e51ea60b36f3644e85f09f9bd592cab Mon Sep 17 00:00:00 2001 From: Putnam Date: Sat, 29 Aug 2020 16:51:57 -0700 Subject: [PATCH 09/17] And fixed their antag flag, too --- code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm index 35da2aaa10..d2fa8bcc70 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm @@ -200,7 +200,7 @@ /datum/dynamic_ruleset/latejoin/heretic_smuggler name = "Heretic Smuggler" antag_datum = /datum/antagonist/heretic - antag_flag = ROLE_HERETIC + antag_flag = "latejoin_heretic" protected_roles = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") restricted_roles = list("AI","Cyborg") required_candidates = 1 From dd6be82e06cec40c501343bf4a62494ad09980dd Mon Sep 17 00:00:00 2001 From: Putnam Date: Sat, 29 Aug 2020 18:43:15 -0700 Subject: [PATCH 10/17] Made heretics scale dynamic threat with power. --- .../antagonists/eldritch_cult/eldritch_antag.dm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/code/modules/antagonists/eldritch_cult/eldritch_antag.dm b/code/modules/antagonists/eldritch_cult/eldritch_antag.dm index 476a3fed59..79dfbdd7c3 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_antag.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_antag.dm @@ -6,7 +6,7 @@ job_rank = ROLE_HERETIC antag_hud_type = ANTAG_HUD_HERETIC antag_hud_name = "heretic" - threat = 25 + threat = 10 var/give_equipment = TRUE var/list/researched_knowledge = list() var/total_sacrifices = 0 @@ -209,6 +209,14 @@ /datum/antagonist/heretic/proc/get_all_knowledge() return researched_knowledge +/datum/antagonist/heretic/threat() + . = ..() + for(var/X in researched_knowledge) + var/datum/eldritch_knowledge/EK = researched_knowledge[X] + . += EK.cost + if(ascended) + . += 20 + //////////////// // Objectives // //////////////// From a0adc984cd1db1d8a3a30bb89b92805682472a1f Mon Sep 17 00:00:00 2001 From: necromanceranne <40847847+necromanceranne@users.noreply.github.com> Date: Sun, 30 Aug 2020 12:19:38 +1000 Subject: [PATCH 11/17] ports #52214 from /tg/ --- code/game/mecha/mecha_defense.dm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/code/game/mecha/mecha_defense.dm b/code/game/mecha/mecha_defense.dm index 40336fb01e..e2d3af149f 100644 --- a/code/game/mecha/mecha_defense.dm +++ b/code/game/mecha/mecha_defense.dm @@ -1,12 +1,10 @@ /obj/mecha/proc/get_armour_facing(relative_dir) switch(relative_dir) - if(0) // BACKSTAB! + if(180) // BACKSTAB! return facing_modifiers[BACK_ARMOUR] - if(45, 90, 270, 315) - return facing_modifiers[SIDE_ARMOUR] - if(225, 180, 135) + if(0, 45) // direct or 45 degrees off return facing_modifiers[FRONT_ARMOUR] - return 1 //always return non-0 + return facing_modifiers[SIDE_ARMOUR] //if its not a front hit or back hit then assume its from the side /obj/mecha/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir) . = ..() @@ -43,7 +41,7 @@ break if(attack_dir) - var/facing_modifier = get_armour_facing(dir2angle(attack_dir) - dir2angle(src)) + var/facing_modifier = get_armour_facing(abs(dir2angle(dir) - dir2angle(attack_dir))) booster_damage_modifier /= facing_modifier booster_deflection_modifier *= facing_modifier if(prob(deflect_chance * booster_deflection_modifier)) From 19b856aebfdf10476a43251e5c5b2b9eec037714 Mon Sep 17 00:00:00 2001 From: Putnam Date: Sat, 29 Aug 2020 20:23:11 -0700 Subject: [PATCH 12/17] Removed story's curve. --- code/game/gamemodes/dynamic/dynamic_storytellers.dm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/code/game/gamemodes/dynamic/dynamic_storytellers.dm b/code/game/gamemodes/dynamic/dynamic_storytellers.dm index ba87342679..d6d2c8de3e 100644 --- a/code/game/gamemodes/dynamic/dynamic_storytellers.dm +++ b/code/game/gamemodes/dynamic/dynamic_storytellers.dm @@ -331,12 +331,6 @@ Property weights are added to the config weight of the ruleset. They are: flags = USE_PREV_ROUND_WEIGHTS property_weights = list("story_potential" = 2) - -/datum/dynamic_storyteller/story/calculate_threat() - var/current_time = (world.time / SSautotransfer.targettime)*180 - mode.threat_level = round((mode.initial_threat_level*(sin(current_time)/2)+0.75),0.1) - return ..() - /datum/dynamic_storyteller/classic name = "Classic" config_tag = "classic" From 669bab841c813ad462495589a82ed455dc8dbdb5 Mon Sep 17 00:00:00 2001 From: Putnam Date: Sat, 29 Aug 2020 20:44:45 -0700 Subject: [PATCH 13/17] Made cost being more than threat delta more punished. --- code/game/gamemodes/dynamic/dynamic_storytellers.dm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/code/game/gamemodes/dynamic/dynamic_storytellers.dm b/code/game/gamemodes/dynamic/dynamic_storytellers.dm index d6d2c8de3e..dd281c456f 100644 --- a/code/game/gamemodes/dynamic/dynamic_storytellers.dm +++ b/code/game/gamemodes/dynamic/dynamic_storytellers.dm @@ -147,7 +147,7 @@ Property weights are added to the config weight of the ruleset. They are: property_weight += rule.property_weights[property] * property_weights[property] var/threat_weight = 1 if(!(rule.flags & TRAITOR_RULESET) || (rule.flags & MINOR_RULESET)) // makes the traitor rulesets always possible anyway - var/cost_difference = abs(rule.cost-(mode.threat_level-mode.threat)) + var/cost_difference = rule.cost-(mode.threat_level-mode.threat) /* Basically, the closer the cost is to the current threat-level-away-from-threat, the more likely it is to pick this particular ruleset. Let's use a toy example: there's 60 threat level and 10 threat spent. @@ -157,7 +157,9 @@ Property weights are added to the config weight of the ruleset. They are: is 2.26 times as likely to be picked, all other things considered. Of course, we don't want it to GUARANTEE the closest, that's no fun, so it's just a weight. */ - threat_weight = abs(1-abs(1-LOGISTIC_FUNCTION(2,0.05,cost_difference,0))) + threat_weight = abs(1-abs(1-LOGISTIC_FUNCTION(2,0.05,abs(cost_difference),0))) + if(cost_difference > 0) + threat_weight /= (1+(cost_difference*0.1)) var/calced_weight = (rule.get_weight() + property_weight) * rule.weight_mult * threat_weight if(calced_weight > 0) drafted_rules[rule] = calced_weight @@ -184,8 +186,10 @@ Property weights are added to the config weight of the ruleset. They are: property_weight += rule.property_weights[property] * property_weights[property] var/threat_weight = 1 if(!(rule.flags & TRAITOR_RULESET) || (rule.flags & MINOR_RULESET)) - var/cost_difference = abs(rule.cost-(mode.threat_level-mode.threat)) - threat_weight = 1-abs(1-(LOGISTIC_FUNCTION(2,0.05,cost_difference,0))) + var/cost_difference = rule.cost-(mode.threat_level-mode.threat) + threat_weight = 1-abs(1-(LOGISTIC_FUNCTION(2,0.05,abs(cost_difference),0))) + if(cost_difference > 0) + threat_weight /= (1+(cost_difference*0.1)) var/calced_weight = (rule.get_weight() + property_weight) * rule.weight_mult * threat_weight if(calced_weight > 0) drafted_rules[rule] = calced_weight From 7c11f4ec4affd08d95f2f0540b01859ac5e3212e Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 29 Aug 2020 23:40:17 -0500 Subject: [PATCH 14/17] Automatic changelog generation for PR #13302 [ci skip] --- html/changelogs/AutoChangeLog-pr-13302.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-13302.yml diff --git a/html/changelogs/AutoChangeLog-pr-13302.yml b/html/changelogs/AutoChangeLog-pr-13302.yml new file mode 100644 index 0000000000..5978601890 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13302.yml @@ -0,0 +1,4 @@ +author: "Couls, ported by NecromancerAnne" +delete-after: True +changes: + - code_imp: "cleans up mech backstabbing code" From 896a18136b655a65e8e48b1e69781fcb68c46099 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 29 Aug 2020 23:40:26 -0500 Subject: [PATCH 15/17] Automatic changelog generation for PR #13298 [ci skip] --- html/changelogs/AutoChangeLog-pr-13298.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-13298.yml diff --git a/html/changelogs/AutoChangeLog-pr-13298.yml b/html/changelogs/AutoChangeLog-pr-13298.yml new file mode 100644 index 0000000000..d05c29838b --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13298.yml @@ -0,0 +1,5 @@ +author: "DeltaFire15" +delete-after: True +changes: + - rscdel: "teleport-to-ark ability of the eminence, commented out" + - rscadd: "teleport-to-obelisk ability for the eminence" From 328d1f255cc5cac8b5ce2e46d918b371b44c32a5 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 29 Aug 2020 23:40:50 -0500 Subject: [PATCH 16/17] Automatic changelog generation for PR #13293 [ci skip] --- html/changelogs/AutoChangeLog-pr-13293.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-13293.yml diff --git a/html/changelogs/AutoChangeLog-pr-13293.yml b/html/changelogs/AutoChangeLog-pr-13293.yml new file mode 100644 index 0000000000..a03ccef29c --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13293.yml @@ -0,0 +1,4 @@ +author: "lolman360" +delete-after: True +changes: + - bugfix: "shuttle engine/heater sprites now face the right way" From 55226048b22255b9ef8e22b30b22edcda9a243e2 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 29 Aug 2020 23:41:09 -0500 Subject: [PATCH 17/17] Automatic changelog generation for PR #13292 [ci skip] --- html/changelogs/AutoChangeLog-pr-13292.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-13292.yml diff --git a/html/changelogs/AutoChangeLog-pr-13292.yml b/html/changelogs/AutoChangeLog-pr-13292.yml new file mode 100644 index 0000000000..cd239b63e1 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13292.yml @@ -0,0 +1,4 @@ +author: "Putnam3145" +delete-after: True +changes: + - bugfix: "Dynamic storytellers now calculate property weights properly."