From 62bc669d0619a9c4cdcdd61d729dfe7cb368f0cb Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Mon, 18 Mar 2024 14:12:14 -0700 Subject: [PATCH 01/10] fixes CI (#6347) Co-authored-by: silicons --- code/game/objects/random/mob.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/random/mob.dm b/code/game/objects/random/mob.dm index 5149dd3cc2f..887b0d19057 100644 --- a/code/game/objects/random/mob.dm +++ b/code/game/objects/random/mob.dm @@ -41,7 +41,8 @@ var/build_path = item_to_spawn() var/mob/living/simple_mob/M = new build_path(src.loc) - ASSERT(istype(M)) + if(!istype(M)) + return if(M.has_AI()) var/datum/ai_holder/AI = M.ai_holder AI.go_sleep() //Don't fight eachother while we're still setting up! From 8bac2b993369a199290a2a5eb06cea5c105a87e9 Mon Sep 17 00:00:00 2001 From: bearrrrrrrr <54826962+bearrrrrrrr@users.noreply.github.com> Date: Tue, 19 Mar 2024 18:35:33 -0400 Subject: [PATCH 02/10] adds 4 new hivebots (#6341) ## About The Pull Request 4 new hivebots Lurker - kiting, low-health hivebot that tries to snipe you from a long distance. low damage but will punish bad positioning. high armor pen - damage is low but consistent. very, very weak if you literally just walk up to them to give them the boots Scorcher - at request, higher-damage base hivebot w/ alien tech. 5 more damage and very light armor pen supressor - hivebot with TWOOOO GUUUNS (faster fire rate) that fires a weak proj that also does light agony damage. attempts to get into your face. faster than normal hivebots surveyor - slightly faster base hivebot w/ a cool sprite, mostly flavor ## Why It's Good For The Game more variety good? from top left to right surveyor (odie), lurker(mine), suppressor(mine), scorcher(odie) ![image](https://github.com/Citadel-Station-13/Citadel-Station-13-RP/assets/54826962/eb29f515-8470-429a-b66c-38683fae4840) ## Changelog :cl: add: lurker and suppressor hivebots /:cl: --------- Co-authored-by: LordME <58342752+TheLordME@users.noreply.github.com> --- code/game/objects/random/mob.dm | 12 +++- .../subtypes/mechanical/hivebot/hivebot.dm | 23 +++++++ .../mechanical/hivebot/ranged_damage.dm | 64 ++++++++++++++++++ .../mechanical/hivebot/ranged_damage_vr.dm | 19 ++++++ icons/mob/hivebot.dmi | Bin 19639 -> 25323 bytes 5 files changed, 115 insertions(+), 3 deletions(-) diff --git a/code/game/objects/random/mob.dm b/code/game/objects/random/mob.dm index 887b0d19057..c1ffe9d51d8 100644 --- a/code/game/objects/random/mob.dm +++ b/code/game/objects/random/mob.dm @@ -171,7 +171,9 @@ prob(5);/mob/living/simple_mob/mechanical/hivebot/ranged_damage/rapid, prob(5);/mob/living/simple_mob/mechanical/hivebot/ranged_damage/ion, prob(5);/mob/living/simple_mob/mechanical/hivebot/ranged_damage/laser, - prob(5);/mob/living/simple_mob/mechanical/hivebot/ranged_damage/strong) + prob(5);/mob/living/simple_mob/mechanical/hivebot/ranged_damage/strong, + prob(5);/mob/living/simple_mob/mechanical/hivebot/ranged_damage/suppressor, + prob(5);/mob/living/simple_mob/mechanical/hivebot/ranged_damage/kiting) /obj/random/mob/robotic/hivebot name = "Random Hivebot" @@ -182,12 +184,16 @@ /obj/random/mob/robotic/hivebot/item_to_spawn() return pick(prob(10);/mob/living/simple_mob/mechanical/hivebot, - prob(15);/mob/living/simple_mob/mechanical/hivebot/swarm, + prob(10);/mob/living/simple_mob/mechanical/hivebot/surveyor, + prob(5);/mob/living/simple_mob/mechanical/hivebot/swarm, prob(10);/mob/living/simple_mob/mechanical/hivebot/ranged_damage, prob(5);/mob/living/simple_mob/mechanical/hivebot/ranged_damage/rapid, prob(5);/mob/living/simple_mob/mechanical/hivebot/ranged_damage/ion, prob(5);/mob/living/simple_mob/mechanical/hivebot/ranged_damage/laser, - prob(5);/mob/living/simple_mob/mechanical/hivebot/ranged_damage/strong) + prob(5);/mob/living/simple_mob/mechanical/hivebot/ranged_damage/strong, + prob(5);/mob/living/simple_mob/mechanical/hivebot/ranged_damage/suppressor, + prob(5);/mob/living/simple_mob/mechanical/hivebot/ranged_damage/kiting, + prob(5);/mob/living/simple_mob/mechanical/hivebot/ranged_damage/scorcher) //Mice diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/hivebot.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/hivebot.dm index 78056574cca..aa258e951eb 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/hivebot.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/hivebot.dm @@ -109,3 +109,26 @@ attack_armor_pen = 50 attack_sharp = 1 attack_edge = 1 + + +/datum/category_item/catalogue/technology/drone/hivebot/surveyor + name = "Enigmatic Salvager Surveyor" + desc = "The most basic unit of the Enigmatic Salvagers- a surveyor. Made up of cheap parts that appear to be hastily put together. \ + They lack a standardized pattern, suggesting an amount of en-situ construction - machines that create machines that create machines that create machines. \ + What are they looking for, besides the standard salvage and wreckages?" + value = CATALOGUER_REWARD_EASY + +//bit faster than the default bot, weaker, basically a reskin for flavor +/mob/living/simple_mob/mechanical/hivebot/surveyor + name = "hivebot surveyor" + desc = "An unsteadily-built, willow-limbed bot of mismatched parts and absent technology. Has some kind of expedition pick repurposed as a blade." + icon_state = "surveyor" + icon_living = "surveyor" + + movement_cooldown = 0.6 SECONDS + + legacy_melee_damage_lower = 15 + legacy_melee_damage_upper = 15 + + catalogue_data = list(/datum/category_item/catalogue/technology/drone/hivebot/surveyor) + diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage.dm index a73424aae37..aa66abb8f4d 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage.dm @@ -203,3 +203,67 @@ base_attack_cooldown = 60 projectiletype = /obj/projectile/arc/fragmentation/mortar + + +//kiting hivebot, punishes indecisive behavior and overly-reliant melee, extremely weak to staying on their butt. not too stronk +//relatively weak bullets, but high armor pen for consistent damage. do not use in large quantities +/mob/living/simple_mob/mechanical/hivebot/ranged_damage/kiting + name = "hivebot lurker" + desc = "A hivebot with an attached plasma gun, and what seems to be mild cloaking-technology that reflects visible-wavelength." + icon_state = "lurker" + icon_living = "lurker" + alpha = 200 + movement_cooldown = 0.7 SECONDS + + projectiletype = /obj/projectile/beam/xray + ai_holder_type = /datum/ai_holder/simple_mob/ranged/kiting/sniper + + icon_scale_x = 1.4 + icon_scale_y = 1.4 + catalogue_data = list(/datum/category_item/catalogue/technology/drone/hivebot/lurker) + + + +//faster-moving hivebot that would love to get to know you more personal-like. causes light damage and also halloss, no armor pen. sorta-miniboss, more a 'hey, look at me RIGHT NOW' type of deal +/mob/living/simple_mob/mechanical/hivebot/ranged_damage/suppressor + name = "hivebot suppressor" + desc = "A hivebot with two weak, but rapid-fire shock-guns that fire painful bolts. Less-lethal, but rapid-firing." + icon_living = "suppressor" + icon_state = "suppressor" + base_attack_cooldown = 6 + movement_cooldown = 0.5 SECONDS + projectiletype = /obj/projectile/beam/smalllaser/hivebot + + maxHealth = 4 LASERS_TO_KILL + health = 4 LASERS_TO_KILL + + catalogue_data = list(/datum/category_item/catalogue/technology/drone/hivebot/suppressor) + + +/obj/projectile/beam/smalllaser/hivebot + damage = 25 + agony = 20 + muzzle_type = /obj/effect/projectile/muzzle/lightning + tracer_type = /obj/effect/projectile/tracer/lightning + impact_type = /obj/effect/projectile/impact/lightning + + +// stronker hivey, rare but very visible +/mob/living/simple_mob/mechanical/hivebot/ranged_damage/scorcher + name = "hivebot scorcher" + desc = "A hivebot with a vicious-looking, strange weapon attached to its arm." + + icon_state = "scorcher" + icon_living = "scorcher" + + maxHealth = 3 LASERS_TO_KILL + health = 3 LASERS_TO_KILL + + projectiletype = /obj/projectile/beam/cyan/hivebot + + catalogue_data = list(/datum/category_item/catalogue/technology/drone/hivebot/scorcher) + + +/obj/projectile/beam/cyan/hivebot + damage = 45 + armor_penetration = 15 diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage_vr.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage_vr.dm index 709ef583d1f..4958e9f9b6b 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage_vr.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage_vr.dm @@ -70,3 +70,22 @@ armor piercing flechettes of the piercer can penetrate even the most protective armors. It is suggested that the Piercer was \ first developed as the hivebot's answer to Unathi breacher RiGs and it has been a fitting answer indeed." value = CATALOGUER_REWARD_HARD + +/datum/category_item/catalogue/technology/drone/hivebot/suppressor + name = "Hizzori Clan Suppressor" + desc = "A Hizzori-clan hivebot. The Supressor is a fast, bulky hivebot with two weak, but fast-firing, taser guns. Oddly enough, the tasers appear \ + to be similar in design to those used by corporate security forces. Its programming also appears to heavily encourage aggreesive \ + behavior, causing...unpleasant close-range confrontations. Thankfully, each individual strike is not terribly powerful." + +/datum/category_item/catalogue/technology/drone/hivebot/scorcher + name = "Enigmatic Salvager Scorcher" + desc = "... firing mechanism, causing the weapon on its arm to be self-powered by some kind of paracausal loop that uses relative spacetime to charge the ..." + +/datum/category_item/catalogue/technology/drone/hivebot/lurker + name = "Enigmatic Salvager Lurker" + desc = "An Enigmatic Salvager- but it's so much more than that. Almost every race considered sapient on the General Intellegence Scale has a fear of \ + the dark. It's a deep fear, from when it was evolutionarily advantageous to huddle in close to the fire, in the light, to avoid the unknown. \ + A field that bends visible light, that interferes with thermal and scanners, cloaks this Lurker, swathing it in its own darkness. A single shot from the distant dark, \ + and it will scuttle away, content to wait for you to try to hide near your campfire again." + + diff --git a/icons/mob/hivebot.dmi b/icons/mob/hivebot.dmi index db2705793a6ee3f71805cb2bf3d0fbb4687f6671..4ae92edbb5021a96fb353187d4487bcf846c4dc1 100644 GIT binary patch literal 25323 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

ek1Sak!HJ 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 SPW1u{$sl)vmrDbloccEw&cS2= From 78032dd3b203ada264fb04697fa83ef4dd8e16e5 Mon Sep 17 00:00:00 2001 From: LordME <58342752+TheLordME@users.noreply.github.com> Date: Tue, 19 Mar 2024 23:36:14 +0100 Subject: [PATCH 03/10] fixes wrong fake stairs on miaphus beach (#6352) ## About The Pull Request Fixes a couple runtimes that frequently occure during IntTests ## Why It's Good For The Game ## Changelog :cl: fix: fixes wrong fake stairs on miaphus beach fix: fixes duplicate lattice on debris14.dmm fix: adds extra check to submap seeding, checking if the tiles are empty fix: adds check when adding blood writing, to make sure we arent using to many instances per tile fix: fix rename_areas for the tiny carrier should happen during lateload to avoid not finding the shuttle /:cl: --- .../objects/effects/debris/cleanable/blood.dm | 3 +++ code/modules/mapping/submaps_legacy.dm | 5 ++++- .../modules/maps/overmap/space/debrisfield.dm | 6 +++++- .../miaphus_192/levels/miaphus_192_beach.dmm | 21 ++++++++----------- .../debrisfield_vr/debris14.dmm | 1 - 5 files changed, 21 insertions(+), 15 deletions(-) diff --git a/code/game/objects/effects/debris/cleanable/blood.dm b/code/game/objects/effects/debris/cleanable/blood.dm index 34a13789bf5..f87cbc9d534 100644 --- a/code/game/objects/effects/debris/cleanable/blood.dm +++ b/code/game/objects/effects/debris/cleanable/blood.dm @@ -184,6 +184,9 @@ var/global/list/image/splatter_cache=list() if(random_icon_states.len) for(var/obj/effect/debris/cleanable/blood/writing/W in loc) random_icon_states.Remove(W.icon_state) + if(!LAZYLEN(random_icon_states))//If all iconstates are already in used by someone else on our tile, delete yourself + qdel(src) + return icon_state = pick(random_icon_states) else icon_state = "writing1" diff --git a/code/modules/mapping/submaps_legacy.dm b/code/modules/mapping/submaps_legacy.dm index e4b1e43cf9f..da7b7554e26 100644 --- a/code/modules/mapping/submaps_legacy.dm +++ b/code/modules/mapping/submaps_legacy.dm @@ -83,7 +83,10 @@ // to_chat(world, "Invalid due to overlapping with area [new_area.type] at ([check.x], [check.y], [check.z]), when attempting to place at ([T.x], [T.y], [T.z]).") break CHECK_TICK - + if(LAZYLEN(check.contents))//The default space tile has no contents, so if there is something there, we shouldnt overwrite it + valid = FALSE + break + CHECK_TICK CHECK_TICK if(!valid) diff --git a/code/modules/maps/overmap/space/debrisfield.dm b/code/modules/maps/overmap/space/debrisfield.dm index f061cb34316..fc0806d6daf 100644 --- a/code/modules/maps/overmap/space/debrisfield.dm +++ b/code/modules/maps/overmap/space/debrisfield.dm @@ -186,7 +186,11 @@ \[i\]Class\[/i\]: Light Escort Carrier \[i\]Transponder\[/i\]: Transmitting (MIL), Weak Signal \[b\]Notice\[/b\]: Registration Expired"} - rename_areas(newname) + return INITIALIZE_HINT_LATELOAD + +/obj/overmap/entity/visitable/ship/landable/tinycarrier/LateInitialize() + . = ..() + rename_areas(scanner_name) /obj/overmap/entity/visitable/ship/landable/tinycarrier/proc/rename_areas(newname) var/datum/shuttle/S = SSshuttle.shuttles[shuttle] diff --git a/maps/sectors/miaphus_192/levels/miaphus_192_beach.dmm b/maps/sectors/miaphus_192/levels/miaphus_192_beach.dmm index c1175bccb68..b4ee05195d4 100644 --- a/maps/sectors/miaphus_192/levels/miaphus_192_beach.dmm +++ b/maps/sectors/miaphus_192/levels/miaphus_192_beach.dmm @@ -807,8 +807,8 @@ /turf/simulated/floor/wood, /area/tether_away/beach/mineshaft) "eZ" = ( -/obj/structure/stairs/middle{ - dir = 2 +/obj/effect/floor_decal/industrial/halfstair{ + dir = 1 }, /turf/simulated/floor/tiled/asteroid_steel, /area/tether_away/beach/desalinator) @@ -963,8 +963,8 @@ /turf/simulated/floor/wood, /area/tether_away/beach/resort/canteen) "gC" = ( -/obj/structure/stairs/middle{ - dir = 4 +/obj/effect/floor_decal/industrial/halfstair{ + dir = 8 }, /turf/simulated/floor/tiled/asteroid_steel, /area/tether_away/beach/desalinator) @@ -1414,8 +1414,8 @@ }, /area/tether_away/beach/mineshaft) "jJ" = ( -/obj/structure/stairs/middle{ - dir = 4 +/obj/effect/floor_decal/industrial/halfstair{ + dir = 8 }, /turf/simulated/floor/outdoors/beach/sand/desert, /area/tether_away/beach/desalinator) @@ -1601,9 +1601,7 @@ /turf/simulated/floor/wood/broken, /area/tether_away/beach/resort/dorm2) "la" = ( -/obj/structure/stairs/middle{ - dir = 1 - }, +/obj/effect/floor_decal/industrial/halfstair, /turf/simulated/mineral/floor/cave{ name = "dirt" }, @@ -2325,8 +2323,8 @@ /turf/simulated/floor/wood, /area/tether_away/beach/resort/dorm1) "rM" = ( -/obj/structure/stairs/middle{ - dir = 2 +/obj/effect/floor_decal/industrial/halfstair{ + dir = 1 }, /turf/simulated/floor/tiled/asteroid_steel{ outdoors = 1 @@ -5942,7 +5940,6 @@ }, /obj/machinery/atmospherics/pipe/manifold/visible/cyan{ desc = "Its bone dry."; - dir = 2; name = "water pipe" }, /turf/simulated/floor/tiled/steel_dirty, diff --git a/maps/submaps/level_specific/debrisfield_vr/debris14.dmm b/maps/submaps/level_specific/debrisfield_vr/debris14.dmm index a6e10fddebe..0b0a55241ff 100644 --- a/maps/submaps/level_specific/debrisfield_vr/debris14.dmm +++ b/maps/submaps/level_specific/debrisfield_vr/debris14.dmm @@ -31,7 +31,6 @@ /area/tether_away/debrisfield_vr/shuttle_buffer) "h" = ( /obj/structure/lattice, -/obj/structure/lattice, /turf/space, /area/tether_away/debrisfield_vr/shuttle_buffer) "i" = ( From 1d9044a65fbd274876ea34cf591d2a77541d90ad Mon Sep 17 00:00:00 2001 From: LordME <58342752+TheLordME@users.noreply.github.com> Date: Tue, 19 Mar 2024 23:36:36 +0100 Subject: [PATCH 04/10] Ghost weight, transfer obfuscation (#6345) ## About The Pull Request its adds an admin controllable and configurable ghost weight, and a config to obfuscate the transfer vote by default (admin still can decided to show the votes if they like) ## Why It's Good For The Game ## Changelog :cl: add: Added ghost weight modifiers config: Added config for transfer vote obfuscation config: Added config for the transfer vote tie default /:cl: --- code/controllers/subsystem/vote.dm | 75 ++++++++++++++++++-------- config/config.txt | 1 + config/entries/vote.txt | 7 +++ tgui/packages/tgui/interfaces/Vote.tsx | 40 ++++++++++++-- 4 files changed, 98 insertions(+), 25 deletions(-) create mode 100644 config/entries/vote.txt diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index 885cf5541cc..5dea5d4896e 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -22,6 +22,22 @@ SUBSYSTEM_DEF(vote) var/list/voting = list() /// Anonymous votes var/secret = FALSE + /// Ghost_weight on votes in % + var/ghost_weight_percent = 25 + + +/datum/config_entry/number/ghost_weight + default = 25 + +/datum/config_entry/flag/transfer_vote_obfuscation + default = FALSE + +/datum/config_entry/string/default_on_transfer_tie + default = "Extend the Shift" + +/datum/controller/subsystem/vote/Initialize(start_timeofday) + . = ..() + ghost_weight_percent = CONFIG_GET(number/ghost_weight) /datum/controller/subsystem/vote/fire(resumed) if(mode) @@ -66,6 +82,8 @@ SUBSYSTEM_DEF(vote) choices.Cut() votes_by_choice.Cut() current_votes.Cut() + secret = FALSE + ghost_weight_percent = CONFIG_GET(number/ghost_weight) /datum/controller/subsystem/vote/proc/get_result() // Get the highest number of votes var/greatest_votes = 0 @@ -89,16 +107,18 @@ SUBSYSTEM_DEF(vote) /datum/controller/subsystem/vote/proc/announce_result() var/list/winners = get_result() var/text + if(mode == VOTE_CREW_TRANSFER) + switch(LAZYLEN(winners)) + if(0) + . = "Initiate Crew Transfer" + if(2) + . = CONFIG_GET(string/default_on_transfer_tie) if(LAZYLEN(winners) > 0) . = pick(winners) - - if(SSticker.hide_mode == 0) // Announce Extended gamemode, but not other gamemodes - text += "Vote Result: [.]" - else - text += "The vote has ended." - + text += "Vote Result: [.]" else text += "Vote Result: Inconclusive - No Votes!" + for(var/option in choices) text += SPAN_NOTICE("\n[option] - [votes_by_choice[option] || 0]") log_vote(text) @@ -125,20 +145,23 @@ SUBSYSTEM_DEF(vote) log_game("Rebooting due to restart vote") world.Reboot() -/datum/controller/subsystem/vote/proc/submit_vote(ckey, newVote) - +/datum/controller/subsystem/vote/proc/submit_vote(user, ckey, newVote) + //if they are a observer or a newplayer(in lobby) use ghost weight, otherwise use 1 + var/weight = (isobserver(user) || isnewplayer(user)) ? ghost_weight_percent / 100 : 1 if(mode) - if(config_legacy.vote_no_dead && usr.stat == DEAD && !usr.client.holder) + if(weight == 0) return if(newVote) if(current_votes[ckey]) - votes_by_choice[current_votes[ckey]]-- - current_votes[ckey] = choices[newVote] - votes_by_choice[choices[newVote]]++ + votes_by_choice[current_votes[ckey][2]] -= current_votes[ckey][1] + current_votes[ckey] = list(weight, choices[newVote]) + votes_by_choice[current_votes[ckey][2]] += current_votes[ckey][1] else - votes_by_choice[current_votes[ckey]]-- + votes_by_choice[current_votes[ckey][2]] -= current_votes[ckey][1] current_votes[ckey] = null + + /datum/controller/subsystem/vote/proc/initiate_vote(vote_type, initiator_key, automatic = FALSE, time = config_legacy.vote_period) if(!mode) if(started_time != null && !(check_rights(R_ADMIN) || automatic)) @@ -146,7 +169,7 @@ SUBSYSTEM_DEF(vote) if(next_allowed_time > world.time) return 0 - reset() + //reset() switch(vote_type) if(VOTE_RESTART) @@ -158,6 +181,7 @@ SUBSYSTEM_DEF(vote) choices.Add("Initiate Crew Transfer", "Extend the Shift") votes_by_choice["Initiate Crew Transfer"] = 0 votes_by_choice["Extend the Shift"] = 0 + secret = CONFIG_GET(flag/transfer_vote_obfuscation) if(VOTE_CUSTOM) question = sanitizeSafe(input(usr, "What is the vote for?") as text|null) if(!question) @@ -180,7 +204,8 @@ SUBSYSTEM_DEF(vote) var/text = "[capitalize(mode)] vote started by [initiator]." if(mode == VOTE_CUSTOM) text += "\n[question]" - + if(ghost_weight_percent <= 0) + text += SPAN_NOTICE("\nGhosts are excluded from the vote.") log_vote(text) to_chat(world, "[text]\nType vote or click here to place your votes.\nYou have [config_legacy.vote_period / 10] seconds to vote.") @@ -212,7 +237,7 @@ SUBSYSTEM_DEF(vote) // Tracks who is voting if(!(user.client?.ckey in voting)) voting += user.client?.ckey - current_votes[user.client?.ckey] = null + //current_votes[user.client?.ckey] = null ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, "Vote") @@ -222,12 +247,14 @@ SUBSYSTEM_DEF(vote) var/list/data = list( "choices" = list(), "question" = question, - "selected_choice" = LAZYACCESS(current_votes,user.key) ? LAZYACCESS(current_votes,user.key) : "", + "selected_choice" = LAZYACCESS(current_votes,user.key) ? LAZYACCESS(current_votes,user.key)[2] : "", "time_remaining" = time_remaining, "admin" = check_rights_for(user.client, R_ADMIN), "vote_happening" = !!choices.len, "secret" = secret, + "ghost_weight" = ghost_weight_percent, + "ghost" = isobserver(user) || isnewplayer(user), ) for(var/key in choices) @@ -265,10 +292,16 @@ SUBSYSTEM_DEF(vote) initiate_vote(VOTE_CUSTOM, usr.key) if("vote") //current_votes[usr.client.ckey] = round(text2num(params["index"])) - submit_vote(usr.key,params["index"]) + submit_vote(usr, usr.key,params["index"]) if("unvote") - submit_vote(usr.key, null) + submit_vote(usr, usr.key, null) if("hide") - secret = !secret - log_and_message_admins("[usr] made the individual vote numbers [(secret ? "invisibile" : "visible")].") + if(admin) + secret = !secret + log_and_message_admins("[usr] made the individual vote numbers [(secret ? "invisibile" : "visible")].") + if("ghost_weight") + if(admin) + ghost_weight_percent = params["ghost_weight"] ? max(0, text2num(params["ghost_weight"])) : ghost_weight_percent + log_and_message_admins("[usr] changed the ghost vote weight to [ghost_weight_percent].") + return TRUE diff --git a/config/config.txt b/config/config.txt index 5576218d316..c04021d58e9 100644 --- a/config/config.txt +++ b/config/config.txt @@ -15,3 +15,4 @@ $include entries/resources.txt $include entries/security.txt $include entries/skills.txt $include entries/urls.txt +$include entries/vote.txt diff --git a/config/entries/vote.txt b/config/entries/vote.txt new file mode 100644 index 00000000000..72bf54369b2 --- /dev/null +++ b/config/entries/vote.txt @@ -0,0 +1,7 @@ +### ghost weight on votes +GHOST_WEIGHT 25 +### Should the transfer vote be obfuscated? +TRANSFER_VOTE_OBFUSCATION 1 +### What should a tie in transfer vote default to +DEFAULT_ON_TRANSFER_TIE Extend the Shift + diff --git a/tgui/packages/tgui/interfaces/Vote.tsx b/tgui/packages/tgui/interfaces/Vote.tsx index 2ec6c83f5cb..0afa7ecf983 100644 --- a/tgui/packages/tgui/interfaces/Vote.tsx +++ b/tgui/packages/tgui/interfaces/Vote.tsx @@ -7,6 +7,7 @@ import { Button, Section, NoticeBox, + NumberInput, LabeledList, Collapsible, } from "../components"; @@ -20,6 +21,8 @@ interface VoteContext { question: string; time_remaining : number; secret : BooleanLike; + ghost : BooleanLike; + ghost_weight : number; } interface VoteChoice { @@ -41,6 +44,7 @@ export const Vote = (props, context) => { {!!admin && (

+
)} @@ -62,7 +66,7 @@ export const Vote = (props, context) => { const StartVoteOptions = (props, context) => { const { act, data } = useBackend(context); - const { vote_happening, secret } = data; + const { vote_happening } = data; return ( @@ -93,13 +97,41 @@ const StartVoteOptions = (props, context) => { Custom Vote + + + + + + ); +}; + +const VoteConfig = (props, context) => { + const { act, data } = useBackend(context); + const { ghost_weight, secret } = data; + return ( + + + + + + + Ghost weight: + act('ghost_weight', { ghost_weight: value })} + /> + @@ -112,7 +144,7 @@ const StartVoteOptions = (props, context) => { // Display choices const ChoicesPanel = (props, context) => { const { act, data } = useBackend(context); - const { admin, choices, selected_choice, question, secret } = data; + const { ghost_weight, ghost, admin, choices, selected_choice, question, secret } = data; return ( @@ -129,7 +161,7 @@ const ChoicesPanel = (props, context) => { color={ selected_choice !== choice.name ? "green" : "grey" } - disabled={choice.name === selected_choice} + disabled={choice.name === selected_choice || (ghost_weight === 0 && ghost)} onClick={() => { act("vote", { index: i + 1 }); }} From 3ec479a92b59e53226c947b868a19afd2a8b6bed Mon Sep 17 00:00:00 2001 From: Monara <86886852+MonaraMir@users.noreply.github.com> Date: Wed, 20 Mar 2024 20:02:01 -0400 Subject: [PATCH 05/10] Atlas Genpop (#6339) ## About The Pull Request Removes isolation cells with timers on them, replaces them with a genpop system. This PR only affects Rift(atlas). ## Why It's Good For The Game GBJ is awful, especially when security is the one doing it to you. This will also make it easier to get event roles to play, since they wont be forced into the youtube cells to afk the rest of the round away. Yes, there are still ways to isolate prisoners if they are attacking each other in prison, but it should hopefully be used as a last resort only. PR #6346 must be merged before/alongside this PR ## Changelog :cl: add: Refurbished Genpop, and put turnstiles and prisoner lockers into effect on Atlas. del: Deleted old timed cells on Atlas /:cl: ![1](https://github.com/Citadel-Station-13/Citadel-Station-13-RP/assets/86886852/ba9f45cd-ad43-4356-834a-9a9dddc128de) ![2](https://github.com/Citadel-Station-13/Citadel-Station-13-RP/assets/86886852/9a029898-3a23-4113-8d4b-3286571ea799) ![3](https://github.com/Citadel-Station-13/Citadel-Station-13-RP/assets/86886852/dc5478a1-8d7e-46d2-8f2c-dcdec30a3ab6) --------- Co-authored-by: LordME <58342752+TheLordME@users.noreply.github.com> --- citadel.dme | 1 + code/game/area/Space Station 13 areas.dm | 229 - code/game/area/station/security_areas.dm | 236 + code/game/objects/structures/curtains.dm | 4 + maps/rift/levels/rift-02-underground2.dmm | 11 +- maps/rift/levels/rift-03-underground1.dmm | 9344 ++++++++++++--------- maps/rift/levels/rift-04-surface1.dmm | 5239 +++++++----- maps/rift/levels/rift-05-surface2.dmm | 2758 +++--- maps/rift/levels/rift-06-surface3.dmm | 2630 +++--- maps/rift/levels/rift-09-west_caves.dmm | 7619 +++++++++-------- maps/rift/levels/rift-10-west_plains.dmm | 285 +- maps/rift/levels/rift-11-orbital.dmm | 111 +- 12 files changed, 15213 insertions(+), 13254 deletions(-) create mode 100644 code/game/area/station/security_areas.dm diff --git a/citadel.dme b/citadel.dme index 08ea92e3cc8..99d21ed069d 100644 --- a/citadel.dme +++ b/citadel.dme @@ -967,6 +967,7 @@ #include "code\game\area\ss13_deprecated_areas.dm" #include "code\game\area\Tether_areas.dm" #include "code\game\area\station\exporation.dm" +#include "code\game\area\station\security_areas.dm" #include "code\game\atoms\action_feedback.dm" #include "code\game\atoms\appearance.dm" #include "code\game\atoms\atom.dm" diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm index ad5ff4ef9b5..1571fb01b9e 100644 --- a/code/game/area/Space Station 13 areas.dm +++ b/code/game/area/Space Station 13 areas.dm @@ -2412,235 +2412,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "\improper Psych Ward" icon_state = "psych_ward" -//Security - -/area/security - nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES - -/area/security/main - name = "\improper Security Office" - icon_state = "security" - nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES - -/area/security/lobby - name = "\improper Security Lobby" - icon_state = "security" - nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_HALLWAYS - -/area/security/brig - name = "\improper Security - Brig" - icon_state = "brig" - -/area/security/brig/prison_break() - for(var/obj/structure/closet/secure_closet/brig/temp_closet in src) - temp_closet.locked = 0 - temp_closet.icon_state = temp_closet.icon_closed - for(var/obj/machinery/door_timer/temp_timer in src) - temp_timer.timer_duration = 1 - ..() - -/area/security/prison - name = "\improper Security - Prison Wing" - icon_state = "sec_prison" - -/area/security/prison/prison_break() - for(var/obj/structure/closet/secure_closet/brig/temp_closet in src) - temp_closet.locked = 0 - temp_closet.icon_state = temp_closet.icon_closed - for(var/obj/machinery/door_timer/temp_timer in src) - temp_timer.timer_duration = 1 - ..() - -/area/security/warden - name = "\improper Security - Warden's Office" - icon_state = "Warden" - -/area/security/armoury - name = "\improper Security - Armory" - icon_state = "armory" - ambience = AMBIENCE_HIGHSEC - area_flags = AREA_FLAG_BLUE_SHIELDED - nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_SENSITIVE - -/area/security/briefing_room - name = "\improper Security - Briefing Room" - icon_state = "brig" - -/area/security/evidence_storage - name = "\improper Security - Equipment Storage" - icon_state = "security_equipment_storage" - -/area/security/evidence_storage - name = "\improper Security - Evidence Storage" - icon_state = "evidence_storage" - -/area/security/interrogation - name = "\improper Security - Interrogation" - icon_state = "interrogation" - -/area/security/riot_control - name = "\improper Security - Riot Control" - icon_state = "riot_control" - nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_SENSITIVE - -/area/security/detectives_office - name = "\improper Security - Forensic Office" - icon_state = "detective" - sound_env = MEDIUM_SOFTFLOOR - -/area/security/range - name = "\improper Security - Firing Range" - icon_state = "firingrange" - -/area/security/security_aid_station - name = "\improper Security - Security Aid Station" - icon_state = "security_aid_station" - -/area/security/security_bathroom - name = "\improper Security - Restroom" - icon_state = "security_bathroom" - sound_env = SMALL_ENCLOSED - -/area/security/security_cell_hallway - name = "\improper Security - Cell Hallway" - icon_state = "security_cell_hallway" - -/area/security/security_equiptment_storage - name = "\improper Security - Equipment Storage" - icon_state = "security_equip_storage" - -/area/security/security_lockerroom - name = "\improper Security - Locker Room" - icon_state = "security_lockerroom" - -/area/security/security_processing - name = "\improper Security - Security Processing" - icon_state = "security_processing" - -/area/security/tactical - name = "\improper Security - Tactical Equipment" - icon_state = "Tactical" - ambience = AMBIENCE_HIGHSEC - area_flags = AREA_FLAG_BLUE_SHIELDED - -/area/security/hallway - name = "\improper Security Hallway" - icon_state = "security" - -/area/security/hallwayaux - name = "\improper Security Armory Hallway" - icon_state = "security" - -/area/security/forensics - name = "\improper Forensics Lab" - icon_state = "security" - -/area/security/breakroom - name = "\improper Security Breakroom" - icon_state = "security" - nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_LEISURE - -/area/security/brig/visitation - name = "\improper Visitation" - icon_state = "security" - -/area/security/brig/bathroom - name = "\improper Brig Bathroom" - icon_state = "security" - -/area/security/armory/blue - name = "\improper Armory - Blue" - icon_state = "armory" - -/area/security/armory/red - name = "\improper Armory - Red" - icon_state = "red2" - -/area/security/observation - name = "\improper Brig Observation" - icon_state = "riot_control" - -/area/security/eva - name = "\improper Security EVA" - icon_state = "security_equip_storage" - -/area/security/recstorage - name = "\improper Brig Recreation Storage" - icon_state = "brig" - -/area/security/training - name = "\improper Training & Briefing Room" - icon_state = "security" - -/area/security/hanger - name = "\improper Security Hanger" - icon_state = "security_equip_storage" - -/area/security/visitor - name = "\improper Security Visitor Room" - icon_state = "security" - nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_HALLWAYS - -/* - New() - ..() - - spawn(10) //let objects set up first - for(var/turf/turfToGrayscale in src) - if(turfToGrayscale.icon) - var/icon/newIcon = icon(turfToGrayscale.icon) - newIcon.GrayScale() - turfToGrayscale.icon = newIcon - for(var/obj/objectToGrayscale in turfToGrayscale) //1 level deep, means tables, apcs, locker, etc, but not locker contents - if(objectToGrayscale.icon) - var/icon/newIcon = icon(objectToGrayscale.icon) - newIcon.GrayScale() - objectToGrayscale.icon = newIcon -*/ - -/area/security/nuke_storage - name = "\improper Vault" - icon_state = "nuke_storage" - ambience = AMBIENCE_HIGHSEC - area_flags = AREA_FLAG_BLUE_SHIELDED - -/area/security/checkpoint - name = "\improper Security Checkpoint" - icon_state = "checkpoint1" - -/area/security/checkpoint2 - name = "\improper Security - Arrival Checkpoint" - icon_state = "security" - ambience = AMBIENCE_ARRIVALS - -/area/security/checkpoint/supply - name = "Security Post - Cargo Bay" - icon_state = "checkpoint1" - -/area/security/checkpoint/engineering - name = "Security Post - Engineering" - icon_state = "checkpoint1" - -/area/security/checkpoint/medical - name = "Security Post - Medbay" - icon_state = "checkpoint1" - -/area/security/checkpoint/science - name = "Security Post - Science" - icon_state = "checkpoint1" - -/area/security/vacantoffice - name = "\improper Vacant Office" - icon_state = "security" - -/area/security/vacantoffice2 - name = "\improper Vacant Office" - icon_state = "security" - -/area/security/hammerhead_bay - name = "\improper Hammerhead Barge Hangar" - icon_state = "hangar" - /area/janitor/ name = "\improper Custodial Closet" icon_state = "janitor" diff --git a/code/game/area/station/security_areas.dm b/code/game/area/station/security_areas.dm new file mode 100644 index 00000000000..18c36fdcd44 --- /dev/null +++ b/code/game/area/station/security_areas.dm @@ -0,0 +1,236 @@ +//Security + +/area/security + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES + +/area/security/main + name = "\improper Security Office" + icon_state = "security" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES + +/area/security/lobby + name = "\improper Security Lobby" + icon_state = "security" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_HALLWAYS + +/area/security/brig + name = "\improper Security - Brig" + icon_state = "brig" + +/area/security/brig/prison_break() + for(var/obj/structure/closet/secure_closet/brig/temp_closet in src) + temp_closet.locked = 0 + temp_closet.icon_state = temp_closet.icon_closed + for(var/obj/machinery/door_timer/temp_timer in src) + temp_timer.timer_duration = 1 + ..() + +/area/security/prison + name = "\improper Security - Prison Wing" + icon_state = "sec_prison" + +/area/security/prison/prison_break() + for(var/obj/structure/closet/secure_closet/brig/temp_closet in src) + temp_closet.locked = 0 + temp_closet.icon_state = temp_closet.icon_closed + for(var/obj/machinery/door_timer/temp_timer in src) + temp_timer.timer_duration = 1 + ..() + +/area/security/prison/upper + name = "\improper Security - Upper Prison Wing" + icon_state = "sec_prison" + +/area/security/prison/lower + name = "\improper Security - Lower Prison Wing" + icon_state = "sec_prison" + +/area/security/warden + name = "\improper Security - Warden's Office" + icon_state = "Warden" + +/area/security/armoury + name = "\improper Security - Armory" + icon_state = "armory" + ambience = AMBIENCE_HIGHSEC + area_flags = AREA_FLAG_BLUE_SHIELDED + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_SENSITIVE + +/area/security/briefing_room + name = "\improper Security - Briefing Room" + icon_state = "brig" + +/area/security/evidence_storage + name = "\improper Security - Equipment Storage" + icon_state = "security_equipment_storage" + +/area/security/evidence_storage + name = "\improper Security - Evidence Storage" + icon_state = "evidence_storage" + +/area/security/interrogation + name = "\improper Security - Interrogation" + icon_state = "interrogation" + +/area/security/riot_control + name = "\improper Security - Riot Control" + icon_state = "riot_control" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_SENSITIVE + +/area/security/detectives_office + name = "\improper Security - Forensic Office" + icon_state = "detective" + sound_env = MEDIUM_SOFTFLOOR + +/area/security/range + name = "\improper Security - Firing Range" + icon_state = "firingrange" + +/area/security/security_aid_station + name = "\improper Security - Security Aid Station" + icon_state = "security_aid_station" + +/area/security/security_bathroom + name = "\improper Security - Restroom" + icon_state = "security_bathroom" + sound_env = SMALL_ENCLOSED + +/area/security/security_cell_hallway + name = "\improper Security - Cell Hallway" + icon_state = "security_cell_hallway" + +/area/security/security_equiptment_storage + name = "\improper Security - Equipment Storage" + icon_state = "security_equip_storage" + +/area/security/security_lockerroom + name = "\improper Security - Locker Room" + icon_state = "security_lockerroom" + +/area/security/security_processing + name = "\improper Security - Security Processing" + icon_state = "security_processing" + +/area/security/tactical + name = "\improper Security - Tactical Equipment" + icon_state = "Tactical" + ambience = AMBIENCE_HIGHSEC + area_flags = AREA_FLAG_BLUE_SHIELDED + +/area/security/hallway + name = "\improper Security Hallway" + icon_state = "security" + +/area/security/hallwayaux + name = "\improper Security Armory Hallway" + icon_state = "security" + +/area/security/forensics + name = "\improper Forensics Lab" + icon_state = "security" + +/area/security/breakroom + name = "\improper Security Breakroom" + icon_state = "security" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_LEISURE + +/area/security/brig/visitation + name = "\improper Visitation" + icon_state = "security" + +/area/security/brig/bathroom + name = "\improper Brig Bathroom" + icon_state = "security" + +/area/security/armory/blue + name = "\improper Armory - Blue" + icon_state = "armory" + +/area/security/armory/red + name = "\improper Armory - Red" + icon_state = "red2" + +/area/security/observation + name = "\improper Brig Observation" + icon_state = "riot_control" + +/area/security/eva + name = "\improper Security EVA" + icon_state = "security_equip_storage" + +/area/security/recstorage + name = "\improper Brig Recreation Storage" + icon_state = "brig" + +/area/security/training + name = "\improper Training & Briefing Room" + icon_state = "security" + +/area/security/hanger + name = "\improper Security Hanger" + icon_state = "security_equip_storage" + +/area/security/visitor + name = "\improper Security Visitor Room" + icon_state = "security" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_HALLWAYS + +/* + New() + ..() + + spawn(10) //let objects set up first + for(var/turf/turfToGrayscale in src) + if(turfToGrayscale.icon) + var/icon/newIcon = icon(turfToGrayscale.icon) + newIcon.GrayScale() + turfToGrayscale.icon = newIcon + for(var/obj/objectToGrayscale in turfToGrayscale) //1 level deep, means tables, apcs, locker, etc, but not locker contents + if(objectToGrayscale.icon) + var/icon/newIcon = icon(objectToGrayscale.icon) + newIcon.GrayScale() + objectToGrayscale.icon = newIcon +*/ + +/area/security/nuke_storage + name = "\improper Vault" + icon_state = "nuke_storage" + ambience = AMBIENCE_HIGHSEC + area_flags = AREA_FLAG_BLUE_SHIELDED + +/area/security/checkpoint + name = "\improper Security Checkpoint" + icon_state = "checkpoint1" + +/area/security/checkpoint2 + name = "\improper Security - Arrival Checkpoint" + icon_state = "security" + ambience = AMBIENCE_ARRIVALS + +/area/security/checkpoint/supply + name = "Security Post - Cargo Bay" + icon_state = "checkpoint1" + +/area/security/checkpoint/engineering + name = "Security Post - Engineering" + icon_state = "checkpoint1" + +/area/security/checkpoint/medical + name = "Security Post - Medbay" + icon_state = "checkpoint1" + +/area/security/checkpoint/science + name = "Security Post - Science" + icon_state = "checkpoint1" + +/area/security/vacantoffice + name = "\improper Vacant Office" + icon_state = "security" + +/area/security/vacantoffice2 + name = "\improper Vacant Office" + icon_state = "security" + +/area/security/hammerhead_bay + name = "\improper Hammerhead Barge Hangar" + icon_state = "hangar" diff --git a/code/game/objects/structures/curtains.dm b/code/game/objects/structures/curtains.dm index f5fc1411296..6ab9bf3a609 100644 --- a/code/game/objects/structures/curtains.dm +++ b/code/game/objects/structures/curtains.dm @@ -54,6 +54,10 @@ name = "black curtain" color = "#222222" +/obj/structure/curtain/open/black + name = "black curtain" + color = "#222222" + /obj/structure/curtain/medical name = "plastic curtain" color = "#B8F5E3" diff --git a/maps/rift/levels/rift-02-underground2.dmm b/maps/rift/levels/rift-02-underground2.dmm index d86851608d7..1d84afd39a2 100644 --- a/maps/rift/levels/rift-02-underground2.dmm +++ b/maps/rift/levels/rift-02-underground2.dmm @@ -99,6 +99,7 @@ dir = 9 }, /obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/effect/paint/sun, /turf/simulated/floor/plating, /area/engineering/engine_room) "ar" = ( @@ -270,6 +271,7 @@ dir = 1 }, /obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/effect/paint/sun, /turf/simulated/floor/plating, /area/engineering/engine_room) "aR" = ( @@ -1115,6 +1117,7 @@ dir = 4 }, /obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/effect/paint/sun, /turf/simulated/floor/plating, /area/engineering/engine_room) "dQ" = ( @@ -1498,7 +1501,6 @@ /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 4 }, -/obj/effect/paint/sun, /turf/simulated/floor, /area/engineering/engine_core) "eM" = ( @@ -2548,7 +2550,6 @@ id = "SupermatterPort"; name = "Reactor Blast Door" }, -/obj/effect/paint/sun, /turf/simulated/floor, /area/engineering/engine_core) "it" = ( @@ -3754,7 +3755,6 @@ icon_state = "1-8" }, /obj/structure/catwalk, -/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/lower/mining) "lI" = ( @@ -9268,8 +9268,6 @@ /turf/simulated/floor/tiled, /area/engineering/workshop) "ET" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, /obj/effect/paint/palebottlegreen, /turf/simulated/floor/plating, @@ -9777,8 +9775,6 @@ /turf/simulated/floor, /area/engineering/engine_room) "Ha" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, /obj/effect/paint/palebottlegreen, /turf/simulated/floor/plating, @@ -11967,7 +11963,6 @@ /obj/machinery/door/airlock/multi_tile/metal{ dir = 4 }, -/obj/structure/catwalk, /obj/machinery/door/firedoor/glass{ dir = 8 }, diff --git a/maps/rift/levels/rift-03-underground1.dmm b/maps/rift/levels/rift-03-underground1.dmm index fe79cb80853..34b62814ecc 100644 --- a/maps/rift/levels/rift-03-underground1.dmm +++ b/maps/rift/levels/rift-03-underground1.dmm @@ -228,10 +228,23 @@ /turf/simulated/wall/prepainted, /area/maintenance/engineering/upper) "aH" = ( -/obj/structure/fans/tiny, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/security/prison) +/obj/structure/table/reinforced, +/obj/random/soap{ + pixel_x = -4; + pixel_y = -3 + }, +/obj/random/soap{ + pixel_x = 4 + }, +/obj/random/soap{ + pixel_x = -2; + pixel_y = 3 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/monowhite, +/area/security/prison/lower) "aI" = ( /obj/structure/closet/firecloset/full, /obj/structure/railing{ @@ -569,6 +582,18 @@ "bA" = ( /turf/simulated/wall/prepainted/engineering/atmos, /area/hallway/primary/underone) +"bB" = ( +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 8 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/security/prison/lower) "bC" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -1577,6 +1602,12 @@ }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos) +"dA" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/security/prison/lower) "dB" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 4 @@ -1602,6 +1633,9 @@ }, /turf/simulated/floor/plating, /area/maintenance/engineering) +"dD" = ( +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "dE" = ( /obj/machinery/portable_atmospherics/canister/nitrogen, /obj/structure/window/reinforced, @@ -1660,6 +1694,13 @@ /obj/structure/curtain/open/privacy, /turf/simulated/floor/tiled/kafel_full/white, /area/crew_quarters/pool) +"dJ" = ( +/obj/structure/extinguisher_cabinet{ + dir = 4; + pixel_x = -30 + }, +/turf/simulated/floor/concrete/indoors, +/area/security/prison/lower) "dK" = ( /obj/machinery/atmospherics/pipe/simple/visible/black, /obj/machinery/meter, @@ -1813,6 +1854,12 @@ }, /turf/simulated/floor/tiled/monotile, /area/hallway/primary/underone) +"ei" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "ej" = ( /obj/machinery/door/airlock/glass/atmos, /obj/machinery/door/firedoor/glass, @@ -1828,10 +1875,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/hallway/primary/underone) -"eo" = ( -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/elevator) "ep" = ( /turf/simulated/floor/concrete/rng/indoors, /area/rift/station/fighter_bay/transport_tunnel_garage) @@ -1860,6 +1903,18 @@ }, /turf/simulated/floor/tiled/monotile, /area/hallway/primary/underone) +"eu" = ( +/obj/structure/table/standard{ + name = "plastic table frame" + }, +/obj/item/reagent_containers/dropper{ + pixel_y = -5 + }, +/obj/machinery/reagentgrinder{ + pixel_y = 9 + }, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "ey" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -1960,6 +2015,10 @@ /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor, /area/storage/tech) +"eH" = ( +/obj/machinery/vending/cigarette, +/turf/simulated/floor/concrete/indoors, +/area/security/prison/lower) "eI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -2175,6 +2234,12 @@ /obj/item/pen/blue, /turf/simulated/floor/tiled/monotile, /area/engineering/atmos/hallway) +"fv" = ( +/obj/machinery/camera/network/security{ + dir = 4 + }, +/turf/simulated/floor/concrete/indoors, +/area/security/prison/lower) "fw" = ( /obj/machinery/atmospherics/pipe/manifold/visible/cyan, /obj/structure/catwalk, @@ -2196,6 +2261,12 @@ }, /turf/simulated/floor/plating, /area/maintenance/engineering/pumpstation) +"fB" = ( +/obj/random/trash_pile, +/obj/effect/floor_decal/rust, +/obj/structure/railing, +/turf/simulated/floor, +/area/security/prison/lower) "fC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/blue{ dir = 8 @@ -2282,6 +2353,15 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/underone) +"fN" = ( +/obj/structure/table/marble, +/obj/machinery/door/blast/shutters{ + dir = 2; + id = "prison_kitchen"; + name = "Prison Kitchen" + }, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "fO" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/borderfloor/corner2, @@ -2421,6 +2501,20 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/hallway/primary/underone) +"gn" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/table/marble, +/obj/machinery/reagentgrinder{ + pixel_y = 6 + }, +/obj/item/reagent_containers/dropper{ + pixel_y = -18 + }, +/obj/item/reagent_containers/dropper{ + pixel_y = -12 + }, +/turf/simulated/floor/tiled/white, +/area/security/prison/lower) "go" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -2441,6 +2535,13 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/rnd/secure_storage/upper) +"gq" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/random/trash_pile, +/turf/simulated/floor, +/area/security/prison/lower) "gr" = ( /obj/machinery/door/window/brigdoor/eastright{ req_access = list(47) @@ -2693,6 +2794,11 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/rift/station/fighter_bay/hangar) +"hj" = ( +/obj/structure/metal_edge, +/obj/structure/railing, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "hk" = ( /obj/structure/cable{ icon_state = "2-8" @@ -2789,6 +2895,31 @@ }, /turf/simulated/floor/tiled, /area/engineering/atmos) +"hy" = ( +/obj/structure/table/reinforced, +/obj/item/towel/random{ + pixel_y = -4 + }, +/obj/item/towel/random{ + pixel_y = -4 + }, +/obj/item/towel/random{ + pixel_y = -4 + }, +/obj/item/towel/random, +/obj/item/towel/random, +/obj/item/towel/random, +/obj/item/towel/random{ + pixel_y = 4 + }, +/obj/item/towel/random{ + pixel_y = 4 + }, +/obj/item/towel/random{ + pixel_y = 4 + }, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "hz" = ( /obj/machinery/atmospherics/portables_connector, /obj/machinery/atmospherics/pipe/simple/visible/red{ @@ -2796,6 +2927,10 @@ }, /turf/simulated/floor/tiled, /area/engineering/atmos) +"hA" = ( +/obj/machinery/light/flamp/noshade, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "hB" = ( /obj/structure/table/reinforced, /obj/machinery/cell_charger, @@ -2812,7 +2947,7 @@ "hD" = ( /obj/effect/blocker, /turf/simulated/open/lythios43c/indoors, -/area/security/prison) +/area/rift/surfacebase/underground/under1) "hF" = ( /obj/effect/floor_decal/techfloor{ dir = 5 @@ -2830,6 +2965,14 @@ /obj/spawner/window/low_wall/full/nogrille/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/pool) +"hM" = ( +/obj/effect/floor_decal/industrial/halfstair{ + dir = 4 + }, +/obj/structure/railing/grey, +/obj/effect/floor_decal/spline/plain, +/turf/simulated/floor/concrete/indoors, +/area/security/prison/lower) "hN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/meter{ @@ -2839,9 +2982,6 @@ /obj/effect/paint/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos) -"hO" = ( -/turf/simulated/floor/plating, -/area/maintenance/elevator) "hP" = ( /obj/structure/railing{ dir = 4 @@ -3024,6 +3164,10 @@ }, /turf/simulated/floor/reinforced, /area/rnd/secure_storage/upper) +"iA" = ( +/obj/machinery/smartfridge/food, +/turf/simulated/wall/r_wall/prepainted/security, +/area/security/prison/lower) "iB" = ( /obj/structure/window/basic, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -3055,6 +3199,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/engineering/atmos) +"iK" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/security/prison/lower) "iL" = ( /obj/machinery/door/window/brigdoor/westleft{ req_access = list(47) @@ -3066,6 +3216,14 @@ }, /turf/simulated/floor/reinforced, /area/rnd/secure_storage/upper) +"iM" = ( +/obj/machinery/door/blast/shutters{ + dir = 4; + id = "prison_hydroponics"; + name = "Prison Hydroponics" + }, +/turf/simulated/floor/concrete/indoors, +/area/security/prison/lower) "iO" = ( /obj/machinery/atmospherics/component/unary/outlet_injector{ dir = 4; @@ -3257,6 +3415,14 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/underone) +"jw" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/table/marble, +/obj/machinery/chemical_dispenser/catering/bar_soft{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/security/prison/lower) "jx" = ( /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ dir = 8 @@ -3305,6 +3471,16 @@ "jE" = ( /turf/simulated/mineral/ignore_cavegen/geothermal, /area/rift/surfacebase/underground/under1) +"jF" = ( +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/darkred, +/obj/machinery/door/blast/shutters{ + dir = 2; + id = "prison_spectators"; + name = "Prison Spectating Booth" + }, +/turf/simulated/floor/plating, +/area/security/prison/lower) "jG" = ( /obj/machinery/door/airlock/maintenance/engi{ name = "Pump Station Access" @@ -3317,6 +3493,10 @@ }, /turf/simulated/floor/plating, /area/maintenance/engineering/pumpstation) +"jH" = ( +/obj/structure/kitchenspike, +/turf/simulated/floor/tiled/freezer/cold, +/area/security/prison/lower) "jI" = ( /obj/structure/catwalk, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ @@ -3629,6 +3809,10 @@ /obj/structure/barricade, /turf/simulated/floor/plating, /area/maintenance/engineering) +"kM" = ( +/obj/structure/metal_edge, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "kN" = ( /obj/item/flame/candle/small{ pixel_x = -8; @@ -3636,6 +3820,10 @@ }, /turf/simulated/floor/plating, /area/maintenance/engineering) +"kO" = ( +/obj/machinery/vending/hydronutrients, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "kP" = ( /obj/machinery/atmospherics/pipe/manifold/visible/purple, /obj/machinery/meter, @@ -3704,6 +3892,13 @@ }, /turf/simulated/floor/plating, /area/rift/station/fighter_bay/transport_tunnel_garage_maint) +"le" = ( +/obj/structure/metal_edge, +/obj/machinery/camera/network/security{ + dir = 6 + }, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "lg" = ( /obj/structure/cable/green{ icon_state = "0-8" @@ -3744,6 +3939,10 @@ }, /turf/simulated/floor/outdoors/safeice/lythios43c/indoors, /area/rift/surfacebase/underground/under1) +"lm" = ( +/obj/machinery/door/window/northleft, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "lo" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -3787,6 +3986,13 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/plating, /area/maintenance/engineering/pumpstation) +"lt" = ( +/obj/item/radio/intercom/department/security{ + dir = 8; + pixel_x = -24 + }, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "lu" = ( /obj/machinery/atmospherics/component/quaternary/mixer, /turf/simulated/floor/plating, @@ -3818,6 +4024,11 @@ /obj/machinery/light, /turf/simulated/floor/tiled/white, /area/rnd/secure_storage/upper) +"lB" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/appliance/cooker/fryer, +/turf/simulated/floor/tiled/white, +/area/security/prison/lower) "lC" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -3837,6 +4048,13 @@ /obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/engineering/atmos) +"lE" = ( +/obj/machinery/light/flamp/noshade{ + pixel_x = -12; + pixel_y = -8 + }, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "lF" = ( /obj/structure/cable/green{ icon_state = "1-8" @@ -3872,6 +4090,16 @@ }, /turf/simulated/floor/tiled, /area/maintenance/elevator) +"lK" = ( +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/darkred, +/obj/machinery/door/blast/shutters{ + dir = 2; + id = "prison_kitchen"; + name = "Prison Kitchen" + }, +/turf/simulated/floor/plating, +/area/security/prison/lower) "lL" = ( /obj/machinery/door/window/brigdoor/eastright{ req_access = list(47) @@ -4124,6 +4352,17 @@ }, /turf/simulated/floor/tiled, /area/engineering/atmos) +"mv" = ( +/obj/structure/railing/grey{ + dir = 8 + }, +/obj/machinery/door/blast/shutters{ + dir = 2; + id = "prison_spectators"; + name = "Prison Spectating Booth" + }, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "mw" = ( /obj/structure/window/basic{ dir = 4 @@ -4228,6 +4467,31 @@ "mQ" = ( /turf/simulated/floor/tiled/steel_grid, /area/engineering/atmos/hallway) +"mR" = ( +/obj/structure/table/reinforced, +/obj/item/towel/random{ + pixel_y = -4 + }, +/obj/item/towel/random{ + pixel_y = -4 + }, +/obj/item/towel/random{ + pixel_y = -4 + }, +/obj/item/towel/random, +/obj/item/towel/random, +/obj/item/towel/random, +/obj/item/towel/random{ + pixel_y = 4 + }, +/obj/item/towel/random{ + pixel_y = 4 + }, +/obj/item/towel/random{ + pixel_y = 4 + }, +/turf/simulated/floor/concrete/indoors, +/area/security/prison/lower) "mU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal{ dir = 4 @@ -4257,6 +4521,10 @@ /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled, /area/rnd/secure_storage/upper) +"ng" = ( +/obj/item/beach_ball/holoball, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "nh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/blue, /obj/machinery/door/airlock/glass/atmos{ @@ -4311,6 +4579,11 @@ }, /turf/simulated/floor/tiled, /area/engineering/atmos) +"nr" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/light, +/turf/simulated/floor/tiled/white, +/area/security/prison/lower) "ns" = ( /obj/machinery/atmospherics/portables_connector{ dir = 4 @@ -4433,6 +4706,12 @@ }, /turf/simulated/floor/tiled, /area/engineering/atmos) +"nM" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/table/marble, +/obj/machinery/microwave, +/turf/simulated/floor/tiled/white, +/area/security/prison/lower) "nN" = ( /obj/effect/floor_decal/borderfloor{ dir = 6 @@ -4535,6 +4814,12 @@ "ol" = ( /turf/simulated/wall/r_wall/prepainted, /area/maintenance/engineering) +"om" = ( +/obj/machinery/camera/network/security{ + dir = 8 + }, +/turf/simulated/floor/concrete/indoors, +/area/security/prison/lower) "on" = ( /obj/machinery/atmospherics/component/binary/pump{ dir = 4; @@ -4563,12 +4848,29 @@ "oq" = ( /turf/simulated/wall/r_wall/prepainted, /area/engineering/drone_fabrication) +"or" = ( +/obj/structure/table/reinforced, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/concrete/indoors, +/area/security/prison/lower) "os" = ( /obj/structure/window/basic{ dir = 4 }, /turf/simulated/floor/tiled/kafel_full/beige, /area/crew_quarters/pool) +"ot" = ( +/obj/structure/table/standard{ + name = "plastic table frame" + }, +/obj/item/storage/box/syringes, +/obj/item/reagent_scanner{ + pixel_x = 7 + }, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "ou" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 4 @@ -4577,6 +4879,18 @@ /obj/effect/paint/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos) +"ov" = ( +/obj/effect/floor_decal/industrial/halfstair{ + dir = 4 + }, +/obj/structure/railing/grey{ + dir = 1 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/turf/simulated/floor/concrete/indoors, +/area/security/prison/lower) "ow" = ( /obj/machinery/door/airlock/glass/atmos, /obj/machinery/atmospherics/pipe/simple/hidden/red, @@ -4689,6 +5003,26 @@ }, /turf/simulated/floor/tiled/steel_dirty, /area/rnd/secure_storage/upper) +"oQ" = ( +/obj/effect/floor_decal/industrial/warning/full, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/obj/structure/cable/green{ + icon_state = "16-0" + }, +/turf/simulated/floor/plating, +/area/security/prison/lower) "oS" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -4784,6 +5118,10 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/engineering/atmos/hallway) +"pg" = ( +/obj/machinery/portable_atmospherics/hydroponics, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "ph" = ( /turf/simulated/wall/r_wall/prepainted, /area/turbolift/rhammerhead/underground) @@ -5130,6 +5468,10 @@ }, /turf/simulated/floor/tiled, /area/engineering/atmos) +"qu" = ( +/obj/structure/closet/crate/freezer, +/turf/simulated/floor/tiled/freezer/cold, +/area/security/prison/lower) "qy" = ( /obj/structure/cable/green{ icon_state = "0-4" @@ -5173,6 +5515,17 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/underone) +"qF" = ( +/obj/machinery/door/airlock/maintenance/sec{ + req_one_access = null + }, +/obj/machinery/door/blast/shutters{ + dir = 4; + id = "prison_spectators"; + name = "Prison Spectating Booth" + }, +/turf/simulated/floor, +/area/security/prison/lower) "qH" = ( /obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -5187,12 +5540,51 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/underone) +"qL" = ( +/obj/structure/table/reinforced, +/obj/item/towel/random{ + pixel_y = -4 + }, +/obj/item/towel/random{ + pixel_y = -4 + }, +/obj/item/towel/random{ + pixel_y = -4 + }, +/obj/item/towel/random, +/obj/item/towel/random, +/obj/item/towel/random, +/obj/item/towel/random{ + pixel_y = 4 + }, +/obj/item/towel/random{ + pixel_y = 4 + }, +/obj/item/towel/random{ + pixel_y = 4 + }, +/turf/simulated/floor/tiled/monowhite, +/area/security/prison/lower) "qQ" = ( /obj/structure/holohoop{ dir = 1 }, /turf/simulated/floor/water/pool, /area/crew_quarters/pool) +"qR" = ( +/obj/structure/curtain/open/black, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/turf/simulated/floor/tiled/monowhite, +/area/security/prison/lower) +"qS" = ( +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/obj/machinery/power/apc/north_mount, +/turf/simulated/floor, +/area/security/prison/lower) "qT" = ( /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled, @@ -5338,6 +5730,9 @@ /obj/structure/closet/emcloset, /turf/simulated/floor/plating, /area/maintenance/research/xenobio) +"rs" = ( +/turf/simulated/floor/tiled/freezer/cold, +/area/security/prison/lower) "rt" = ( /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/steel_dirty, @@ -5450,6 +5845,10 @@ }, /turf/simulated/floor/plating, /area/maintenance/public_bunker) +"rI" = ( +/obj/machinery/fitness/heavy/lifter, +/turf/simulated/floor/concrete/indoors, +/area/security/prison/lower) "rJ" = ( /obj/structure/ladder{ pixel_y = 10 @@ -5490,6 +5889,10 @@ }, /turf/simulated/floor/tiled, /area/engineering/atmos) +"rQ" = ( +/obj/structure/mirror/long/right, +/turf/simulated/wall/r_wall/prepainted/security, +/area/security/prison/lower) "rS" = ( /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/concrete/rng/indoors, @@ -5533,6 +5936,13 @@ /obj/machinery/light, /turf/simulated/floor/tiled/steel, /area/hallway/primary/underone) +"rZ" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, +/turf/simulated/floor/tiled/monowhite, +/area/security/prison/lower) "sa" = ( /turf/simulated/wall/prepainted, /area/maintenance/engineering) @@ -5540,10 +5950,6 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled/monotile, /area/hallway/primary/underone) -"se" = ( -/obj/item/pickaxe/hand, -/turf/simulated/floor/outdoors/safeice/lythios43c/indoors, -/area/security/prison) "sf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -5566,9 +5972,6 @@ /obj/effect/floor_decal/plaque, /turf/simulated/floor/tiled/monotile, /area/hallway/primary/underone) -"sj" = ( -/turf/simulated/mineral/floor/icerock/lythios43c/indoors/ignore_cavegen, -/area/security/prison) "sk" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/monotile, @@ -5638,9 +6041,6 @@ /obj/random/tool, /turf/simulated/floor, /area/storage/tech) -"sL" = ( -/turf/simulated/floor/plating, -/area/maintenance/engineering/upper) "sM" = ( /obj/machinery/light{ dir = 4 @@ -5656,6 +6056,16 @@ /obj/random/trash_pile, /turf/simulated/floor/plating, /area/maintenance/engineering) +"sO" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/table/marble, +/obj/machinery/appliance/mixer/candy, +/turf/simulated/floor/tiled/white, +/area/security/prison/lower) +"sP" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/turf/simulated/floor/tiled/white, +/area/security/prison/lower) "sQ" = ( /obj/effect/floor_decal/techfloor{ dir = 9 @@ -5667,9 +6077,6 @@ "sR" = ( /turf/simulated/floor/plating, /area/maintenance/engineering) -"sS" = ( -/turf/simulated/floor/plating, -/area/maintenance/engineering) "sT" = ( /obj/machinery/light/small{ dir = 4 @@ -5971,6 +6378,11 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/secure_storage/upper) +"tL" = ( +/obj/machinery/camera/network/security, +/obj/machinery/biogenerator, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "tO" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -6038,6 +6450,9 @@ "tZ" = ( /turf/simulated/wall/r_wall/prepainted, /area/rnd/secure_storage/upper) +"ua" = ( +/turf/simulated/wall/r_wall/prepainted/security, +/area/security/prison/lower) "ub" = ( /obj/machinery/crystal/ice, /turf/simulated/floor/outdoors/safeice/lythios43c/indoors, @@ -6100,13 +6515,14 @@ }, /turf/simulated/floor/tiled/techfloor, /area/station/protean_nanite_room) -"un" = ( -/obj/effect/floor_decal/industrial/halfstair{ - dir = 4 +"uo" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/sink/kitchen{ + dir = 8; + pixel_x = 13 }, -/obj/structure/railing, -/turf/simulated/floor/lythios43c/indoors, -/area/security/prison) +/turf/simulated/floor/tiled/white, +/area/security/prison/lower) "uq" = ( /obj/machinery/door/airlock/glass/atmos, /obj/machinery/atmospherics/pipe/simple/hidden/blue, @@ -6177,6 +6593,15 @@ /obj/structure/plasticflaps/mining, /turf/simulated/floor/plating, /area/hallway/primary/underone) +"uG" = ( +/obj/structure/railing/grey{ + dir = 8 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "uH" = ( /obj/machinery/atmospherics/pipe/manifold/hidden, /turf/simulated/floor/tiled/steel_dirty, @@ -6191,9 +6616,6 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/engineering/upper) -"uJ" = ( -/turf/simulated/open/lythios43c, -/area/rift/surfacebase/underground/under1) "uM" = ( /obj/machinery/atmospherics/pipe/simple/visible/blue{ dir = 9 @@ -6304,6 +6726,10 @@ }, /turf/simulated/floor/reinforced/phoron, /area/engineering/atmos) +"vc" = ( +/obj/effect/floor_decal/rust, +/turf/simulated/floor, +/area/security/prison/lower) "vd" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -6414,6 +6840,18 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/secure_storage/upper) +"vs" = ( +/obj/effect/floor_decal/industrial/halfstair{ + dir = 8 + }, +/obj/structure/railing/grey{ + dir = 1 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "vt" = ( /obj/machinery/door/window/brigdoor/eastright{ req_access = list(47) @@ -6486,11 +6924,6 @@ }, /turf/simulated/floor/concrete/rng/lythios43c, /area/rift/station/fighter_bay/transport_tunnel) -"vE" = ( -/obj/item/storage/excavation, -/obj/structure/table/bench/wooden, -/turf/simulated/mineral/floor/icerock/lythios43c/indoors/ignore_cavegen, -/area/security/prison) "vG" = ( /obj/machinery/computer/general_air_control/large_tank_control{ dir = 4; @@ -6505,6 +6938,10 @@ /obj/machinery/telecomms/server/presets/science, /turf/simulated/floor/tiled/dark, /area/tcommsat/chamber) +"vI" = ( +/obj/structure/fitness/punchingbag, +/turf/simulated/floor/concrete/indoors, +/area/security/prison/lower) "vJ" = ( /obj/machinery/telecomms/bus/preset_four, /turf/simulated/floor/tiled/dark, @@ -6637,6 +7074,10 @@ /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/plating, /area/crew_quarters/pool) +"wj" = ( +/obj/machinery/light, +/turf/simulated/floor/concrete/indoors, +/area/security/prison/lower) "wk" = ( /obj/structure/bed/chair/bay, /turf/simulated/floor/plating, @@ -6843,6 +7284,19 @@ /obj/machinery/telecomms/hub/preset/rift, /turf/simulated/floor/tiled/dark, /area/tcommsat/chamber) +"wS" = ( +/obj/machinery/camera/network/security{ + dir = 4 + }, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) +"wT" = ( +/obj/machinery/camera/network/security{ + dir = 10 + }, +/obj/structure/reagent_dispensers/watertank/high, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "wW" = ( /obj/effect/floor_decal/techfloor{ dir = 1 @@ -7272,6 +7726,35 @@ /obj/structure/table/rack/shelf/steel, /turf/simulated/floor/tiled/steel_grid/lythios43c, /area/rift/surfacebase/underground/under1) +"yc" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/table/marble, +/obj/item/reagent_containers/food/condiment/small/saltshaker{ + pixel_x = -9 + }, +/obj/item/reagent_containers/food/condiment/small/saltshaker{ + pixel_x = -3 + }, +/obj/item/reagent_containers/food/condiment/small/peppermill{ + pixel_x = 3 + }, +/obj/item/reagent_containers/food/condiment/small/peppermill{ + pixel_x = 9 + }, +/obj/item/reagent_containers/food/condiment/coldsauce{ + pixel_x = 8; + pixel_y = 16 + }, +/obj/item/reagent_containers/food/condiment/spacespice{ + pixel_x = -8; + pixel_y = 13 + }, +/obj/item/reagent_containers/food/condiment/enzyme{ + layer = 5; + pixel_y = 16 + }, +/turf/simulated/floor/tiled/white, +/area/security/prison/lower) "ye" = ( /obj/machinery/atmospherics/portables_connector, /turf/simulated/floor/tiled, @@ -7284,6 +7767,12 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/lower/trash_pit) +"yg" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/security/prison/lower) "yh" = ( /obj/structure/table/rack{ dir = 8; @@ -7343,6 +7832,13 @@ /obj/machinery/telecomms/broadcaster/preset_right/rift, /turf/simulated/floor/tiled/dark, /area/tcommsat/chamber) +"yq" = ( +/obj/structure/sink{ + dir = 8; + pixel_x = -12 + }, +/turf/simulated/floor/tiled/monowhite, +/area/security/prison/lower) "ys" = ( /turf/simulated/floor/concrete/rng/indoors, /area/rift/station/fighter_bay/transport_tunnel) @@ -7416,6 +7912,12 @@ }, /turf/simulated/floor/reinforced, /area/rnd/secure_storage/upper) +"yC" = ( +/obj/machinery/door/airlock/maintenance/sec{ + req_one_access = null + }, +/turf/simulated/floor, +/area/security/prison/lower) "yD" = ( /obj/machinery/light{ dir = 4 @@ -7428,6 +7930,19 @@ /obj/machinery/atmospherics/pipe/simple/visible/yellow, /turf/simulated/floor/tiled, /area/engineering/atmos) +"yF" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/table/marble, +/obj/item/storage/box/glasses/meta{ + pixel_x = -5; + pixel_y = 4 + }, +/obj/item/storage/box/glasses/meta{ + pixel_x = 5; + pixel_y = 4 + }, +/turf/simulated/floor/tiled/white, +/area/security/prison/lower) "yG" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 @@ -7446,6 +7961,12 @@ }, /turf/simulated/floor/tiled/monotile, /area/hallway/primary/underone) +"yJ" = ( +/obj/effect/floor_decal/industrial/halfstair{ + dir = 8 + }, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "yM" = ( /obj/effect/floor_decal/rust, /obj/structure/cable/green{ @@ -7479,6 +8000,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/dark, /area/tcommsat/computer) +"yY" = ( +/obj/effect/floor_decal/industrial/halfstair, +/obj/structure/railing/grey{ + dir = 4 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "yZ" = ( /obj/machinery/status_display{ pixel_x = 32 @@ -7828,6 +8359,13 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/underone) +"Ad" = ( +/obj/structure/toilet{ + dir = 1 + }, +/obj/machinery/light/small, +/turf/simulated/floor/tiled/white, +/area/security/prison/lower) "Af" = ( /obj/structure/fans/tiny, /obj/machinery/door/blast/regular{ @@ -7843,6 +8381,10 @@ }, /turf/simulated/floor/tiled/techmaint, /area/maintenance/engineering) +"Ai" = ( +/obj/structure/table/reinforced, +/turf/simulated/floor/concrete/indoors, +/area/security/prison/lower) "Aj" = ( /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/concrete/rng/lythios43c, @@ -7894,6 +8436,15 @@ }, /turf/simulated/floor/tiled/steel, /area/rift/station/fighter_bay) +"Aq" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/table/marble, +/obj/machinery/appliance/mixer/cereal, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/security/prison/lower) "Ar" = ( /obj/machinery/portable_atmospherics/canister/phoron, /obj/structure/window/reinforced, @@ -7920,10 +8471,6 @@ }, /turf/simulated/floor/plating, /area/rift/trade_shop) -"Av" = ( -/obj/structure/stairs/spawner/south, -/turf/simulated/floor/tiled/steel, -/area/security/prison) "Aw" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -7942,6 +8489,21 @@ /obj/machinery/holoplant, /turf/simulated/floor/tiled/white, /area/rnd/secure_storage/upper) +"Ay" = ( +/obj/structure/railing/grey{ + dir = 4 + }, +/turf/simulated/floor/concrete/indoors, +/area/security/prison/lower) +"Az" = ( +/obj/machinery/door/window/westleft, +/obj/machinery/door/blast/shutters{ + dir = 4; + id = "prison_kitchen"; + name = "Prison Kitchen" + }, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "AA" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/door/blast/regular{ @@ -7955,11 +8517,26 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/plating, /area/maintenance/engineering) +"AC" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/vending/dinnerware{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/security/prison/lower) "AD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/yellow, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/engineering/atmos) +"AE" = ( +/obj/structure/metal_edge, +/obj/structure/railing, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "AF" = ( /obj/structure/table/rack/steel, /obj/item/stock_parts/manipulator, @@ -7992,10 +8569,11 @@ }, /turf/simulated/floor/tiled/techmaint, /area/rift/station/fighter_bay) -"AL" = ( -/obj/structure/catwalk/plank, -/turf/simulated/open/lythios43c, -/area/rift/surfacebase/underground/under1) +"AK" = ( +/obj/effect/floor_decal/rust, +/obj/structure/railing, +/turf/simulated/floor, +/area/security/prison/lower) "AN" = ( /obj/machinery/atmospherics/pipe/simple/visible/blue, /turf/simulated/floor/tiled, @@ -8058,6 +8636,14 @@ }, /turf/simulated/floor/plating, /area/storage/tech) +"AY" = ( +/obj/machinery/fire_alarm/west_mount, +/obj/machinery/honey_extractor, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "AZ" = ( /obj/effect/floor_decal/rust, /obj/structure/sign/mining{ @@ -8161,9 +8747,6 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/engineering/atmos/hallway) -"By" = ( -/turf/simulated/mineral/icerock/lythios43c, -/area/space) "Bz" = ( /obj/structure/railing/grey, /obj/structure/window/basic, @@ -8192,6 +8775,9 @@ /obj/item/reagent_containers/food/snacks/monkeycube/wrapped/farwacube, /turf/simulated/floor/plating, /area/maintenance/engineering) +"BH" = ( +/turf/simulated/wall/prepainted/security, +/area/security/prison/lower) "BI" = ( /obj/machinery/atmospherics/portables_connector{ dir = 8 @@ -8221,9 +8807,6 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/lower/trash_pit) -"BP" = ( -/turf/simulated/floor/tiled/steel, -/area/security/prison) "BQ" = ( /obj/structure/railing{ dir = 4 @@ -8294,6 +8877,21 @@ }, /turf/simulated/floor/plating, /area/rift/station/fighter_bay/hangar) +"Cf" = ( +/obj/machinery/camera/network/security{ + dir = 8 + }, +/obj/machinery/button/remote/blast_door{ + dir = 8; + id = "prison_hydroponics"; + name = "Hydroponics Shutter Control"; + pixel_x = 26; + pixel_y = 5; + req_one_access = list(1,2,4,38) + }, +/obj/machinery/light, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "Cg" = ( /obj/machinery/atmospherics/portables_connector{ dir = 8 @@ -8315,6 +8913,14 @@ /obj/structure/ladder/updown, /turf/simulated/floor/tiled/techfloor, /area/maintenance/elevator) +"Ck" = ( +/obj/structure/fans/tiny, +/obj/machinery/door/airlock/freezer{ + name = "Prison Kitchen Freezer"; + req_access = null + }, +/turf/simulated/floor/tiled/freezer/cold, +/area/security/prison/lower) "Cl" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -8466,6 +9072,12 @@ }, /turf/simulated/floor/plating, /area/maintenance/engineering) +"CL" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/freezer/cold, +/area/security/prison/lower) "CM" = ( /obj/machinery/atmospherics/component/quaternary/atmos_filter{ name = "Waste CO2 Filter"; @@ -8506,6 +9118,12 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/rift/station/fighter_bay) +"CR" = ( +/obj/structure/holohoop{ + dir = 4 + }, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "CS" = ( /obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/plating, @@ -8654,6 +9272,17 @@ /obj/effect/floor_decal/borderfloor, /turf/simulated/floor/tiled, /area/rnd/secure_storage/upper) +"Dy" = ( +/obj/structure/table/reinforced, +/obj/machinery/light{ + dir = 1 + }, +/obj/item/radio/intercom/department/security{ + dir = 1; + pixel_y = 24 + }, +/turf/simulated/floor/tiled/monowhite, +/area/security/prison/lower) "DC" = ( /obj/machinery/door/airlock/glass_external{ req_one_access = list(47) @@ -8692,6 +9321,15 @@ }, /turf/simulated/floor/tiled, /area/rnd/secure_storage/upper) +"DF" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/security/prison/lower) "DG" = ( /obj/random/maintenance/clean, /obj/structure/catwalk, @@ -8725,6 +9363,18 @@ /obj/structure/closet/largecardboard, /turf/simulated/floor/plating, /area/rift/surfacebase/underground/under1) +"DM" = ( +/obj/machinery/shower{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 6 + }, +/turf/simulated/floor/tiled/white, +/area/security/prison/lower) "DN" = ( /obj/random/maintenance/engineering, /obj/structure/closet/crate, @@ -8734,6 +9384,20 @@ /obj/machinery/telecomms/server/presets/command, /turf/simulated/floor/tiled/dark, /area/tcommsat/chamber) +"DQ" = ( +/obj/structure/railing/grey{ + dir = 8 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, +/obj/machinery/door/blast/shutters{ + dir = 4; + id = "prison_hydroponics"; + name = "Prison Hydroponics" + }, +/turf/simulated/floor/concrete/indoors, +/area/security/prison/lower) "DR" = ( /obj/effect/floor_decal/rust, /obj/random/maintenance/engineering, @@ -8820,6 +9484,10 @@ /obj/item/clothing/suit/storage/hooded/wintercoat/durathread, /turf/simulated/floor/tiled/techmaint, /area/rift/station/fighter_bay) +"El" = ( +/obj/structure/curtain/open/black, +/turf/simulated/floor/tiled/white, +/area/security/prison/lower) "En" = ( /obj/machinery/atmospherics/component/unary/vent_pump{ dir = 8; @@ -8878,6 +9546,21 @@ /obj/machinery/atmospherics/pipe/manifold/hidden, /turf/simulated/floor/plating, /area/maintenance/engineering) +"Ez" = ( +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 10 + }, +/obj/structure/sink{ + pixel_y = 21 + }, +/obj/structure/mirror/long{ + pixel_y = 35 + }, +/turf/simulated/floor/tiled/white, +/area/security/prison/lower) "EA" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -8931,6 +9614,9 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techmaint, /area/engineering/drone_fabrication) +"EH" = ( +/turf/simulated/floor/tiled/monowhite, +/area/security/prison/lower) "EJ" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -8963,11 +9649,20 @@ /turf/simulated/floor/outdoors/snow/lythios43c, /area/rift/surfacebase/underground/under1) "ES" = ( -/obj/machinery/appliance/cooker/grill{ - pixel_y = 4 +/obj/machinery/smartfridge/drying_rack{ + dir = 8 }, -/turf/simulated/floor/lythios43c/indoors, -/area/security/prison) +/obj/machinery/button/remote/blast_door{ + dir = 4; + id = "prison_hydroponics"; + name = "Hydroponics Shutter Control"; + pixel_x = -26; + pixel_y = 4; + req_one_access = list(1,2,4,38) + }, +/obj/machinery/light, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "ET" = ( /obj/structure/closet/athletic_mixed, /turf/simulated/floor/plating, @@ -9032,12 +9727,6 @@ }, /turf/simulated/floor/tiled/dark, /area/tcommsat/computer) -"Fd" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/engineering/upper) "Fe" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -9284,11 +9973,6 @@ }, /turf/simulated/floor/tiled/steel, /area/rift/station/adherent_maintenance) -"FM" = ( -/obj/item/pickaxe/hand, -/obj/structure/table/bench/wooden, -/turf/simulated/floor/outdoors/safeice/lythios43c/indoors, -/area/security/prison) "FN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -9300,6 +9984,12 @@ }, /turf/simulated/floor/wood, /area/rift/station/fighter_bay) +"FP" = ( +/obj/structure/reagent_dispensers/water_cooler/full{ + dir = 8 + }, +/turf/simulated/floor/concrete/indoors, +/area/security/prison/lower) "FQ" = ( /obj/structure/closet/medical_wall{ pixel_x = 32 @@ -9330,6 +10020,16 @@ /obj/random/trash_pile, /turf/simulated/floor/plating, /area/maintenance/engineering) +"FU" = ( +/obj/structure/mirror/long/left, +/turf/simulated/wall/r_wall/prepainted/security, +/area/security/prison/lower) +"FW" = ( +/obj/machinery/camera/network/security{ + dir = 1 + }, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "FX" = ( /obj/structure/table/rack/shelf, /obj/item/clothing/suit/storage/hooded/wintercoat/science, @@ -9360,6 +10060,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/tiled/techfloor/grid, /area/rift/station/fighter_bay/hangar) +"Gf" = ( +/obj/machinery/light/flamp/noshade{ + pixel_x = 12; + pixel_y = -8 + }, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "Gg" = ( /obj/machinery/atmospherics/portables_connector{ dir = 4 @@ -9401,9 +10108,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel, /area/storage/tech) -"Gk" = ( -/turf/simulated/floor/plating, -/area/rift/surfacebase/underground/under1) "Gl" = ( /obj/structure/table/rack/shelf, /obj/item/gun/launcher/crossbow, @@ -9523,10 +10227,6 @@ /obj/item/clothing/mask/gas/clear, /turf/simulated/floor/tiled/techmaint, /area/rift/station/fighter_bay) -"GB" = ( -/obj/structure/table/bench/wooden, -/turf/simulated/mineral/floor/icerock/lythios43c/indoors/ignore_cavegen, -/area/security/prison) "GC" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plating, @@ -9631,6 +10331,12 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/maintenance/elevator) +"GS" = ( +/obj/machinery/camera/network/security{ + dir = 8 + }, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "GU" = ( /obj/structure/closet, /obj/random/maintenance/engineering, @@ -9719,6 +10425,16 @@ /obj/machinery/power/apc/east_mount, /turf/simulated/floor/crystal, /area/rift/station/adherent_maintenance) +"Hk" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/chem_master/condimaster, +/turf/simulated/floor/tiled/white, +/area/security/prison/lower) +"Hm" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/appliance/cooker/grill, +/turf/simulated/floor/tiled/white, +/area/security/prison/lower) "Hn" = ( /turf/simulated/wall/r_wall/prepainted/engineering/atmos, /area/engineering/atmos/hallway) @@ -9735,6 +10451,10 @@ /obj/machinery/portable_atmospherics/canister, /turf/simulated/floor/tiled, /area/engineering/atmos) +"Hq" = ( +/obj/structure/bed/chair/sofa/green/right, +/turf/simulated/floor/concrete/indoors, +/area/security/prison/lower) "Hr" = ( /obj/structure/table/rack/shelf, /obj/item/storage/toolbox/electrical{ @@ -9774,6 +10494,14 @@ }, /turf/simulated/floor/tiled, /area/engineering/atmos) +"Hu" = ( +/obj/effect/floor_decal/rust, +/obj/random/trash_pile, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor, +/area/security/prison/lower) "Hw" = ( /obj/item/circuitboard/sleeper{ pixel_x = -3; @@ -9915,6 +10643,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/monotile, /area/hallway/primary/underone) +"HS" = ( +/obj/structure/metal_edge, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "HU" = ( /obj/machinery/telecomms/server/presets/service/rift, /obj/machinery/camera/network/command{ @@ -10051,6 +10786,12 @@ /obj/structure/table/rack/shelf/steel, /turf/simulated/floor/plating, /area/storage/tech) +"Ip" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "Is" = ( /obj/effect/floor_decal/industrial/warning/corner, /obj/effect/floor_decal/industrial/warning/corner{ @@ -10060,12 +10801,6 @@ /obj/structure/marker_beacon/red, /turf/simulated/floor/tiled/techfloor/grid, /area/rift/station/fighter_bay/hangar) -"It" = ( -/turf/simulated/open/lythios43c, -/area/rift/surfacebase/underground/under1) -"Iv" = ( -/turf/simulated/floor/tiled/steel/lythios43c, -/area/security/prison) "Iw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -10096,12 +10831,16 @@ /turf/simulated/floor/plating, /area/maintenance/engineering) "IA" = ( -/turf/simulated/floor/outdoors/safeice/lythios43c/indoors, -/area/security/prison) +/obj/machinery/seed_extractor, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "IC" = ( -/obj/effect/floor_decal/rust, -/turf/simulated/floor/lythios43c/indoors, -/area/security/prison) +/obj/machinery/air_alarm{ + dir = 4; + pixel_x = -24 + }, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "ID" = ( /obj/structure/railing{ dir = 1 @@ -10205,6 +10944,20 @@ /obj/item/reagent_containers/spray/squirt, /turf/simulated/floor/plating, /area/maintenance/elevator) +"IT" = ( +/obj/machinery/button/remote/blast_door{ + dir = 4; + id = "prison_spectators"; + name = "Spectator Shutter Control"; + pixel_x = -25; + pixel_y = -5; + req_one_access = list(1,2,4,38) + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "IV" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -10340,6 +11093,15 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/engineering/atmos) +"Jo" = ( +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 10 + }, +/turf/simulated/floor/tiled/white, +/area/security/prison/lower) "Jq" = ( /obj/structure/extinguisher_cabinet{ pixel_y = -30 @@ -10372,6 +11134,16 @@ }, /turf/simulated/floor/reinforced/n20, /area/engineering/atmos) +"Ju" = ( +/obj/structure/reagent_dispensers/water_cooler/full, +/turf/simulated/floor/concrete/indoors, +/area/security/prison/lower) +"Jw" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/concrete/indoors, +/area/security/prison/lower) "Jx" = ( /obj/machinery/atmospherics/pipe/simple/visible/blue{ dir = 5 @@ -10379,8 +11151,14 @@ /turf/simulated/floor/tiled, /area/engineering/atmos) "Jy" = ( -/turf/simulated/wall/r_wall/prepainted, -/area/security/prison) +/obj/structure/railing/grey{ + dir = 4 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/turf/simulated/floor/concrete/indoors, +/area/security/prison/lower) "JB" = ( /obj/structure/bed/chair/bay{ dir = 1 @@ -10419,6 +11197,10 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/underone) +"JJ" = ( +/obj/random/trash_pile, +/turf/simulated/floor, +/area/security/prison/lower) "JO" = ( /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -10448,12 +11230,26 @@ }, /turf/simulated/floor/tiled, /area/maintenance/elevator) +"JT" = ( +/turf/simulated/floor, +/area/security/prison/lower) "JU" = ( /obj/structure/railing{ dir = 8 }, /turf/simulated/floor/outdoors/snow/lythios43c, /area/rift/surfacebase/underground/under1) +"JV" = ( +/obj/structure/railing/grey{ + dir = 4 + }, +/obj/machinery/door/blast/shutters{ + dir = 2; + id = "prison_spectators"; + name = "Prison Spectating Booth" + }, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "JW" = ( /obj/item/stock_parts/matter_bin, /obj/item/stock_parts/matter_bin, @@ -10626,6 +11422,22 @@ }, /turf/simulated/floor/outdoors/rocks/caves/geothermal, /area/rift/surfacebase/underground/under1) +"Ku" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/food/snacks/popcorn{ + pixel_x = 5; + pixel_y = 9 + }, +/obj/item/reagent_containers/food/snacks/popcorn{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/reagent_containers/food/snacks/popcorn{ + pixel_x = 2; + pixel_y = 4 + }, +/turf/simulated/floor/concrete/indoors, +/area/security/prison/lower) "Kv" = ( /obj/effect/overlay/snow/floor, /obj/item/towel/random, @@ -10693,13 +11505,6 @@ /obj/machinery/lathe/autolathe, /turf/simulated/floor/tiled/steel, /area/rift/station/fighter_bay/maintenance) -"KK" = ( -/obj/machinery/light/small, -/obj/structure/railing{ - dir = 8 - }, -/turf/simulated/floor/lythios43c/indoors, -/area/security/prison) "KL" = ( /obj/effect/floor_decal/rust, /obj/structure/railing, @@ -10752,6 +11557,14 @@ }, /turf/simulated/floor/tiled/techmaint, /area/rift/station/fighter_bay/maintenance) +"KV" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/closet/crate/bin, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/security/prison/lower) "KW" = ( /obj/structure/cable/green{ icon_state = "1-8" @@ -10974,6 +11787,17 @@ /obj/structure/alien/weeds/node, /turf/simulated/floor/plating, /area/engineering/atmos/hallway) +"Lz" = ( +/obj/machinery/button/remote/blast_door{ + dir = 1; + id = "prison_spectators"; + name = "Spectator Shutter Control"; + pixel_x = 8; + pixel_y = -24; + req_one_access = list(1,2,4,38) + }, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "LC" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -11029,9 +11853,6 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled/steel, /area/rift/station/fighter_bay) -"LN" = ( -/turf/simulated/floor/lythios43c/indoors, -/area/security/prison) "LO" = ( /obj/machinery/atmospherics/pipe/simple/visible/blue{ dir = 4 @@ -11051,6 +11872,21 @@ }, /turf/simulated/floor/concrete/rng/indoors, /area/rift/station/fighter_bay/transport_tunnel) +"LR" = ( +/obj/structure/table/marble, +/obj/machinery/door/blast/shutters{ + dir = 2; + id = "prison_kitchen"; + name = "Prison Kitchen" + }, +/obj/item/reagent_containers/food/condiment/small/saltshaker{ + pixel_x = -3 + }, +/obj/item/reagent_containers/food/condiment/small/peppermill{ + pixel_x = 3 + }, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "LS" = ( /obj/machinery/light{ dir = 8 @@ -11150,6 +11986,12 @@ /obj/item/arrow/rod, /turf/simulated/floor/plating, /area/maintenance/engineering) +"Mk" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "Ml" = ( /obj/structure/closet/hydrant{ pixel_y = -32 @@ -11231,10 +12073,6 @@ }, /turf/simulated/floor/concrete/rng/lythios43c, /area/rift/station/fighter_bay/transport_tunnel) -"My" = ( -/obj/structure/railing, -/turf/simulated/floor/lythios43c/indoors, -/area/security/prison) "Mz" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/pipe/manifold/hidden/red{ @@ -11251,6 +12089,10 @@ /obj/machinery/atmospherics/pipe/simple/visible, /turf/simulated/floor/plating, /area/maintenance/engineering) +"MG" = ( +/obj/machinery/light, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "MH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -11363,6 +12205,11 @@ }, /turf/simulated/floor/wood/broken, /area/maintenance/engineering) +"MV" = ( +/obj/machinery/recharge_station, +/obj/machinery/light/small, +/turf/simulated/floor/tiled/white, +/area/security/prison/lower) "MW" = ( /obj/structure/catwalk, /obj/structure/cable/green{ @@ -11416,6 +12263,21 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/engineering/atmos) +"Nd" = ( +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 10 + }, +/obj/structure/mirror/long/right{ + pixel_y = 35 + }, +/obj/structure/sink{ + pixel_y = 21 + }, +/turf/simulated/floor/tiled/white, +/area/security/prison/lower) "Ne" = ( /obj/machinery/air_sensor{ frequency = 1441; @@ -11424,16 +12286,30 @@ /turf/simulated/floor/reinforced/phoron, /area/engineering/atmos) "Nf" = ( -/obj/effect/floor_decal/industrial/halfstair{ - dir = 8 +/obj/structure/extinguisher_cabinet{ + pixel_y = 30 }, -/obj/structure/railing, -/turf/simulated/floor/plating, -/area/security/prison) +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "Nh" = ( /obj/machinery/space_heater, /turf/simulated/floor/plating, /area/maintenance/engineering) +"Ni" = ( +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 10 + }, +/obj/structure/mirror/long/left{ + pixel_y = 35 + }, +/obj/structure/sink{ + pixel_y = 21 + }, +/turf/simulated/floor/tiled/white, +/area/security/prison/lower) "Nk" = ( /obj/structure/transit_tube/high_velocity, /turf/simulated/floor/tiled/monotile, @@ -11462,6 +12338,30 @@ "No" = ( /turf/simulated/mineral/icerock/lythios43c, /area/rift/station/fighter_bay/transport_tunnel) +"Np" = ( +/obj/machinery/shower{ + pixel_y = 13 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 10 + }, +/turf/simulated/floor/tiled/white, +/area/security/prison/lower) +"Ns" = ( +/obj/structure/urinal{ + pixel_y = 29 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 10 + }, +/turf/simulated/floor/tiled/white, +/area/security/prison/lower) "Nt" = ( /obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -11817,6 +12717,12 @@ /obj/machinery/telecomms/relay/preset/rift/base_high, /turf/simulated/floor/tiled/dark, /area/tcommsat/chamber) +"Oo" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor, +/area/security/prison/lower) "Op" = ( /obj/machinery/vending/tool/adherent, /obj/machinery/light{ @@ -11878,6 +12784,12 @@ }, /turf/simulated/floor/tiled/techmaint, /area/rift/station/fighter_bay/hangar) +"Ox" = ( +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor, +/area/security/prison/lower) "Oy" = ( /obj/effect/floor_decal/techfloor{ dir = 9 @@ -11952,9 +12864,6 @@ /obj/structure/table/rack/shelf/steel, /turf/simulated/floor/plating, /area/storage/tech) -"OO" = ( -/turf/simulated/floor/lythios43c/indoors, -/area/rift/surfacebase/underground/under1) "OQ" = ( /obj/effect/floor_decal/spline/plain{ dir = 6 @@ -11983,6 +12892,10 @@ /obj/structure/catwalk/plank, /turf/simulated/open/lythios43c, /area/rift/surfacebase/underground/under1) +"OU" = ( +/obj/structure/table/reinforced, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "OW" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -12058,6 +12971,10 @@ }, /turf/simulated/floor/tiled/kafel_full/blue, /area/crew_quarters/pool) +"Pg" = ( +/obj/machinery/vending/snack, +/turf/simulated/floor/concrete/indoors, +/area/security/prison/lower) "Ph" = ( /obj/structure/catwalk, /obj/structure/cable/green{ @@ -12120,6 +13037,11 @@ }, /turf/simulated/floor/plating, /area/maintenance/engineering/upper) +"Pu" = ( +/obj/effect/floor_decal/industrial/halfstair, +/obj/structure/curtain/open/black, +/turf/simulated/floor/concrete/indoors, +/area/security/prison/lower) "Pw" = ( /obj/structure/musician/piano/unanchored, /turf/simulated/floor/plating, @@ -12269,10 +13191,6 @@ /obj/machinery/telecomms/relay/preset/rift/under_deep, /turf/simulated/floor/tiled/dark, /area/tcommsat/chamber) -"PY" = ( -/obj/effect/overlay/snow/floor, -/turf/simulated/floor/plating, -/area/maintenance/engineering) "PZ" = ( /obj/machinery/air_alarm{ pixel_y = 24 @@ -12293,13 +13211,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/secure_storage/upper) -"Qc" = ( -/obj/structure/railing/grey{ - dir = 1 - }, -/obj/structure/catwalk/plank, -/turf/simulated/open/lythios43c, -/area/rift/surfacebase/underground/under1) "Qd" = ( /obj/structure/catwalk, /obj/machinery/light/small{ @@ -12359,7 +13270,7 @@ /area/maintenance/engineering) "Qp" = ( /turf/simulated/open/lythios43c/indoors, -/area/security/prison) +/area/rift/surfacebase/underground/under1) "Qr" = ( /obj/item/stock_parts/manipulator, /obj/item/stock_parts/matter_bin, @@ -12430,9 +13341,6 @@ /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor, /area/storage/tech) -"QJ" = ( -/turf/simulated/wall/r_wall/prepainted, -/area/rift/surfacebase/underground/under1) "QM" = ( /obj/item/digestion_remains/skull/tajaran, /turf/simulated/floor/plating, @@ -12492,10 +13400,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/atmos) -"QZ" = ( -/obj/structure/catwalk, -/turf/simulated/open/lythios43c, -/area/rift/surfacebase/underground/under1) "Ra" = ( /obj/structure/catwalk, /turf/simulated/floor/plating, @@ -12584,6 +13488,12 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/drone_fabrication) +"Rn" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "Rp" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 4 @@ -12626,11 +13536,6 @@ /obj/machinery/camera/network/civilian, /turf/simulated/floor/tiled/steel, /area/rift/station/fighter_bay/maintenance) -"Rx" = ( -/obj/structure/railing, -/obj/effect/floor_decal/rust, -/turf/simulated/floor/lythios43c/indoors, -/area/security/prison) "Rz" = ( /obj/machinery/door/blast/shutters{ dir = 2; @@ -12731,6 +13636,11 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/underone) +"RO" = ( +/obj/machinery/scale, +/obj/machinery/fire_alarm/north_mount, +/turf/simulated/floor/concrete/indoors, +/area/security/prison/lower) "RP" = ( /obj/structure/closet/crate/miningcar, /obj/effect/floor_decal/rust, @@ -12791,6 +13701,9 @@ }, /turf/simulated/floor/tiled/kafel_full/blue, /area/crew_quarters/pool) +"Sb" = ( +/turf/simulated/floor/tiled/white, +/area/security/prison/lower) "Se" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -12804,10 +13717,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/trash_pit) -"Sg" = ( -/obj/item/pickaxe/hand, -/turf/simulated/mineral/floor/icerock/lythios43c/indoors/ignore_cavegen, -/area/security/prison) "Sj" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -12819,6 +13728,10 @@ /obj/random/maintenance/engineering, /turf/simulated/floor/plating, /area/maintenance/engineering) +"Sl" = ( +/obj/machinery/seed_storage/garden, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "Sn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 9 @@ -12863,6 +13776,32 @@ }, /turf/simulated/floor/lythios43c/indoors, /area/rift/surfacebase/underground/under1) +"St" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/security/prison/lower) +"Su" = ( +/obj/effect/floor_decal/industrial/halfstair, +/obj/structure/railing/grey{ + dir = 8 + }, +/obj/machinery/button/remote/blast_door{ + id = "prison_spectators"; + name = "Spectator Shutter Control"; + pixel_x = -25; + pixel_y = 29; + req_one_access = list(1,2,4,38) + }, +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "Sv" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -12919,6 +13858,13 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/hallway/primary/underone) +"SE" = ( +/obj/machinery/portable_atmospherics/hydroponics, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "SG" = ( /obj/structure/alien/weeds, /obj/structure/alien/resin/membrane{ @@ -12942,6 +13888,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/yellow, /turf/simulated/floor/tiled/dark, /area/engineering/atmos) +"SP" = ( +/obj/structure/fitness/weightlifter, +/turf/simulated/floor/concrete/indoors, +/area/security/prison/lower) +"SQ" = ( +/obj/structure/holohoop{ + dir = 8 + }, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "ST" = ( /obj/machinery/floodlight, /obj/effect/floor_decal/industrial/hatch/yellow, @@ -12978,6 +13934,20 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rift/station/fighter_bay/maintenance) +"SY" = ( +/obj/machinery/button/remote/blast_door{ + dir = 8; + id = "prison_spectators"; + name = "Spectator Shutter Control"; + pixel_x = 25; + pixel_y = -4; + req_one_access = list(1,2,4,38) + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor, +/area/security/prison/lower) "SZ" = ( /obj/machinery/door/airlock/glass_external/public{ name = "Mining Outpost Airlock" @@ -13022,6 +13992,10 @@ /obj/machinery/pipedispenser, /turf/simulated/floor/tiled, /area/engineering/atmos) +"Tk" = ( +/obj/item/stool/padded, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "Tl" = ( /turf/simulated/wall/r_wall/prepainted, /area/rift/station/fighter_bay/transport_tunnel) @@ -13115,6 +14089,13 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/engineering/upper) +"TF" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/table/marble, +/obj/item/material/kitchen/rollingpin, +/obj/item/material/knife/butch, +/turf/simulated/floor/tiled/white, +/area/security/prison/lower) "TG" = ( /obj/machinery/atmospherics/pipe/manifold/visible/green, /obj/machinery/meter, @@ -13130,6 +14111,17 @@ }, /turf/simulated/floor/plating, /area/maintenance/engineering) +"TK" = ( +/obj/machinery/button/remote/blast_door{ + dir = 1; + id = "prison_kitchen"; + name = "Kitchen Shutter Control"; + pixel_x = 7; + pixel_y = -24; + req_one_access = list(1,2,4,38) + }, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "TN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/blue{ dir = 8 @@ -13154,10 +14146,6 @@ /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor, /area/storage/tech) -"TQ" = ( -/obj/structure/railing, -/turf/simulated/open/lythios43c, -/area/rift/surfacebase/underground/under1) "TR" = ( /obj/machinery/atmospherics/component/binary/pump{ dir = 1; @@ -13256,6 +14244,17 @@ /obj/machinery/atmospherics/pipe/simple/visible, /turf/simulated/floor/tiled, /area/engineering/atmos) +"Uo" = ( +/obj/item/radio/intercom/department/security{ + dir = 1; + pixel_y = 24 + }, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) +"Up" = ( +/obj/machinery/fire_alarm/west_mount, +/turf/simulated/floor/concrete/indoors, +/area/security/prison/lower) "Uq" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/bluegrid{ @@ -13360,6 +14359,16 @@ "UF" = ( /turf/simulated/wall/r_wall/prepainted, /area/maintenance/research/xenobio) +"UG" = ( +/obj/structure/railing/grey{ + dir = 4 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/obj/machinery/scale, +/turf/simulated/floor/concrete/indoors, +/area/security/prison/lower) "UH" = ( /turf/simulated/floor/plating, /area/rnd/secure_storage/upper) @@ -13376,6 +14385,16 @@ }, /turf/simulated/floor/tiled/dark, /area/tcommsat/computer) +"UJ" = ( +/obj/structure/railing/grey{ + dir = 4 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/scale, +/turf/simulated/floor/concrete/indoors, +/area/security/prison/lower) "UL" = ( /obj/structure/railing{ dir = 4 @@ -13427,6 +14446,16 @@ }, /turf/simulated/floor/reinforced, /area/rnd/secure_storage/upper) +"UT" = ( +/obj/structure/stairs/spawner/north, +/obj/structure/railing/grey{ + dir = 8 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "UU" = ( /obj/structure/bed/chair/bay{ dir = 8 @@ -13466,6 +14495,10 @@ "Va" = ( /turf/simulated/floor/outdoors/safeice/lythios43c, /area/rift/surfacebase/underground/under1) +"Vb" = ( +/obj/effect/floor_decal/spline/plain, +/turf/simulated/floor/tiled/white, +/area/security/prison/lower) "Vc" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 5 @@ -13473,9 +14506,16 @@ /turf/simulated/floor/tiled/monotile, /area/hallway/primary/underone) "Vd" = ( -/obj/structure/table/steel, -/turf/simulated/floor/plating, -/area/maintenance/elevator) +/obj/effect/floor_decal/rust, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/closet/firecloset, +/turf/simulated/floor, +/area/security/prison/lower) "Ve" = ( /obj/structure/railing, /obj/structure/railing{ @@ -13490,16 +14530,9 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/trash_pit) -"Vf" = ( -/obj/effect/floor_decal/rust, -/obj/machinery/camera/network/security{ - dir = 10 - }, -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/floor/lythios43c/indoors, -/area/security/prison) +"Vg" = ( +/turf/simulated/floor/concrete/indoors, +/area/security/prison/lower) "Vh" = ( /obj/machinery/door/blast/regular{ dir = 4; @@ -13508,6 +14541,20 @@ }, /turf/simulated/floor/tiled/steel, /area/rift/station/fighter_bay) +"Vi" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/appliance/cooker/oven, +/turf/simulated/floor/tiled/white, +/area/security/prison/lower) +"Vk" = ( +/obj/structure/table/marble, +/obj/machinery/door/blast/shutters{ + dir = 4; + id = "prison_kitchen"; + name = "Prison Kitchen" + }, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "Vl" = ( /obj/machinery/light/small, /turf/simulated/floor/plating, @@ -13574,6 +14621,38 @@ /obj/machinery/atmospherics/pipe/simple/hidden/universal, /turf/simulated/floor/plating, /area/maintenance/engineering) +"Vv" = ( +/obj/structure/table/rack/shelf/steel, +/obj/item/material/twohanded/folded_metal_chair, +/obj/item/material/twohanded/folded_metal_chair, +/obj/item/material/twohanded/folded_metal_chair, +/obj/item/material/twohanded/folded_metal_chair, +/obj/item/material/twohanded/folded_metal_chair{ + pixel_y = 5 + }, +/obj/item/material/twohanded/folded_metal_chair{ + pixel_y = 5 + }, +/obj/item/material/twohanded/folded_metal_chair{ + pixel_y = 5 + }, +/obj/item/material/twohanded/folded_metal_chair{ + pixel_y = 5 + }, +/obj/item/material/twohanded/folded_metal_chair{ + pixel_y = 10 + }, +/obj/item/material/twohanded/folded_metal_chair{ + pixel_y = 10 + }, +/obj/item/material/twohanded/folded_metal_chair{ + pixel_y = 10 + }, +/obj/item/material/twohanded/folded_metal_chair{ + pixel_y = 10 + }, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "Vw" = ( /obj/machinery/door/blast/regular{ density = 0; @@ -13595,6 +14674,37 @@ }, /turf/simulated/floor/tiled/steel, /area/rift/station/fighter_bay) +"Vx" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/table/marble, +/obj/item/reagent_containers/food/condiment/small/saltshaker{ + pixel_x = -9 + }, +/obj/item/reagent_containers/food/condiment/small/saltshaker{ + pixel_x = -3 + }, +/obj/item/reagent_containers/food/condiment/small/peppermill{ + pixel_x = 3 + }, +/obj/item/reagent_containers/food/condiment/small/peppermill{ + pixel_x = 9 + }, +/obj/item/reagent_containers/food/condiment/coldsauce{ + pixel_x = 8; + pixel_y = 16 + }, +/obj/item/reagent_containers/food/condiment/spacespice{ + pixel_x = -8; + pixel_y = 13 + }, +/obj/item/reagent_containers/food/condiment/hotsauce{ + pixel_y = 16 + }, +/obj/machinery/camera/network/security{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/security/prison/lower) "Vy" = ( /obj/machinery/door/airlock/multi_tile/metal/mait, /obj/machinery/atmospherics/component/binary/passive_gate/on, @@ -13637,6 +14747,14 @@ }, /turf/simulated/floor/tiled, /area/engineering/atmos) +"VJ" = ( +/obj/effect/floor_decal/rust, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/closet/emcloset, +/turf/simulated/floor, +/area/security/prison/lower) "VK" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -13713,13 +14831,10 @@ /obj/structure/cable/green, /turf/simulated/floor/tiled/dark, /area/tcommsat/computer) -"VV" = ( -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/lower/trash_pit) -"VY" = ( -/turf/simulated/floor/plating, -/area/maintenance/elevator) +"VX" = ( +/obj/structure/closet/secure_closet/freezer/meat, +/turf/simulated/floor/tiled/freezer/cold, +/area/security/prison/lower) "VZ" = ( /obj/effect/floor_decal/techfloor{ dir = 9 @@ -13786,6 +14901,10 @@ }, /turf/simulated/floor/tiled/steel, /area/rift/station/fighter_bay) +"Wh" = ( +/obj/structure/bed/chair/sofa/green, +/turf/simulated/floor/concrete/indoors, +/area/security/prison/lower) "Wj" = ( /obj/effect/blocker, /turf/simulated/open/lythios43c, @@ -13822,6 +14941,22 @@ }, /turf/simulated/floor/lythios43c/indoors, /area/rift/surfacebase/underground/under1) +"Wu" = ( +/obj/structure/closet/secure_closet/freezer/fridge, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/sugar, +/obj/item/reagent_containers/food/condiment/sugar, +/obj/item/reagent_containers/food/condiment/sugar, +/obj/item/reagent_containers/food/condiment/sugar, +/turf/simulated/floor/tiled/freezer/cold, +/area/security/prison/lower) "Wv" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 6 @@ -13968,12 +15103,6 @@ }, /turf/simulated/floor/concrete/rng/indoors, /area/rift/station/fighter_bay/transport_tunnel) -"WL" = ( -/turf/unsimulated/wall/planetary/lythios43c{ - desc = "Glacial permafrost, compacted harder than stone."; - icon_state = "icerock-dark" - }, -/area/security/prison) "WM" = ( /obj/effect/floor_decal/spline/plain{ dir = 9 @@ -14011,6 +15140,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/tiled/techfloor/grid, /area/rift/station/fighter_bay/hangar) +"WV" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/table/marble, +/obj/item/storage/box/beakers{ + name = "box of measuring cups"; + pixel_x = 2; + pixel_y = 3 + }, +/turf/simulated/floor/tiled/white, +/area/security/prison/lower) "WW" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -14115,6 +15254,10 @@ "Xs" = ( /turf/simulated/wall/r_wall/prepainted/command, /area/tcommsat/chamber) +"Xt" = ( +/obj/machinery/door/window/northright, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "Xu" = ( /obj/structure/catwalk, /obj/structure/cable/green{ @@ -14164,6 +15307,27 @@ }, /turf/simulated/floor/tiled/kafel_full/beige, /area/crew_quarters/pool) +"XD" = ( +/obj/item/material/knife/machete/hatchet, +/obj/item/material/knife/machete/hatchet, +/obj/item/material/minihoe, +/obj/item/material/minihoe, +/obj/item/shovel/spade, +/obj/item/shovel/spade, +/obj/item/plant_analyzer, +/obj/item/plant_analyzer, +/obj/item/material/knife/plastic, +/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, +/obj/machinery/camera/network/security{ + dir = 10 + }, +/obj/machinery/air_alarm/south_mount, +/obj/structure/table/standard{ + name = "plastic table frame" + }, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "XF" = ( /obj/effect/floor_decal/borderfloor, /obj/machinery/door/firedoor/glass{ @@ -14218,6 +15382,14 @@ }, /turf/simulated/floor/tiled/techmaint, /area/turbolift/rhammerhead/underground) +"XP" = ( +/obj/structure/table/reinforced, +/obj/item/storage/box/cups, +/obj/machinery/camera/network/security{ + dir = 6 + }, +/turf/simulated/floor/concrete/indoors, +/area/security/prison/lower) "XQ" = ( /turf/simulated/wall/prepainted, /area/crew_quarters/pool) @@ -14313,6 +15485,10 @@ /obj/machinery/camera/network/research, /turf/simulated/floor/tiled, /area/rnd/secure_storage/upper) +"Ym" = ( +/obj/structure/mirror/long, +/turf/simulated/wall/r_wall/prepainted/security, +/area/security/prison/lower) "Yn" = ( /obj/structure/cable/green{ icon_state = "0-4" @@ -14323,6 +15499,14 @@ }, /turf/simulated/floor/plating, /area/rift/station/fighter_bay/transport_tunnel_garage_maint) +"Yo" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/table/marble, +/obj/machinery/chemical_dispenser/catering/bar_coffee{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/security/prison/lower) "Yp" = ( /obj/machinery/vending/assist, /turf/simulated/floor/plating, @@ -14356,6 +15540,15 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techmaint, /area/engineering/drone_fabrication) +"Yw" = ( +/obj/structure/railing/grey{ + dir = 4 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "Yx" = ( /obj/machinery/atmospherics/component/unary/vent_pump{ dir = 4; @@ -14425,6 +15618,10 @@ /obj/structure/transit_tube/high_velocity, /turf/simulated/floor/lythios43c/indoors, /area/rift/surfacebase/underground/under1) +"YF" = ( +/obj/machinery/fitness/punching_bag, +/turf/simulated/floor/concrete/indoors, +/area/security/prison/lower) "YH" = ( /obj/machinery/door/airlock/maintenance/common, /obj/machinery/door/firedoor/glass, @@ -14476,6 +15673,14 @@ }, /turf/simulated/floor/plating, /area/maintenance/elevator) +"YT" = ( +/obj/effect/floor_decal/industrial/halfstair{ + dir = 8 + }, +/obj/structure/railing/grey, +/obj/effect/floor_decal/spline/plain, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "YV" = ( /obj/machinery/light/small, /turf/simulated/floor/plating, @@ -14590,11 +15795,20 @@ }, /turf/simulated/floor/tiled, /area/maintenance/elevator) +"Zg" = ( +/obj/structure/closet/secure_closet/freezer/fridge, +/turf/simulated/floor/tiled/freezer/cold, +/area/security/prison/lower) "Zh" = ( /obj/item/digestion_remains/skull/tajaran, /obj/item/arrow/rod, /turf/simulated/floor/plating, /area/maintenance/engineering) +"Zi" = ( +/obj/effect/floor_decal/rust, +/obj/structure/closet/crate/trashcart, +/turf/simulated/floor, +/area/security/prison/lower) "Zj" = ( /obj/machinery/door/airlock/lift, /turf/simulated/floor/tiled/techmaint, @@ -14643,9 +15857,6 @@ /obj/item/storage/toolbox/mechanical, /turf/simulated/floor/tiled/steel_grid/lythios43c, /area/rift/surfacebase/underground/under1) -"Zu" = ( -/turf/simulated/mineral/icerock/lythios43c, -/area/security/prison) "Zv" = ( /obj/machinery/atmospherics/component/unary/vent_pump{ dir = 4; @@ -14687,9 +15898,15 @@ /turf/simulated/floor/tiled/steel, /area/hallway/primary/underone) "ZA" = ( -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/elevator) +/obj/structure/stairs/spawner/north, +/obj/structure/railing/grey{ + dir = 4 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/turf/simulated/floor/concrete/tile/indoors, +/area/security/prison/lower) "ZC" = ( /obj/structure/table/rack/shelf/steel, /obj/random/maintenance/engineering, @@ -14719,6 +15936,15 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/tiled, /area/maintenance/elevator) +"ZH" = ( +/obj/effect/floor_decal/rust, +/obj/machinery/door/airlock/maintenance/sec, +/turf/simulated/floor, +/area/security/prison/lower) +"ZJ" = ( +/obj/structure/bed/chair/sofa/green/left, +/turf/simulated/floor/concrete/indoors, +/area/security/prison/lower) "ZK" = ( /obj/machinery/atmospherics/component/binary/pump{ dir = 1; @@ -14858,200 +16084,6 @@ (1,1,1) = {" Wj -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -TQ -QZ -QJ -sI -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -Qc -yu -It -It -It -It -It -It -It -It -uJ -Wj -"} -(2,1,1) = {" -Wj td td td @@ -15158,7 +16190,7 @@ td MK Mb es -OO +sI td td td @@ -15232,7 +16264,201 @@ td td td OS -AL +yu +td +td +td +td +td +td +td +td +td +Wj +"} +(2,1,1) = {" +Wj +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +MK +Mb +es +sI +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +td +OS +yu td td td @@ -15352,7 +16578,7 @@ td MK Mb As -OO +sI td td td @@ -15426,7 +16652,7 @@ td td td OS -AL +yu td td td @@ -15620,7 +16846,7 @@ td td td OS -AL +yu td td td @@ -15814,7 +17040,7 @@ td td td OS -AL +yu td td td @@ -16008,7 +17234,7 @@ td td td OS -AL +yu td td td @@ -16125,8 +17351,8 @@ td td td wG -OO -OO +sI +sI Jg rv td @@ -16202,7 +17428,7 @@ td td td OS -AL +yu td td td @@ -16396,7 +17622,7 @@ td td td OS -AL +yu td td td @@ -16514,8 +17740,8 @@ td td ut PU -OO -OO +sI +sI Nx PU td @@ -16590,7 +17816,7 @@ td td td OS -AL +yu td td td @@ -16708,8 +17934,8 @@ td td es es -OO -OO +sI +sI rv es td @@ -16784,7 +18010,7 @@ td td td OS -AL +yu td aa aa @@ -16902,8 +18128,8 @@ td td td es -OO -OO +sI +sI rv es aa @@ -17096,8 +18322,8 @@ td td td es -OO -OO +sI +sI rv es aa @@ -17291,7 +18517,7 @@ td td es Gt -OO +sI Cb es aa @@ -17484,8 +18710,8 @@ td td td Dm -OO -OO +sI +sI rv aa aa @@ -17678,8 +18904,8 @@ td td td Dm -OO -OO +sI +sI rv aa aa @@ -17872,8 +19098,8 @@ td td td Dm -OO -OO +sI +sI rv aa aa @@ -18067,7 +19293,7 @@ td td es Gt -OO +sI Cb es aa @@ -18260,8 +19486,8 @@ td td td aa -OO -OO +sI +sI rv Dm Dm @@ -18454,8 +19680,8 @@ td td td aa -OO -OO +sI +sI rv Dm Dm @@ -18648,8 +19874,8 @@ td td td aa -OO -OO +sI +sI rv aa Dm @@ -18843,7 +20069,7 @@ td td es Gt -OO +sI Cb es aa @@ -19036,8 +20262,8 @@ td td td aa -OO -OO +sI +sI rv aa aa @@ -19230,8 +20456,8 @@ td td td aa -OO -OO +sI +sI rv aa aa @@ -19424,8 +20650,8 @@ td td aa aa -OO -OO +sI +sI rv aa aa @@ -19619,7 +20845,7 @@ td aa es Gt -OO +sI Cb es aa @@ -19812,8 +21038,8 @@ td td aa Dm -OO -OO +sI +sI rv jL jL @@ -20006,8 +21232,8 @@ td MK Dm Dm -OO -OO +sI +sI Nx jL jL @@ -20200,8 +21426,8 @@ td MK WR Dm -OO -OO +sI +sI Nx jL jL @@ -20395,7 +21621,7 @@ yO Dm es Gt -OO +sI YE es jL @@ -20588,10 +21814,10 @@ Yu Yu Yu db -OO -OO +sI +sI Wt -OO +sI jL jL jL @@ -20781,13 +22007,13 @@ OW xa WA Yu -OO -OO -OO -OO +sI +sI +sI +sI uj -OO -OO +sI +sI es jL aa @@ -20975,14 +22201,14 @@ WU lz lP Yu -OO -OO -OO +sI +sI +sI ig -OO +sI uj -OO -OO +sI +sI jL aa aa @@ -21174,9 +22400,9 @@ Wc Uh Md Md -OO +sI Ss -OO +sI jL aa aa @@ -21370,7 +22596,7 @@ TW Md Gt rv -OO +sI aa aa aa @@ -23118,7 +24344,7 @@ Vy Vu Ex tG -sS +sR Gr KY sR @@ -23701,7 +24927,7 @@ MY MY MY pT -sS +sR my sR po @@ -23794,9 +25020,9 @@ aa aa aa aa -Zu -Zu -Zu +aa +aa +aa Jl Jl Jl @@ -23807,10 +25033,10 @@ Ok Hy Jl Jl -Zu -Zu -Zu -Zu +aa +aa +aa +aa aa aa aa @@ -23985,10 +25211,10 @@ aa aa aa aa -Zu -Zu -Zu -Zu +aa +aa +aa +aa Qp Qp Qp @@ -24004,15 +25230,15 @@ Qp Qp Qp Qp -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -24173,13 +25399,13 @@ ms aa aa aa -Zu -Zu -Zu -Zu -Zu -Zu -Zu +aa +aa +aa +aa +aa +aa +aa Qp Qp Qp @@ -24206,11 +25432,11 @@ Qp Qp Qp Qp -Zu -Zu -Zu -Zu -Zu +aa +aa +aa +aa +aa aa aa aa @@ -24363,11 +25589,11 @@ aa ms "} (50,1,1) = {" -WL -Zu -Zu -Zu -Zu +ms +aa +aa +aa +aa Qp Qp Qp @@ -24404,8 +25630,8 @@ Qp Qp Qp Qp -Zu -Zu +aa +aa aa aa aa @@ -24557,7 +25783,7 @@ aa ms "} (51,1,1) = {" -WL +ms Qp Qp Qp @@ -24599,14 +25825,14 @@ Qp Qp Qp Qp -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -24767,18 +25993,18 @@ Qp Qp Qp Qp -Zu -Zu -Zu -Zu -Zu -Zu +aa +aa +aa +aa +aa +aa Qp Qp Qp -Zu -Zu -Zu +aa +aa +aa Qp Qp Qp @@ -24800,8 +26026,8 @@ Qp Qp Qp Qp -Zu -Zu +aa +aa aa aa aa @@ -24867,7 +26093,7 @@ zz zz zz my -sS +sR sa aa aa @@ -24956,24 +26182,24 @@ Qp Qp Qp Qp -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa Qp Qp Qp @@ -24995,8 +26221,8 @@ Qp Qp Qp Qp -Zu -Zu +aa +aa aa aa aa @@ -25144,31 +26370,31 @@ Qp Qp Qp Qp -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa Qp Qp Qp @@ -25190,7 +26416,7 @@ Qp Qp Qp Qp -Zu +aa aa aa aa @@ -25333,38 +26559,38 @@ aa ms "} (55,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +ms +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa Qp Qp Qp @@ -25384,8 +26610,8 @@ Qp Qp Qp Qp -Zu -Zu +aa +aa aa aa aa @@ -25449,7 +26675,7 @@ PH ED zz my -sS +sR sa sa LD @@ -25527,46 +26753,46 @@ aa ms "} (56,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +ms +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa Qp Qp Qp @@ -25579,8 +26805,8 @@ Qp Qp Qp Qp -Zu -Zu +aa +aa aa aa aa @@ -25649,7 +26875,7 @@ Nh sR sR sR -sS +sR sa aa aa @@ -25721,51 +26947,51 @@ aa ms "} (57,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +ms +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa Qp Qp Qp @@ -25774,9 +27000,9 @@ Qp Qp Qp Qp -Zu -Zu -Zu +aa +aa +aa aa aa aa @@ -25843,7 +27069,7 @@ sR sR sR Ps -PY +sZ sa aa aa @@ -25915,64 +27141,64 @@ aa ms "} (58,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Qp -Qp -Qp -Qp -Qp -Qp -Qp -Qp -Qp -Zu -Zu -Zu +ms +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +Qp +Qp +Qp +Qp +Qp +Qp +Qp +Qp +Qp +aa +aa +aa aa aa aa @@ -26037,7 +27263,7 @@ sR sR Im nu -PY +sZ aa aa aa @@ -26083,7 +27309,7 @@ sR sR ZN Da -Gk +kt Om WR WR @@ -26109,53 +27335,53 @@ aa ms "} (59,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +ms +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa Qp Qp Qp @@ -26166,12 +27392,12 @@ Qp Qp Qp Qp -Zu -Zu -Zu -Zu -Zu -Zu +aa +aa +aa +aa +aa +aa aa aa aa @@ -26231,7 +27457,7 @@ sR Im JX pv -PY +sZ aa WC in @@ -26277,7 +27503,7 @@ sR sR sR Om -Gk +kt Da WR WR @@ -26303,54 +27529,54 @@ aa ms "} (60,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +ms +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa Qp Qp Qp @@ -26365,10 +27591,10 @@ Qp Qp Qp Qp -Zu -Zu -Zu -Zu +aa +aa +aa +aa aa aa aa @@ -26419,13 +27645,13 @@ sR sR Lf my -sS +sR sa Nh sR Im kN -PY +sZ aa lq lq @@ -26497,55 +27723,55 @@ aa ms "} (61,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +ms +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa Qp Qp Qp @@ -26562,8 +27788,8 @@ Qp Qp Qp Qp -Zu -Zu +aa +aa aa aa aa @@ -26619,7 +27845,7 @@ sa vf sR FH -PY +sZ aa UB nS @@ -26691,57 +27917,57 @@ aa ms "} (62,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +ms +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa Qp Qp Qp @@ -26757,8 +27983,8 @@ Qp Qp Qp Qp -Zu -Zu +aa +aa aa aa aa @@ -26807,7 +28033,7 @@ lC ju ju my -sS +sR Gr sa sa @@ -26885,59 +28111,59 @@ aa ms "} (63,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +ms +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa Qp Qp Qp @@ -26952,7 +28178,7 @@ Qp Qp Qp Qp -Zu +aa aa aa aa @@ -27004,7 +28230,7 @@ my sR sR sR -sS +sR sR my NB @@ -27079,64 +28305,64 @@ aa ms "} (64,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +ms +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa Qp Qp Qp @@ -27146,7 +28372,7 @@ Qp Qp Qp Qp -Zu +aa aa aa aa @@ -27167,7 +28393,7 @@ Mq lT Tl Ol -VV +Ra HD zG Ve @@ -27273,74 +28499,74 @@ aa ms "} (65,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Qp -Qp -Qp -Qp -Qp -Qp -Zu -Zu +ms +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +Qp +Qp +Qp +Qp +Qp +Qp +aa +aa aa aa aa @@ -27361,7 +28587,7 @@ Mq Mq No Ol -VV +Ra DG yf Cw @@ -27372,7 +28598,7 @@ aG jn aG wo -Gk +kt iu aG bZ @@ -27467,74 +28693,74 @@ aa ms "} (66,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +ms +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -27563,11 +28789,11 @@ Ol Ol db iu -Gk +kt db -Gk +kt DL -Gk +kt aG cc aL @@ -27661,74 +28887,74 @@ aa ms "} (67,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +ms +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -27757,10 +28983,10 @@ aa aa db kt -Gk -Gk -Gk -Gk +kt +kt +kt +kt Ks aG Vs @@ -27855,41 +29081,41 @@ aa ms "} (68,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +ms +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa Tl Tl Tl @@ -27951,7 +29177,7 @@ aa aa db kt -Gk +kt aG aG aG @@ -28049,39 +29275,39 @@ aa ms "} (69,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +ms +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa Tl Tl Tl @@ -28145,7 +29371,7 @@ aa aa db iu -Gk +kt aG bh br @@ -28243,38 +29469,38 @@ aa ms "} (70,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +ms +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa Tl Tl vy @@ -28339,7 +29565,7 @@ aa aa db na -Gk +kt jn aJ bf @@ -28437,38 +29663,38 @@ aa ms "} (71,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +ms +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa Tl kw ht @@ -28631,37 +29857,37 @@ aa ms "} (72,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +ms +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa Tl Tl Zy @@ -28825,37 +30051,37 @@ aa ms "} (73,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +ms +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa Tl hU pX @@ -29019,37 +30245,37 @@ aa ms "} (74,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +ms +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa Tl pX Mq @@ -29213,37 +30439,37 @@ aa ms "} (75,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +ms +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa No Mq Mq @@ -29255,32 +30481,32 @@ Mq No No No -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -29407,37 +30633,37 @@ aa ms "} (76,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +ms +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa No Mq Mq @@ -29447,34 +30673,34 @@ Mq Mq No No -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -29601,167 +30827,7 @@ aa ms "} (77,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -No -Mq -Mq -Mq -Mq -Mq -Mq -No -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aZ -rc -ap -aD -by -cm -aZ -aL -bb -bb -bb -cA -cA -cA -cA -ZS -cA -du -iP -sd -eh -fR -mp -mr -ts -ts -ts -eT -Rp -yG -eT -ou -yG -eT -eW -yG -eT -qj -HX -qj -eT -lN -Cs -ih -Nc -mP -qz -gH -gH -gH -ol -sa -sa -sa -YH -sa -sa -sa -sR -tG -my -sR -sa -sR -IW -iE -MU -XN -sa -my -wX -sa +ms aa aa aa @@ -29792,77 +30858,237 @@ aa aa aa aa -ms -"} -(78,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Tl -IN +No +Mq +Mq +Mq Mq Mq Mq -lT -Tl No -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aZ +rc +ap +aD +by +cm +aZ +aL +bb +bb +bb +cA +cA +cA +cA +ZS +cA +du +iP +sd +eh +fR +mp +mr +ts +ts +ts +eT +Rp +yG +eT +ou +yG +eT +eW +yG +eT +qj +HX +qj +eT +lN +Cs +ih +Nc +mP +qz +gH +gH +gH +ol +sa +sa +sa +YH +sa +sa +sa +sR +tG +my +sR +sa +sR +IW +iE +MU +XN +sa +my +wX +sa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ms +"} +(78,1,1) = {" +ms +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +Tl +IN +Mq +Mq +Mq +lT +Tl +No +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -29989,37 +31215,37 @@ aa ms "} (79,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +ms +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa kZ kZ kZ kZ kZ -Zu +aa No Mq Mq @@ -30027,36 +31253,36 @@ Mq Mq Mq No -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -30183,37 +31409,37 @@ aa ms "} (80,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +ms +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa kZ Yn EA xY kZ -Zu +aa Tl vC oO @@ -30221,36 +31447,36 @@ oO oO bC Tl -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -30377,37 +31603,37 @@ aa ms "} (81,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +ms +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa kZ lg pt XJ kZ -Zu +aa Tl Tn Tn @@ -30415,36 +31641,36 @@ Tn Tn Tn Tl -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -30571,31 +31797,31 @@ aa ms "} (82,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +ms +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa kZ kZ kZ @@ -30609,36 +31835,36 @@ mJ mJ eU Tl -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -30765,31 +31991,31 @@ aa ms "} (83,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +ms +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa pM KE yP @@ -30803,36 +32029,36 @@ ys ys ys Tl -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Sg -sj -Zu -sj -sj -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +BH +BH +BH +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -30959,31 +32185,31 @@ aa ms "} (84,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +ms +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa pM Ds vL @@ -30997,36 +32223,6 @@ ys ys YN Tl -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -sj -sj -sj -sj -sj -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu aa aa aa @@ -31042,6 +32238,36 @@ aa aa aa aa +BH +BH +oQ +BH +BH +aa +ua +ua +ua +ua +ua +ua +ua +ua +ua +ua +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -31153,31 +32379,31 @@ aa ms "} (85,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +ms +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa pM KE ep @@ -31191,36 +32417,6 @@ ys ys ys Tl -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -sj -IC -sj -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu aa aa aa @@ -31236,6 +32432,36 @@ aa aa aa aa +BH +qS +Ox +Hu +BH +aa +ua +or +dJ +Vg +Up +vI +fv +vI +mR +ua +ua +ua +ua +ua +ua +ua +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -31347,31 +32573,31 @@ aa ms "} (86,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +ms +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa pM pM pH @@ -31385,36 +32611,6 @@ ys ys FS Tl -Zu -Zu -Zu -Zu -Zu -Zu -Zu -sj -Zu -IA -LN -sj -IC -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu aa aa aa @@ -31430,6 +32626,36 @@ aa aa aa aa +BH +gq +vc +vc +BH +aa +ua +rI +Vg +SP +Vg +Vg +Vg +Vg +wj +ua +Np +dA +yg +Vb +DM +ua +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -31541,31 +32767,31 @@ aa ms "} (87,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +ms +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ph ph Fq @@ -31579,36 +32805,6 @@ ys ys ys Tl -By -By -By -By -Zu -Zu -sj -GB -GB -sj -IC -Nf -Vf -Jy -Jy -Jy -Jy -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu aa aa aa @@ -31624,6 +32820,36 @@ aa aa aa aa +BH +BH +ZH +BH +BH +ua +ua +RO +Vg +Vg +Vg +Vg +Vg +Vg +YF +ua +Np +dA +FU +Vb +DM +ua +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -31735,31 +32961,31 @@ aa ms "} (88,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +ms +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ph XO HM @@ -31773,36 +32999,6 @@ ys ys FS Tl -Zu -Zu -Zu -Zu -Zu -Zu -vE -sj -sj -IC -My -Iv -Iv -aH -BP -Av -Jy -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu aa aa aa @@ -31816,6 +33012,36 @@ aa aa aa aa +ua +ua +ua +JJ +vc +Vd +VJ +ua +ua +rI +Vg +SP +Vg +Ai +Ai +Vg +Vg +Pu +Jo +dA +Ym +Vb +DM +ua +aa +aa +aa +aa +aa +aa aa aa aa @@ -31929,31 +33155,31 @@ aa ms "} (89,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +ms +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ph HM HM @@ -31967,36 +33193,6 @@ ys ys ys Tl -Zu -Zu -Zu -Zu -Zu -Sg -GB -sj -ES -sj -Rx -Iv -Iv -aH -BP -Av -Jy -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu aa aa aa @@ -32009,6 +33205,36 @@ aa aa aa aa +ua +ua +Zi +vc +JT +JT +vc +vc +JJ +ua +FP +Vg +Vg +Vg +Vg +Vg +Vg +YF +ua +Np +dA +rQ +Vb +DM +ua +aa +aa +aa +aa +aa aa aa aa @@ -32123,31 +33349,31 @@ aa ms "} (90,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +ms +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ph HM HM @@ -32161,36 +33387,6 @@ ys ys jJ Tl -Zu -Zu -Zu -Zu -Zu -Zu -sj -sj -sj -sj -IC -un -KK -Jy -Jy -Jy -Jy -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu aa aa aa @@ -32203,6 +33399,36 @@ aa aa aa aa +ua +fB +vc +JT +JT +JJ +Oo +vc +vc +yC +om +Vg +Vg +Vg +Vg +Vg +Vg +wj +ua +Np +dA +iK +Vb +DM +ua +aa +aa +aa +aa +aa aa aa aa @@ -32216,7 +33442,7 @@ aa aa aa aG -Fd +qd UU UU gi @@ -32317,31 +33543,31 @@ aa ms "} (91,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +ms +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ph HM HM @@ -32355,36 +33581,6 @@ ys ys FS Tl -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -FM -sj -sj -IC -sj -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu aa aa aa @@ -32397,6 +33593,36 @@ aa aa aa aa +ua +AK +JT +ua +ua +ua +ua +ua +ua +ua +ua +UJ +Jy +Ay +Vg +Vg +Jy +UG +ua +ua +ua +bB +ua +ua +ua +aa +aa +aa +aa +aa aa aa aa @@ -32510,174 +33736,202 @@ aa aa ms "} -(92,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -ph -HM -HM -HM -HM -Jh -Zj -KO -ys -ys -ys -ys -Tl -Zu -Zu -Zu -Zu -Zu -se -sj -Zu -Zu -sj -sj -sj -IC -sj -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aG -Vq -gi -Vl -aG -aG -aG -aG -aG -aG -ce -Ph -aG -bz -dh -tg -rT -qK -Gg -Gg -Gg -Xp -mQ -if -eT -yG -yG -eT -yG -PE -eT -yG -dX -eT -eT -Zx -Zx -qT -Zx -Zx -Zx -qt -Zx -Hn -Hn -Hn -Xp -mO -hX -mO -mO -mO -mO -mO -mO -Zq -Gr -my -sR -sa -XN -kU -lw -Bf -XN -sa -my -wX -sa -aa -aa -aa -aa -aa -aa +(92,1,1) = {" +ms +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ph +HM +HM +HM +HM +Jh +Zj +KO +ys +ys +ys +ys +Tl +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ua +vc +JT +ua +HS +Vv +IC +dD +wS +lt +dD +dD +dD +dD +ov +hM +dD +hy +ua +ua +aH +EH +yq +ua +ua +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aG +Vq +gi +Vl +aG +aG +aG +aG +aG +aG +ce +Ph +aG +bz +dh +tg +rT +qK +Gg +Gg +Gg +Xp +mQ +if +eT +yG +yG +eT +yG +PE +eT +yG +dX +eT +eT +Zx +Zx +qT +Zx +Zx +Zx +qt +Zx +Hn +Hn +Hn +Xp +mO +hX +mO +mO +mO +mO +mO +mO +Zq +Gr +my +sR +sa +XN +kU +lw +Bf +XN +sa +my +wX +sa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ms +"} +(93,1,1) = {" +ms aa aa aa @@ -32702,34 +33956,6 @@ aa aa aa aa -ms -"} -(93,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu ph HM HM @@ -32743,36 +33969,6 @@ ys ys ys Tl -Zu -Zu -Zu -Zu -Zu -Zu -sj -sj -sj -sj -Zu -sj -sj -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu aa aa aa @@ -32785,6 +33981,36 @@ aa aa aa aa +ua +JJ +JT +ua +ua +UT +uG +Vg +Vg +Vg +Vg +Vg +Vg +Vg +Vg +Vg +Vg +Vg +qR +EH +EH +EH +EH +qL +ua +aa +aa +aa +aa +aa aa aa aa @@ -32899,31 +34125,31 @@ aa ms "} (94,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +ms +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ph XO HM @@ -32937,36 +34163,6 @@ ys ys FS Tl -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -sj -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu aa aa aa @@ -32979,6 +34175,36 @@ aa aa aa aa +ua +SY +JT +ua +ua +ZA +Yw +Vg +Vg +Vg +Vg +Vg +Vg +Vg +Vg +Vg +Vg +Vg +qR +EH +EH +EH +EH +qL +ua +aa +aa +aa +aa +aa aa aa aa @@ -33093,31 +34319,31 @@ aa ms "} (95,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +ms +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ph ph ph @@ -33131,36 +34357,6 @@ ys FQ ys Tl -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu aa aa aa @@ -33173,6 +34369,36 @@ aa aa aa aa +ua +ua +qF +ua +kM +Vv +dD +dD +dD +dD +dD +Vg +Vg +dD +Tk +Tk +Tk +dD +ua +ua +Dy +EH +rZ +ua +ua +aa +aa +aa +aa +aa aa aa IE @@ -33287,37 +34513,37 @@ aa ms "} (96,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +ms +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa Tl Tl Tl @@ -33325,36 +34551,6 @@ Tl Tl Tl Tl -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu aa aa aa @@ -33367,6 +34563,36 @@ aa aa aa aa +ua +IT +dD +ua +le +ei +ei +ei +ei +ei +dD +Vg +Vg +dD +OU +OU +OU +MG +ua +ua +ua +El +ua +ua +ua +aa +aa +aa +aa +aa aa aa IE @@ -33386,7 +34612,7 @@ xL OD UN IE -sL +gi Vl aG FI @@ -33481,74 +34707,16 @@ aa ms "} (97,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +ms +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -33563,6 +34731,64 @@ aa aa aa aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ua +ua +Nf +dD +ua +AE +dD +dD +CR +dD +lE +Ip +Vg +Vg +dD +Tk +Tk +Tk +dD +ua +Ni +DF +Sb +El +Ad +ua +aa +aa +aa +aa +aa +aa +aa IE IE Ee @@ -33675,74 +34901,40 @@ aa ms "} (98,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +ms +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -33757,6 +34949,40 @@ aa aa aa aa +aa +ua +Pg +dD +Ku +jF +hj +dD +dD +dD +dD +dD +lm +Vg +Vg +dD +dD +dD +dD +FW +ua +Ez +dA +Sb +ua +ua +ua +aa +aa +aa +aa +aa +aa +aa IE th IF @@ -33869,74 +35095,31 @@ aa ms "} (99,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +ms +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -33951,6 +35134,49 @@ aa aa aa aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ua +Rn +dD +Hq +jF +hj +dD +dD +dD +dD +dD +Ip +Vg +Vg +dD +Tk +Tk +Tk +dD +ua +Nd +dA +Sb +El +Ad +ua +aa +aa +aa +aa +aa +aa +aa IE uO OE @@ -34063,74 +35289,22 @@ aa ms "} (100,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +ms +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -34145,6 +35319,58 @@ aa aa aa aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ua +Ju +dD +Wh +jF +hj +dD +dD +dD +dD +dD +Ip +Vg +Vg +dD +OU +OU +OU +MG +ua +Ns +dA +Sb +ua +ua +ua +aa +aa +aa +aa +aa +aa +aa IE xo Po @@ -34257,51 +35483,13 @@ aa ms "} (101,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +ms +aa +aa +aa +aa +aa +aa aa aa aa @@ -34338,6 +35526,44 @@ aa aa aa aa +aa +aa +aa +aa +aa +aa +ua +XP +dD +Wh +jF +hj +dD +dD +ng +dD +dD +Ip +Vg +Vg +dD +Tk +Tk +Tk +dD +ua +Ns +St +Sb +El +MV +ua +aa +aa +aa +aa +aa +aa IE IE IE @@ -34451,51 +35677,28 @@ aa ms "} (102,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +ms +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -34523,6 +35726,131 @@ aa aa aa aa +ua +Ai +dD +Wh +jF +hj +dD +dD +dD +dD +dD +Ip +Vg +Vg +dD +dD +dD +dD +TK +ua +ua +ua +ua +ua +ua +ua +aa +aa +aa +aa +aa +aa +IE +cp +cp +cp +cp +cp +cp +cp +cp +IE +IE +IE +IE +GQ +IE +IE +XV +cp +cp +cp +sa +RF +Ya +Ya +XU +Ya +SV +Ya +XU +Ya +Ya +RM +sa +sR +sR +sR +sa +wN +sR +sR +sR +sR +YV +sa +aa +aa +aa +aa +aa +Jb +Jb +Jb +Ho +Zs +oq +oq +oq +aa +aa +aa +aa +aa +aa +aa +aa +es +es +jE +jE +lZ +lZ +lZ +jE +ol +sa +sa +Fu +sa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -34532,88 +35860,6 @@ aa aa aa aa -IE -cp -cp -cp -cp -cp -cp -cp -cp -IE -IE -IE -IE -GQ -IE -IE -XV -cp -cp -cp -sa -RF -Ya -Ya -XU -Ya -SV -Ya -XU -Ya -Ya -RM -sa -sR -sR -sR -sa -wN -sS -sR -sR -sS -YV -sa -aa -aa -aa -aa -aa -Jb -Jb -Jb -Ho -Zs -oq -oq -oq -aa -aa -aa -aa -aa -aa -aa -aa -es -es -jE -jE -lZ -lZ -lZ -jE -ol -sa -sa -Fu -sa -aa -aa -aa -aa aa aa aa @@ -34622,6 +35868,10 @@ aa aa aa aa +ms +"} +(103,1,1) = {" +ms aa aa aa @@ -34642,54 +35892,6 @@ aa aa aa aa -ms -"} -(103,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu aa aa aa @@ -34718,6 +35920,30 @@ aa aa aa aa +ua +Uo +dD +ZJ +jF +hj +dD +dD +dD +dD +dD +Ip +Vg +Vg +LR +Vk +Vk +Vk +Az +ua +ua +ua +ua +ua aa aa aa @@ -34728,18 +35954,18 @@ aa aa IE RB -ZA -ZA -ZA -ZA -ZA -ZA -ZA +bu +bu +bu +bu +bu +bu +bu vK -eo -ZA -eo -ZA +bu +bu +bu +bu XV IE wn @@ -34759,7 +35985,7 @@ UP Ya RL sa -sS +sR sR sR sa @@ -34839,51 +36065,27 @@ aa ms "} (104,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +ms +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -34912,6 +36114,30 @@ aa aa aa aa +ua +Rn +dD +Ku +jF +hj +dD +dD +dD +dD +dD +Xt +Vg +Vg +fN +sP +sP +sP +sP +KV +Yo +jw +yF +ua aa aa aa @@ -34933,7 +36159,7 @@ IE Tp cp cp -ZA +bu XV IE wk @@ -35033,51 +36259,21 @@ aa ms "} (105,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +ms +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -35112,6 +36308,36 @@ aa aa aa aa +ua +eH +dD +dD +ua +AE +dD +dD +SQ +dD +Gf +Ip +Vg +Vg +fN +sP +sP +sP +sP +sP +sP +sP +nr +ua +aa +aa +aa +aa +aa +aa aa aa IE @@ -35127,13 +36353,13 @@ IE IE XV cp -ZA +bu sF IE yv cp -ZA -hO +bu +cp sa RF Ya @@ -35147,13 +36373,13 @@ Jq Ya RL sa -sS +sR sR sa sR -sS sR -PY +sR +sZ xk Kf Kf @@ -35227,51 +36453,8 @@ aa ms "} (106,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +ms +aa aa aa aa @@ -35316,18 +36499,61 @@ aa aa aa aa +aa +aa +aa +ua +ua +dD +Lz +ua +le +Mk +Mk +Mk +Mk +Mk +dD +Vg +Vg +fN +sP +sP +sP +sP +sP +sP +sP +WV +ua +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa IE KM KM jK -VY -ZA -ZA +cp +bu +bu Ed -ZA -ZA -ZA -hO +bu +bu +bu +cp sa RF Ya @@ -35347,7 +36573,7 @@ QP sR sR sz -PY +sZ HW Kf Kf @@ -35421,51 +36647,22 @@ aa ms "} (107,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +ms +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -35500,6 +36697,35 @@ aa aa aa aa +ua +Rn +dD +mv +Su +Vg +Vg +Vg +Vg +Vg +Vg +Vg +Vg +iA +sP +yc +gn +TF +AC +sP +sP +Vx +ua +aa +aa +aa +aa +aa +aa aa aa aa @@ -35515,13 +36741,13 @@ KM KM Vp cp -ZA +bu Gv IE pQ cp -ZA -hO +bu +cp sa RF Ya @@ -35539,9 +36765,9 @@ wN sR sa ET -sS +sR Kv -PY +sZ HW Kf Kf @@ -35612,64 +36838,41 @@ aa aa aa aa -ms -"} -(108,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +ms +"} +(108,1,1) = {" +ms +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -35688,6 +36891,29 @@ aa aa aa aa +ua +GS +dD +JV +yY +Vg +Vg +Vg +Vg +Vg +Vg +Vg +Vg +lK +sP +sP +sP +sP +sP +sP +sP +Hk +ua aa aa aa @@ -35707,14 +36933,14 @@ aa IE IE IE -Vd +jK cp bu cp IE IE IE -ZA +bu cp sa RF @@ -35734,7 +36960,7 @@ sR sa ET sR -PY +sZ HW HW Kf @@ -35809,51 +37035,21 @@ aa ms "} (109,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +ms +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -35889,6 +37085,36 @@ aa aa aa aa +ua +ua +ua +ua +kM +dD +dD +Vg +Vg +Vg +dD +dD +dD +lK +sP +sP +sP +sP +sP +sP +sP +nr +ua +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -35901,14 +37127,14 @@ aa aa IE ZC -hO cp -eo -ZA -ZA -ZA -ZA -ZA +cp +bu +bu +bu +bu +bu +bu cp sa RF @@ -35928,7 +37154,7 @@ sR sa sa sR -PY +sZ HW HW Kf @@ -36003,51 +37229,18 @@ aa ms "} (110,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +ms +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -36089,6 +37282,39 @@ aa aa aa aa +ua +kM +dD +dD +Vg +Vg +Vg +dD +dD +dD +lK +nM +sO +Aq +lB +Vi +Hm +sP +uo +ua +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -36097,11 +37323,11 @@ IE xE Ko gS -hO +cp MP IR YR -hO +cp cp XV sa @@ -36122,7 +37348,7 @@ sR QP sR sR -PY +sZ HW xk HW @@ -36197,51 +37423,23 @@ aa ms "} (111,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +ms +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -36278,6 +37476,34 @@ aa aa aa aa +ua +HS +dD +hA +vs +yJ +YT +hA +dD +Cf +ua +ua +ua +ua +ua +ua +ua +Ck +ua +ua +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -36315,9 +37541,9 @@ sR sR sa sR -PY -PY -PY +sZ +sZ +sZ HW HW ub @@ -36391,51 +37617,27 @@ aa ms "} (112,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +ms +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -36468,6 +37670,30 @@ aa aa aa aa +ua +ua +DQ +DQ +iM +iM +iM +DQ +DQ +ua +ua +aa +aa +aa +aa +ua +jH +rs +jH +ua +aa +aa +aa +aa aa aa aa @@ -36505,13 +37731,13 @@ JQ Xs TO sa -sS +sR sR sa sa aa -PY -PY +sZ +sZ HW HW HW @@ -36585,51 +37811,12 @@ aa ms "} (113,1,1) = {" -WL -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu -Zu +ms +aa +aa +aa +aa +aa aa aa aa @@ -36676,6 +37863,45 @@ aa aa aa aa +ua +ua +AY +Vg +Vg +Vg +Vg +Vg +Vg +Vg +ES +ua +ua +aa +aa +aa +ua +Wu +rs +rs +ua +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -36831,27 +38057,27 @@ aa aa aa aa +ua +kO +Vg +Vg +pg +pg +Vg +pg +pg +Vg +Vg +ot +ua aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +ua +Zg +rs +qu +ua aa aa aa @@ -36893,7 +38119,7 @@ Xs Xs RL sa -sS +sR Gr sa aa @@ -37025,27 +38251,27 @@ aa aa aa aa +ua +tL +Vg +Vg +pg +pg +Vg +pg +pg +Vg +Vg +wT +ua aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +ua +VX +CL +qu +ua aa aa aa @@ -37087,7 +38313,7 @@ TO TO TO sa -sS +sR aa aa aa @@ -37219,27 +38445,27 @@ aa aa aa aa +ua +Sl +Vg +Vg +pg +pg +Vg +pg +pg +Vg +Vg +XD +ua aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +ua +ua +ua +ua +ua aa aa aa @@ -37413,19 +38639,19 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +ua +ua +Jw +Vg +Vg +Vg +Vg +Vg +Vg +Vg +wj +ua +ua aa aa aa @@ -37608,17 +38834,17 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +ua +ua +IA +SE +pg +pg +pg +SE +eu +ua +ua aa aa aa @@ -37803,15 +39029,15 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +ua +ua +ua +ua +ua +ua +ua +ua +ua aa aa aa diff --git a/maps/rift/levels/rift-04-surface1.dmm b/maps/rift/levels/rift-04-surface1.dmm index 8ecf017adc1..8bb49ecfc10 100644 --- a/maps/rift/levels/rift-04-surface1.dmm +++ b/maps/rift/levels/rift-04-surface1.dmm @@ -35,12 +35,6 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/steel, /area/quartermaster/warehouse) -"abL" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/turf/simulated/open, -/area/security/prison) "abM" = ( /obj/structure/bed/padded, /obj/item/bedsheet/green, @@ -95,12 +89,6 @@ }, /turf/simulated/floor/plating, /area/medical/virologymaint) -"acE" = ( -/obj/structure/cryofeed{ - dir = 4 - }, -/turf/simulated/floor/tiled/steel, -/area/security/prison) "adg" = ( /turf/simulated/wall/prepainted/science, /area/engineering/engine_eva) @@ -365,7 +353,7 @@ /area/maintenance/research/xenobio) "aml" = ( /turf/simulated/wall/prepainted/security, -/area/security/security_cell_hallway) +/area/security/prison) "anT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -762,14 +750,6 @@ /obj/machinery/portable_atmospherics/canister/air/airlock, /turf/simulated/floor/plating, /area/medical/virologymaint) -"aBy" = ( -/obj/structure/table/steel, -/obj/item/material/kitchen/utensil/fork/plastic, -/obj/item/material/knife/plastic{ - pixel_x = 10 - }, -/turf/simulated/floor/tiled/steel, -/area/security/prison) "aBz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -799,6 +779,18 @@ }, /turf/simulated/floor/tiled/steel, /area/storage/tools) +"aCj" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/monodark, +/area/security/prison/upper) "aCk" = ( /obj/structure/sign/poster{ pixel_y = 32 @@ -825,15 +817,24 @@ }, /area/server) "aDx" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 }, -/obj/structure/catwalk, /obj/structure/cable/green{ - icon_state = "2-4" + icon_state = "4-8" }, -/turf/simulated/floor/plating, -/area/maintenance/lowmedbaymaint) +/obj/structure/disposalpipe/junction{ + dir = 8; + icon_state = "pipe-j2" + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/monotile, +/area/security/prison) "aEB" = ( /obj/machinery/door/airlock/maintenance/medical{ name = "Medical Maintenance Access"; @@ -849,10 +850,14 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/catwalk, /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) "aEE" = ( @@ -878,7 +883,6 @@ /turf/simulated/floor/wood, /area/rift/surfacebase/outside/outside1) "aFU" = ( -/obj/machinery/door/firedoor/glass, /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, /obj/effect/paint/babyblue, /turf/simulated/floor/plating, @@ -903,6 +907,31 @@ /obj/item/deck/cah, /turf/simulated/floor/tiled/steel, /area/quartermaster/office) +"aGe" = ( +/obj/structure/table/steel, +/obj/item/pen/red{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/pen{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/machinery/requests_console/preset/security{ + pixel_y = 30 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 9 + }, +/obj/machinery/newscaster{ + pixel_x = -32 + }, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/turf/simulated/floor/tiled/dark, +/area/security/prison/upper) "aGK" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 @@ -927,27 +956,6 @@ "aIk" = ( /turf/simulated/floor/plating, /area/maintenance/research/lower) -"aIo" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 10 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 10 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/red/bordercorner2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/tiled/steel, -/area/security/security_cell_hallway) "aIs" = ( /obj/machinery/atmospherics/pipe/simple/visible/supply{ dir = 8 @@ -1210,7 +1218,7 @@ dir = 4 }, /turf/simulated/floor/tiled/steel, -/area/security/security_cell_hallway) +/area/security/prison) "aVh" = ( /obj/structure/table/wooden_reinforced, /obj/machinery/photocopier/faxmachine{ @@ -1227,13 +1235,6 @@ "aVp" = ( /turf/simulated/floor/wood, /area/crew_quarters/game_room) -"aVt" = ( -/obj/structure/cryofeed{ - dir = 4 - }, -/obj/effect/floor_decal/rust, -/turf/simulated/floor/tiled/steel, -/area/security/prison) "aWl" = ( /turf/simulated/open/lythios43c/indoors, /area/rift/surfacebase/outside/outside1) @@ -1496,13 +1497,6 @@ }, /turf/simulated/floor/wood, /area/rnd/outpost/xenobiology/outpost_office) -"bfj" = ( -/obj/structure/table/steel, -/obj/item/storage/box/handcuffs, -/obj/item/storage/single_use/med_pouch/trauma, -/obj/item/storage/single_use/med_pouch/trauma, -/turf/simulated/floor/tiled/red, -/area/security/security_cell_hallway) "bfm" = ( /obj/structure/curtain/black, /turf/simulated/floor/outdoors/safeice/lythios43c/indoors, @@ -1762,14 +1756,6 @@ /obj/item/flashlight/lamp, /turf/simulated/floor/carpet/bcarpet, /area/library) -"bmG" = ( -/obj/effect/floor_decal/rust, -/obj/machinery/portable_atmospherics/hydroponics, -/obj/machinery/light/small{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/security/prison) "bmQ" = ( /obj/structure/railing{ dir = 8 @@ -1779,13 +1765,13 @@ }, /turf/simulated/floor/plating, /area/maintenance/starboard) -"bmT" = ( -/obj/machinery/air_alarm{ - desc = " "; - pixel_y = 24 +"bmR" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/red/border, +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 1 }, -/obj/effect/floor_decal/rust, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/steel, /area/security/prison) "bny" = ( /turf/simulated/floor/wood, @@ -2277,6 +2263,24 @@ /obj/structure/railing, /turf/simulated/floor/plating, /area/quartermaster/hallway) +"bBB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/bordercorner{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/security/prison/upper) "bBD" = ( /obj/structure/railing{ dir = 4 @@ -2304,6 +2308,18 @@ /obj/structure/flora/ausbushes/grassybush, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/rift/station/fighter_bay/transport_tunnel_garage_maint) +"bDe" = ( +/obj/structure/filingcabinet/chestdrawer{ + pixel_y = 12 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/security/prison/upper) "bDq" = ( /obj/machinery/light/small{ dir = 4 @@ -2348,23 +2364,6 @@ /obj/structure/table/bench/wooden, /turf/simulated/floor/wood, /area/rift/station/public_garden) -"bGu" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/junction{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/steel, -/area/security/security_cell_hallway) "bGX" = ( /obj/structure/closet/secure_closet/personal/patient, /obj/machinery/light{ @@ -2412,6 +2411,12 @@ /obj/item/barcodescanner, /turf/simulated/floor/carpet, /area/library/study) +"bIy" = ( +/obj/structure/railing/grey{ + dir = 4 + }, +/turf/simulated/open, +/area/security/prison/upper) "bIL" = ( /obj/structure/catwalk, /obj/structure/disposalpipe/segment, @@ -2422,6 +2427,9 @@ }, /turf/simulated/floor/plating, /area/maintenance/starboard) +"bKl" = ( +/turf/simulated/floor/tiled/monotile, +/area/security/prison/upper) "bKE" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 @@ -2612,28 +2620,20 @@ }, /turf/simulated/floor/tiled/white, /area/rift/trade_shop) +"bPj" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 6 + }, +/turf/simulated/floor/tiled/dark, +/area/security/prison/upper) "bPE" = ( /obj/structure/table/woodentable, /obj/item/flashlight/lantern, /turf/simulated/floor/snow, /area/rift/surfacebase/outside/outside1) -"bPJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/floor/tiled/monotile, -/area/security/security_cell_hallway) "bQq" = ( /turf/simulated/wall/r_wall/prepainted, /area/rift/station/fighter_bay/transport_tunnel_garage_maint) -"bQs" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/darkred, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/security/security_cell_hallway) "bQz" = ( /obj/structure/stairs/spawner/east, /turf/simulated/floor/tiled/steel, @@ -2663,6 +2663,22 @@ "bRs" = ( /turf/simulated/wall/r_wall/prepainted, /area/rift/surfaceeva/aa/surface_south) +"bRw" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/bordercorner{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals5, +/turf/simulated/floor/tiled/steel, +/area/security/prison/upper) "bRY" = ( /obj/structure/table/woodentable, /obj/random/plushie, @@ -3022,10 +3038,12 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance/common, -/obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/security/lower) "ccP" = ( @@ -3074,8 +3092,6 @@ /turf/simulated/floor/grass, /area/hallway/primary/surfaceone) "cdW" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, /turf/simulated/floor/plating, /area/lawoffice) @@ -3259,9 +3275,7 @@ /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_main) "clK" = ( -/obj/structure/grille, /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, -/obj/machinery/door/firedoor/glass, /obj/effect/paint/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/qm) @@ -3381,14 +3395,16 @@ }, /turf/simulated/floor/tiled/monowhite, /area/medical/psych_ward) -"coC" = ( -/obj/structure/bed/padded, -/turf/simulated/floor/tiled/dark, -/area/maintenance/security/lower) "coV" = ( /obj/structure/filingcabinet/chestdrawer, /turf/simulated/floor/carpet, /area/security/detectives_office) +"cpb" = ( +/obj/machinery/camera/network/security{ + dir = 8 + }, +/turf/simulated/open, +/area/security/prison/upper) "cpA" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -3496,7 +3512,6 @@ /turf/simulated/floor/carpet/blucarpet, /area/lawoffice) "ctO" = ( -/obj/machinery/door/firedoor/glass, /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, /obj/effect/paint/babyblue, /turf/simulated/floor/plating, @@ -3508,6 +3523,18 @@ }, /turf/simulated/floor/plating, /area/engineering/engine_eva) +"cvf" = ( +/obj/structure/cryofeed{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 5 + }, +/turf/simulated/floor/tiled/steel, +/area/security/prison/upper) "cvv" = ( /obj/structure/grille, /obj/machinery/door/firedoor/glass, @@ -3554,18 +3581,6 @@ }, /turf/simulated/floor/tiled/steel, /area/rnd/hallway) -"cwk" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 4 - }, -/obj/machinery/camera/network/security{ - dir = 8 - }, -/turf/simulated/floor/tiled/steel, -/area/security/security_cell_hallway) "cwV" = ( /obj/structure/window/reinforced/tinted/frosted{ dir = 1 @@ -3666,16 +3681,15 @@ /turf/simulated/floor/plating, /area/medical/virologymaint) "cyU" = ( -/obj/machinery/light{ - dir = 8; - light_range = 12 - }, /obj/effect/floor_decal/borderfloor{ dir = 8 }, /obj/effect/floor_decal/corner/blue/border{ dir = 8 }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled/steel, /area/rift/trade_shop) "cyY" = ( @@ -3699,7 +3713,6 @@ /turf/simulated/floor/plating, /area/maintenance/starboard) "czx" = ( -/obj/machinery/door/firedoor/glass, /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, /obj/effect/paint/babyblue, /turf/simulated/floor/plating, @@ -3825,18 +3838,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/psych) -"cCK" = ( -/obj/structure/table/steel, -/obj/effect/floor_decal/rust, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/chemical_dispenser/catering/bar_soft, -/obj/item/storage/box/glasses/meta{ - pixel_x = -14 - }, -/turf/simulated/floor/tiled/steel, -/area/security/prison) "cCS" = ( /obj/machinery/door/airlock/glass_external/public{ name = "Public External Airlock" @@ -3891,10 +3892,6 @@ /obj/effect/paint/purplegray, /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_office) -"cFW" = ( -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/security/lower) "cGn" = ( /obj/item/stool/padded, /turf/simulated/floor/wood, @@ -3953,12 +3950,14 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance/sec, -/obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/plating, -/area/security/security_cell_hallway) +/area/security/prison) "cIn" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -4186,6 +4185,23 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rift/surfaceeva) +"cQN" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/red/border, +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/security/prison/upper) "cQP" = ( /obj/machinery/fire_alarm/east_mount, /obj/structure/cable/green{ @@ -4247,6 +4263,16 @@ }, /turf/simulated/floor/wood, /area/lawoffice) +"cSI" = ( +/obj/structure/railing/grey{ + dir = 8 + }, +/obj/structure/railing/grey{ + dir = 1 + }, +/obj/structure/catwalk, +/turf/simulated/open, +/area/security/prison/upper) "cTd" = ( /obj/item/tool/screwdriver, /obj/item/cigbutt, @@ -4312,6 +4338,10 @@ }, /turf/simulated/floor/plating, /area/maintenance/library) +"cVb" = ( +/obj/structure/metal_edge, +/turf/simulated/open, +/area/security/prison/upper) "cVJ" = ( /obj/structure/grille, /obj/structure/foamedmetal, @@ -4764,6 +4794,14 @@ }, /turf/simulated/floor/lino, /area/security/detectives_office) +"dki" = ( +/obj/structure/catwalk, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plating, +/area/maintenance/lowmedbaymaint) "dky" = ( /obj/machinery/door/airlock{ name = "Internal Affairs"; @@ -4944,10 +4982,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/patient_wing) -"dob" = ( -/obj/random/cutout, -/turf/simulated/floor/plating, -/area/maintenance/security/lower) "dog" = ( /obj/structure/table/reinforced, /obj/item/paper_bin{ @@ -5149,6 +5183,15 @@ /obj/machinery/light, /turf/simulated/floor/plating, /area/maintenance/central_heating/surface_one) +"dtA" = ( +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/obj/machinery/turnstile/exit{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/security/prison) "duq" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -5332,13 +5375,6 @@ /obj/effect/floor_decal/corner/pink/border, /turf/simulated/floor/tiled/white, /area/security/forensics) -"dCR" = ( -/obj/effect/floor_decal/rust, -/obj/machinery/light/small{ - dir = 4 - }, -/turf/simulated/floor/tiled/steel, -/area/security/prison) "dCX" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 9 @@ -5976,18 +6012,6 @@ }, /turf/simulated/floor/tiled/steel_dirty, /area/rnd/tankstorage) -"dUX" = ( -/obj/structure/bed, -/obj/effect/floor_decal/rust, -/obj/item/radio/intercom{ - dir = 1; - pixel_y = 24 - }, -/obj/machinery/light/small{ - dir = 4 - }, -/turf/simulated/floor/tiled/red, -/area/prison/solitary) "dVj" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/mauve/border, @@ -6077,6 +6101,18 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/steel, /area/rift/stairwell/primary/surfaceone) +"dWU" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/security/prison) "dXh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -6194,13 +6230,18 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_breakroom) -"eaU" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = 30 +"eaO" = ( +/obj/structure/table/steel, +/obj/effect/floor_decal/borderfloor{ + dir = 1 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/machinery/light{ + dir = 1 }, +/obj/effect/floor_decal/steeldecal/steel_decals5, /turf/simulated/floor/tiled/steel, /area/security/prison) "ebp" = ( @@ -6265,11 +6306,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/white, /area/medical/psych) -"ecn" = ( -/obj/machinery/power/apc/east_mount, -/obj/structure/cable/green, -/turf/simulated/floor/tiled/dark, -/area/security/brig/bathroom) "ecJ" = ( /obj/structure/catwalk, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ @@ -6342,13 +6378,13 @@ }, /turf/simulated/floor/tiled/monowhite, /area/medical/patient_wing) -"ees" = ( -/obj/structure/curtain/black{ - anchored = 1; - icon_state = "open" +"eeH" = ( +/obj/machinery/door/firedoor/glass{ + dir = 8 }, -/turf/simulated/floor/tiled/steel, -/area/security/prison) +/obj/machinery/door/airlock/maintenance/sec, +/turf/simulated/floor/plating, +/area/security/prison/upper) "eeN" = ( /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, @@ -6425,13 +6461,16 @@ /turf/simulated/floor/tiled/dark, /area/medical/recoveryrestroom) "ehd" = ( -/obj/structure/catwalk, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/structure/cable/green{ icon_state = "1-8" }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) "ehf" = ( @@ -6466,9 +6505,6 @@ /obj/item/stamp/internalaffairs, /turf/simulated/floor/carpet/blucarpet, /area/lawoffice) -"eir" = ( -/turf/simulated/floor/plating, -/area/maintenance/research/lower) "eit" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -6508,15 +6544,16 @@ }, /turf/simulated/floor/wood, /area/tether/surfacebase/medical/mentalhealth) -"ejq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "1-2" +"ejz" = ( +/obj/structure/railing/grey, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/red/border, +/obj/effect/floor_decal/spline/plain, +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 1 }, /turf/simulated/floor/tiled/steel, -/area/security/prison) +/area/security/prison/upper) "ekr" = ( /obj/machinery/light/small/emergency, /obj/machinery/atmospherics/pipe/simple/visible/cyan{ @@ -6560,14 +6597,9 @@ /turf/simulated/floor/tiled/steel, /area/quartermaster/foyer) "elP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/steel, -/area/security/security_cell_hallway) +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/monotile, +/area/security/prison) "emq" = ( /obj/item/radio/intercom{ dir = 4; @@ -6604,6 +6636,12 @@ }, /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_hallway) +"emN" = ( +/obj/structure/toilet{ + dir = 4 + }, +/turf/simulated/floor/tiled/monodark, +/area/security/prison/upper) "enu" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -6631,15 +6669,6 @@ /obj/item/stool/padded, /turf/simulated/floor/wood, /area/maintenance/maint_bar) -"eoU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/tiled/steel, -/area/security/prison) "epg" = ( /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 1 @@ -6708,7 +6737,22 @@ /turf/simulated/floor/tiled/steel, /area/quartermaster/delivery) "erN" = ( -/turf/simulated/floor/tiled/steel, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/obj/machinery/turnstile/entry{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, /area/security/prison) "esp" = ( /obj/effect/floor_decal/borderfloor, @@ -6743,13 +6787,6 @@ /obj/map_helper/airlock/sensor/chamber_sensor, /turf/simulated/floor/plating, /area/rift/surfaceeva/airlock/main/secondary) -"esT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/turf/simulated/floor/tiled/steel, -/area/security/security_cell_hallway) "esZ" = ( /turf/simulated/wall/prepainted/cargo, /area/quartermaster/delivery) @@ -6851,31 +6888,6 @@ /obj/item/clothing/mask/smokable/pipe/cobpipe, /turf/simulated/floor/carpet/gaycarpet, /area/tether/surfacebase/funny/clownoffice) -"evU" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 6 - }, -/obj/effect/floor_decal/corner/red/bordercorner2{ - dir = 6 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/steel, -/area/security/security_cell_hallway) "evV" = ( /obj/structure/railing{ dir = 4 @@ -6911,6 +6923,18 @@ /obj/machinery/meter, /turf/simulated/floor/plating, /area/medical/virologymaint) +"exp" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/security/prison) "exH" = ( /obj/structure/flora/ausbushes/palebush, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume, @@ -6987,6 +7011,24 @@ /obj/item/surgical/hemostat, /turf/simulated/floor/wood/broken, /area/maintenance/lowmedbaymaint) +"eBk" = ( +/obj/structure/railing/grey{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 8 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/security/prison/upper) "eBn" = ( /obj/machinery/portable_atmospherics/canister{ name = "sample overflow canister" @@ -7083,6 +7125,20 @@ }, /turf/simulated/floor/tiled/monotile, /area/quartermaster/foyer) +"eEY" = ( +/obj/effect/floor_decal/industrial/warning/full, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing, +/turf/simulated/floor/plating, +/area/maintenance/library) "eFp" = ( /turf/simulated/wall/prepainted, /area/maintenance/engineering/pumpstation) @@ -7100,16 +7156,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/quartermaster/garage) -"eFH" = ( -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/steel, -/area/security/security_cell_hallway) "eFL" = ( /obj/structure/closet/hydrant{ dir = 8; @@ -7216,6 +7262,18 @@ }, /turf/simulated/floor/water/deep/indoors, /area/rift/station/public_garden) +"eIt" = ( +/obj/machinery/cryopod{ + dir = 2 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/security/prison/upper) "eIC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -7332,7 +7390,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/firedoor/glass, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/plating, /area/security/detectives_office) "eNx" = ( @@ -7417,6 +7477,17 @@ }, /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) +"eTk" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/red/border, +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 1 + }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/security/prison) "eTN" = ( /obj/machinery/door/airlock/maintenance/medical{ name = "Medical Maintenance Access"; @@ -7487,6 +7558,12 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_main) +"eWs" = ( +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/turf/simulated/floor/plating, +/area/maintenance/lowmedbaymaint) "eWC" = ( /obj/machinery/door/airlock/engineering{ name = "Surface Services Substation"; @@ -7520,9 +7597,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/virologyisolation) -"eXK" = ( -/turf/simulated/floor/plating, -/area/maintenance/research/lower) "eXL" = ( /obj/machinery/washing_machine, /obj/machinery/power/apc/east_mount, @@ -7554,7 +7628,7 @@ "eZl" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/monotile, -/area/security/security_cell_hallway) +/area/security/prison) "eZK" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -7571,11 +7645,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_hallway) -"fae" = ( -/obj/machinery/cryopod, -/obj/effect/floor_decal/rust, -/turf/simulated/floor/plating, -/area/security/prison) "fam" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -7588,14 +7657,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_hallway) -"fav" = ( -/obj/structure/closet/secure_closet/brig, -/obj/effect/floor_decal/industrial/outline/red, -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/tiled/red, -/area/security/security_cell_hallway) "faB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -7638,20 +7699,6 @@ /obj/structure/sink/puddle, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/rift/station/fighter_bay/transport_tunnel_garage_maint) -"fcI" = ( -/obj/machinery/door/airlock/security{ - name = "Confinement Storage"; - req_one_access = list(2) - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/steel, -/area/security/security_cell_hallway) "fdn" = ( /obj/machinery/papershredder, /turf/simulated/floor/wood, @@ -7686,6 +7733,12 @@ }, /turf/simulated/floor/outdoors/snow/lythios43c, /area/rift/surfacebase/outside/outside1) +"fed" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/open, +/area/security/prison/upper) "feB" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 8 @@ -7701,12 +7754,6 @@ }, /turf/simulated/floor/tiled/steel, /area/security/checkpoint) -"feR" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 4 - }, -/turf/simulated/floor/tiled/steel, -/area/security/prison) "ffb" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 @@ -7832,11 +7879,22 @@ /turf/simulated/floor/tiled/white, /area/medical/psych) "flS" = ( -/obj/machinery/door/firedoor/glass, /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, /obj/effect/paint/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/mentalhealth) +"flT" = ( +/obj/machinery/cryopod{ + dir = 2 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/security/prison/upper) "fmu" = ( /obj/machinery/bookbinder, /obj/machinery/light/small{ @@ -8060,16 +8118,6 @@ /obj/effect/floor_decal/corner/brown/bordercorner2, /turf/simulated/floor/tiled/steel, /area/quartermaster/delivery) -"ftr" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/outline/red, -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/tiled/red, -/area/security/security_cell_hallway) "ftF" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -8193,17 +8241,7 @@ }, /turf/simulated/open/lythios43c, /area/rift/surfacebase/outside/outside1) -"fxo" = ( -/obj/machinery/door/airlock/glass/security{ - name = "Confinement Processing"; - req_access = list(2) - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/steel, -/area/security/security_cell_hallway) "fxR" = ( -/obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/shutters{ dir = 8; id = "warehouse"; @@ -8512,13 +8550,6 @@ /obj/machinery/computer/arcade/battle, /turf/simulated/floor/tiled/white, /area/medical/psych) -"fJY" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/obj/effect/floor_decal/rust, -/turf/simulated/floor/plating, -/area/security/prison) "fKW" = ( /obj/effect/floor_decal/borderfloorwhite/corner{ dir = 8 @@ -8576,12 +8607,6 @@ }, /turf/simulated/floor/wood, /area/rift/surfacebase/outside/outside1) -"fLU" = ( -/turf/simulated/floor/plating, -/area/maintenance/research/lower) -"fMu" = ( -/turf/simulated/floor/plating, -/area/maintenance/research/lower) "fMy" = ( /obj/structure/table/woodentable, /obj/item/book/manual/standard_operating_procedure, @@ -8789,6 +8814,11 @@ }, /turf/simulated/floor/tiled/monowhite, /area/medical/patient_a) +"fRT" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/maintenance/sec, +/turf/simulated/floor/plating, +/area/security/prison/upper) "fSj" = ( /obj/structure/symbol/sa, /turf/simulated/wall/prepainted, @@ -8835,16 +8865,6 @@ "fUY" = ( /turf/simulated/wall/r_wall/prepainted/medical, /area/medical/medbay_emt_bay) -"fVb" = ( -/obj/machinery/cryopod, -/obj/machinery/camera/network/security{ - dir = 4 - }, -/obj/machinery/computer/cryopod{ - pixel_x = -32 - }, -/turf/simulated/floor/tiled/red, -/area/prison/solitary) "fVl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -9059,14 +9079,41 @@ /turf/simulated/floor/tiled/steel, /area/rift/station/public_garden) "gcn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals5, /turf/simulated/floor/tiled/steel, -/area/security/security_cell_hallway) +/area/security/prison) "gcP" = ( /obj/structure/table/woodentable, /obj/item/flame/candle, /turf/simulated/floor/wood, /area/tether/surfacebase/entertainment) +"gcW" = ( +/turf/simulated/open, +/area/security/prison/upper) "gdq" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 10 @@ -9089,6 +9136,12 @@ }, /turf/simulated/floor/outdoors/beach/sand/desert/indoors, /area/rift/station/public_garden) +"gex" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/open, +/area/security/prison/upper) "geV" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 4 @@ -9261,14 +9314,6 @@ }, /turf/simulated/floor/outdoors/safeice/lythios43c/indoors, /area/medical/virologytransitwest) -"glj" = ( -/obj/structure/curtain/black{ - anchored = 1; - icon_state = "open" - }, -/obj/effect/floor_decal/rust, -/turf/simulated/floor/tiled/steel, -/area/security/prison) "glF" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -9331,6 +9376,18 @@ }, /turf/simulated/floor/tiled/techmaint, /area/rnd/outpost/xenobiology/outpost_storage) +"goO" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 9 + }, +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/security/prison) "gpn" = ( /obj/structure/window/reinforced, /turf/simulated/floor/wood, @@ -9504,6 +9561,12 @@ }, /turf/simulated/floor/tiled/steel, /area/rnd/hallway) +"gur" = ( +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor/plating, +/area/maintenance/lowmedbaymaint) "guw" = ( /obj/structure/bed/padded, /obj/item/bedsheet/cosmos, @@ -9537,12 +9600,6 @@ /obj/structure/table, /turf/simulated/floor/wood, /area/maintenance/maint_bar) -"gvU" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = 30 - }, -/turf/simulated/floor/tiled/steel, -/area/security/prison) "gvX" = ( /obj/item/stool/padded, /obj/machinery/camera/network/civilian, @@ -9633,13 +9690,6 @@ }, /turf/simulated/floor/outdoors/snow/lythios43c, /area/rift/surfacebase/outside/outside1) -"gxu" = ( -/obj/machinery/vending/hydroseeds, -/obj/machinery/camera/network/security{ - dir = 10 - }, -/turf/simulated/floor/tiled/steel, -/area/security/prison) "gxR" = ( /turf/simulated/floor/tiled/steel, /area/quartermaster/hallway) @@ -9650,6 +9700,17 @@ }, /turf/simulated/floor/plating, /area/maintenance/cargo) +"gyx" = ( +/obj/structure/catwalk, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/maintenance/lowmedbaymaint) "gzd" = ( /turf/simulated/floor/outdoors/safeice/lythios43c/indoors, /area/rift/surfacebase/outside/outside1) @@ -9668,13 +9729,6 @@ }, /turf/simulated/floor/carpet/blue, /area/tether/surfacebase/medical/mentalhealth) -"gAz" = ( -/obj/structure/cryofeed{ - dir = 4 - }, -/obj/effect/floor_decal/rust, -/turf/simulated/floor/tiled/red, -/area/prison/solitary) "gBQ" = ( /obj/structure/railing, /obj/structure/railing{ @@ -9731,33 +9785,17 @@ }, /turf/simulated/floor/tiled/steel, /area/rnd/hallway) -"gFi" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 9 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 9 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 1 - }, -/obj/effect/floor_decal/corner/red/bordercorner2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk, -/turf/simulated/floor/tiled/steel, -/area/security/security_cell_hallway) "gFo" = ( /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/plating, /area/maintenance/research/lower) +"gFS" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1; + power_rating = 45000 + }, +/turf/simulated/floor/tiled/monotile, +/area/security/prison/upper) "gGj" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -9779,6 +9817,27 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfaceone) +"gGC" = ( +/obj/structure/railing/grey{ + dir = 4 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 4 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/security/prison/upper) "gGT" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/effect/floor_decal/spline/plain, @@ -9947,6 +10006,9 @@ /obj/machinery/light/small{ dir = 4 }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) "gKJ" = ( @@ -9956,26 +10018,14 @@ /obj/effect/floor_decal/corner/red/border{ dir = 5 }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 4 - }, -/obj/effect/floor_decal/corner/red/bordercorner2{ - dir = 4 - }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 5 }, /obj/effect/floor_decal/corner/red/bordercorner2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /turf/simulated/floor/tiled/steel, -/area/security/security_cell_hallway) +/area/security/prison) "gLn" = ( /obj/structure/table/standard, /obj/item/storage/firstaid/adv{ @@ -10145,6 +10195,24 @@ }, /turf/simulated/floor/carpet, /area/library/study) +"gQC" = ( +/obj/structure/railing/grey{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 4 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/security/prison/upper) "gQQ" = ( /obj/structure/flora/ausbushes/reedbush, /obj/structure/railing{ @@ -10238,13 +10306,6 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) -"gSP" = ( -/obj/structure/table/steel, -/obj/item/duct_tape_roll, -/obj/item/clothing/mask/muzzle, -/obj/item/clothing/glasses/sunglasses/blindfold, -/turf/simulated/floor/tiled/dark, -/area/maintenance/security/lower) "gTk" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -10695,6 +10756,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) "hdw" = ( @@ -10709,10 +10771,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/surface_one) -"hdy" = ( -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/security/prison) "hdL" = ( /obj/structure/table/alien/blue{ desc = "Is this imported?"; @@ -10759,6 +10817,17 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/white, /area/crew_quarters/medbreak) +"hek" = ( +/obj/structure/reagent_dispensers/water_cooler/full, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals5, +/turf/simulated/floor/tiled/steel, +/area/security/prison/upper) "heB" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/effect/floor_decal/spline/plain{ @@ -10847,10 +10916,6 @@ /obj/item/folder/blue, /turf/simulated/floor/tiled/techfloor, /area/server) -"hhv" = ( -/obj/item/cigbutt/cigarbutt, -/turf/simulated/floor/tiled/dark, -/area/maintenance/security/lower) "hhC" = ( /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/wood, @@ -10885,10 +10950,6 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) -"him" = ( -/obj/random/trash_pile, -/turf/simulated/floor/tiled/steel, -/area/security/prison) "hip" = ( /obj/machinery/air_alarm{ desc = " "; @@ -10956,6 +11017,16 @@ }, /turf/simulated/floor/tiled/monowhite, /area/medical/virologytransitwest) +"hiV" = ( +/obj/machinery/button/remote/blast_door{ + id = "cell_lock_3"; + name = "Cell 3 Lock"; + pixel_x = 7; + pixel_y = 30; + req_access = list(1,2,4,38) + }, +/turf/simulated/floor/tiled/monodark, +/area/security/prison/upper) "hiW" = ( /obj/machinery/camera/network/civilian{ dir = 1 @@ -11098,19 +11169,6 @@ /obj/vehicle/ridden/quadbike/random, /turf/simulated/floor/tiled/steel_ridged, /area/quartermaster/garage) -"hmF" = ( -/obj/effect/floor_decal/rust, -/obj/structure/closet/crate, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/obj/random/contraband, -/obj/random/maintenance/cargo, -/turf/simulated/floor/plating, -/area/maintenance/security/lower) -"hmK" = ( -/obj/structure/symbol/sa, -/turf/simulated/wall/r_wall/prepainted/security, -/area/security/security_cell_hallway) "hnh" = ( /obj/structure/table/wooden_reinforced, /obj/machinery/ai_status_display{ @@ -11271,6 +11329,10 @@ }, /turf/simulated/floor/tiled/steel, /area/rnd/testingroom) +"hsB" = ( +/obj/machinery/light, +/turf/simulated/open, +/area/security/prison/upper) "htj" = ( /obj/machinery/camera/network/medbay{ dir = 8 @@ -11376,6 +11438,18 @@ }, /turf/simulated/floor/tiled/steel, /area/rnd/hallway) +"hyP" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 10 + }, +/obj/machinery/computer/prisoner{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/security/prison/upper) "hzB" = ( /obj/structure/filingcabinet/medical{ desc = "A large cabinet with hard copy medical records."; @@ -11384,19 +11458,15 @@ /turf/simulated/floor/carpet/blue, /area/tether/surfacebase/medical/mentalhealth) "hzO" = ( -/obj/machinery/shower{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 9 +/obj/machinery/turnstile/exit{ + dir = 8 }, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 10 +/obj/structure/curtain/open/shower/security, +/obj/machinery/door/firedoor/glass{ + dir = 8 }, -/obj/item/soap/nanotrasen, -/obj/effect/floor_decal/rust, -/turf/simulated/floor/tiled/dark, -/area/security/brig/bathroom) +/turf/simulated/floor/tiled/monodark, +/area/security/prison/upper) "hzW" = ( /obj/effect/floor_decal/borderfloor{ dir = 5 @@ -11479,12 +11549,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/cargo) -"hCE" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/tiled/steel, -/area/security/prison) "hCL" = ( /obj/structure/catwalk, /obj/structure/disposalpipe/segment, @@ -11578,7 +11642,7 @@ /area/quartermaster/office) "hFE" = ( /turf/simulated/wall/r_wall/prepainted/security, -/area/security/security_cell_hallway) +/area/security/prison) "hFH" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 9 @@ -11602,6 +11666,17 @@ /obj/structure/filingcabinet, /turf/simulated/floor/tiled, /area/rnd/xenoarch_storage) +"hGe" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/red/border, +/obj/machinery/camera/network/security{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/security/prison) "hGg" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/maintenance/sec, @@ -11929,6 +12004,24 @@ /obj/item/storage/toolbox/emergency, /turf/simulated/floor/plating, /area/maintenance/research/lower) +"hPd" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/red/bordercorner{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/security/prison/upper) "hPe" = ( /turf/simulated/floor/tiled/steel_dirty, /area/maintenance/maint_bar) @@ -11962,10 +12055,6 @@ }, /turf/simulated/floor/wood, /area/tether/surfacebase/entertainment) -"hQd" = ( -/obj/effect/floor_decal/rust, -/turf/simulated/floor/tiled/dark, -/area/maintenance/security/lower) "hQy" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 4 @@ -12065,25 +12154,6 @@ /obj/machinery/meter, /turf/simulated/floor/tiled/steel, /area/rnd/xenobiology/xenoflora/lab_atmos) -"hTu" = ( -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/structure/catwalk, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/maintenance/security/lower) "hTB" = ( /obj/structure/bed/chair/comfy/red{ dir = 8 @@ -12125,6 +12195,22 @@ /obj/machinery/seed_extractor, /turf/simulated/floor/tiled/steel, /area/rift/station/public_garden) +"hVB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8; + power_rating = 45000 + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/monodark, +/area/security/prison/upper) "hVL" = ( /obj/machinery/vending/nifsoft_shop, /obj/machinery/light, @@ -12255,16 +12341,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay_emt_bay) -"hYf" = ( -/obj/structure/catwalk, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/maintenance/lowmedbaymaint) "hYm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -12334,11 +12410,6 @@ /obj/structure/railing, /turf/simulated/floor/plating, /area/maintenance/research/lower) -"iaf" = ( -/obj/structure/table/steel, -/obj/effect/floor_decal/rust, -/turf/simulated/floor/plating, -/area/security/prison) "ial" = ( /obj/structure/table/standard, /obj/item/storage/toolbox/electrical{ @@ -12407,6 +12478,14 @@ }, /turf/simulated/floor/plating, /area/maintenance/evahallway) +"ibA" = ( +/obj/effect/floor_decal/borderfloor/corner, +/obj/effect/floor_decal/corner/red/bordercorner, +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/security/prison/upper) "ibI" = ( /obj/structure/curtain/open/shower, /obj/machinery/shower, @@ -12450,19 +12529,6 @@ }, /turf/simulated/floor/tiled/monowhite, /area/medical/patient_wing) -"idS" = ( -/obj/machinery/shower{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 9 - }, -/obj/effect/floor_decal/rust, -/turf/simulated/floor/tiled/dark, -/area/security/brig/bathroom) "ier" = ( /obj/structure/bed/chair/sofa/black/right{ dir = 8 @@ -12858,14 +12924,6 @@ }, /turf/simulated/floor/tiled/steel, /area/janitor) -"irQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/steel, -/area/security/security_cell_hallway) "irV" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/wood, @@ -12927,10 +12985,6 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/civilian_hallway_mid) -"ium" = ( -/obj/machinery/light/small, -/turf/simulated/floor/plating, -/area/maintenance/research/lower) "iuZ" = ( /turf/simulated/floor/outdoors/beach/sand/desert/indoors, /area/rift/station/public_garden) @@ -13011,6 +13065,20 @@ /obj/machinery/camera/network/research/xenobio, /turf/simulated/floor/wood, /area/rnd/outpost/xenobiology/outpost_office) +"iwn" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet{ + pixel_y = 30 + }, +/obj/effect/floor_decal/steeldecal/steel_decals5, +/obj/structure/bed/chair, +/turf/simulated/floor/tiled/steel, +/area/security/prison/upper) "iws" = ( /obj/structure/railing{ dir = 4 @@ -13021,14 +13089,6 @@ }, /turf/simulated/floor/plating, /area/rift/trade_shop) -"iwC" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/red/border, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 - }, -/turf/simulated/floor/tiled/steel, -/area/security/security_cell_hallway) "iwH" = ( /obj/structure/bookcase{ name = "bookcase (Religious)" @@ -13103,11 +13163,6 @@ /obj/item/flame/candle/candelabra/everburn, /turf/simulated/floor/carpet, /area/maintenance/research/lower) -"izR" = ( -/obj/effect/floor_decal/rust, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/steel, -/area/security/prison) "izU" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -13300,21 +13355,6 @@ /obj/machinery/door/airlock/maintenance/command, /turf/simulated/floor/plating, /area/rift/surfaceeva/aa/surface_south) -"iEy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/steel, -/area/security/security_cell_hallway) "iEH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -13358,6 +13398,18 @@ /obj/item/bedsheet/mimedouble, /turf/simulated/floor/carpet/bcarpet, /area/tether/surfacebase/funny/mimeoffice) +"iFA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/effect/floor_decal/industrial/loading{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/security/prison/upper) "iFF" = ( /obj/machinery/holopad, /obj/structure/disposalpipe/segment{ @@ -13372,6 +13424,17 @@ /obj/random/trash_pile, /turf/simulated/floor/plating, /area/maintenance/security/lower) +"iFM" = ( +/obj/machinery/door/airlock/glass/security{ + id_tag = "cell_lock_3"; + name = "Cell 3"; + req_one_access = null + }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/turf/simulated/floor/tiled/monodark, +/area/security/prison/upper) "iFN" = ( /turf/simulated/floor/outdoors/snow/lythios43c, /area/rift/surfacebase/outside/outside1) @@ -13424,12 +13487,6 @@ /obj/item/flashlight/lamp, /turf/simulated/floor/wood/broken, /area/maintenance/library) -"iHk" = ( -/obj/machinery/vending/sovietsoda{ - name = "Water Dispenser" - }, -/turf/simulated/floor/tiled/steel, -/area/security/prison) "iHI" = ( /obj/machinery/door/airlock/multi_tile/glass{ id_tag = "PsycheFoyer"; @@ -13472,6 +13529,14 @@ /obj/item/key/quadbike, /turf/simulated/floor/tiled/steel_grid, /area/quartermaster/garage) +"iIN" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/maintenance/lowmedbaymaint) "iJb" = ( /obj/structure/table/reinforced, /obj/item/pen/red{ @@ -13659,6 +13724,15 @@ /obj/effect/floor_decal/corner/beige/border, /turf/simulated/floor/tiled/white, /area/medical/psych_ward) +"iOy" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/security/prison/upper) "iPn" = ( /obj/landmark/spawnpoint/job/assistant, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -13703,19 +13777,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_hallway) -"iQT" = ( -/obj/machinery/door/airlock/glass/security{ - name = "Confinement Processing"; - req_access = list(2) - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/steel, -/area/security/security_cell_hallway) "iRn" = ( /obj/structure/railing{ dir = 1 @@ -13823,8 +13884,18 @@ /turf/simulated/floor/tiled/white, /area/medical/patient_b) "iTF" = ( -/turf/simulated/wall/r_wall/prepainted/security, -/area/security/prison) +/obj/machinery/papershredder, +/obj/machinery/fire_alarm/west_mount{ + pixel_x = -24 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/security/prison/upper) "iUb" = ( /turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_autopsy) @@ -13854,6 +13925,25 @@ "iUi" = ( /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_decon) +"iUq" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/red/border, +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor/corner2, +/obj/effect/floor_decal/corner/red/bordercorner2, +/turf/simulated/floor/tiled/steel, +/area/security/prison/upper) "iVp" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -13878,9 +13968,6 @@ }, /turf/simulated/floor/tiled, /area/medical/virologytransiteast) -"iVw" = ( -/turf/simulated/floor/wood/broken, -/area/maintenance/lowmedbaymaint) "iVN" = ( /obj/machinery/light{ dir = 1 @@ -13888,12 +13975,6 @@ /obj/structure/table/bench/wooden, /turf/simulated/floor/tiled/steel, /area/rift/station/public_garden) -"iWv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/steel, -/area/security/prison) "iWw" = ( /obj/structure/disposalpipe/segment, /obj/machinery/light/small{ @@ -13934,6 +14015,19 @@ }, /turf/simulated/floor/tiled/steel, /area/rift/stairwell/primary/surfaceone) +"iXO" = ( +/obj/structure/railing/grey{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals5, +/turf/simulated/floor/tiled/steel, +/area/security/prison/upper) "iYd" = ( /obj/machinery/atmospherics/pipe/manifold/visible/black{ dir = 1 @@ -14083,17 +14177,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/patient_wing) -"jdg" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/steel, -/area/security/security_cell_hallway) "jdt" = ( /obj/structure/sign/warning/caution, /turf/simulated/wall/prepainted, @@ -14284,18 +14367,10 @@ /obj/machinery/light/flamp/noshade, /turf/simulated/floor/plating/lythios43c, /area/rift/surfacebase/outside/outside1) -"jhW" = ( -/turf/simulated/floor/wood, -/area/maintenance/maint_bar) "jiI" = ( /obj/structure/closet/firecloset, /turf/simulated/floor/tiled/techfloor, /area/maintenance/tool_storage) -"jiM" = ( -/obj/effect/floor_decal/rust, -/obj/machinery/camera/network/security, -/turf/simulated/floor/tiled/steel, -/area/security/prison) "jjg" = ( /obj/structure/table/woodentable, /obj/item/book/manual/standard_operating_procedure, @@ -14346,26 +14421,6 @@ "jkh" = ( /turf/simulated/floor/lino, /area/security/detectives_office) -"jkz" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 5 - }, -/obj/effect/floor_decal/corner/red/bordercorner2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/steel, -/area/security/security_cell_hallway) "jkB" = ( /obj/structure/bed/chair/sofa/black/left{ dir = 4 @@ -14404,9 +14459,6 @@ /obj/structure/sign/department/xenolab, /turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_decon) -"jlF" = ( -/turf/simulated/floor/plating, -/area/maintenance/maint_bar) "jmJ" = ( /obj/item/radio/intercom{ dir = 4; @@ -14514,23 +14566,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/rift/stairwell/primary/surfaceone) -"jrX" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 8 - }, -/obj/effect/floor_decal/corner/red{ - dir = 6 - }, -/obj/machinery/door/airlock/glass/security/polarized{ - id_tint = "solitary"; - name = "Solitary Confinement"; - req_one_access = list(2) - }, -/turf/simulated/floor/tiled/dark, -/area/prison/solitary) "jsL" = ( /obj/machinery/power/apc/west_mount, /obj/structure/table/woodentable, @@ -14636,16 +14671,6 @@ }, /turf/simulated/floor/tiled/steel, /area/quartermaster/delivery) -"jxk" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12 - }, -/obj/structure/mirror{ - pixel_x = -26 - }, -/turf/simulated/floor/tiled/dark, -/area/security/brig/bathroom) "jxt" = ( /obj/structure/sign/mining{ pixel_y = 32 @@ -14694,6 +14719,22 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/maintenance/starboard) +"jya" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals5, +/turf/simulated/floor/tiled/steel, +/area/security/prison/upper) "jyG" = ( /obj/effect/floor_decal/corner/beige/full{ dir = 8 @@ -14707,10 +14748,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_breakroom) -"jzl" = ( -/obj/effect/floor_decal/industrial/outline, -/turf/simulated/floor/tiled/steel_ridged, -/area/quartermaster/garage) "jzo" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/effect/paint/purplegray, @@ -14772,14 +14809,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/security/lower) -"jBw" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/steel, -/area/security/security_cell_hallway) "jBE" = ( /obj/structure/toilet{ desc = "A cheap knockoff of the HT-42069 HEPHAESTUS 'Tactical' Toilet, it's durasteel applique armor poorly mimicked with slabs of porcelain, the flush buttons magnesium. It's a nice toilet, but the engravings serve no tactical advantage whatsoever."; @@ -15012,11 +15041,29 @@ /turf/simulated/floor/tiled/techfloor, /area/server) "jJS" = ( -/obj/structure/cable/green{ - icon_state = "1-8" +/obj/effect/floor_decal/borderfloor{ + dir = 8 }, -/turf/simulated/floor/plating, -/area/maintenance/lowmedbaymaint) +/obj/effect/floor_decal/corner/red/border{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/holoposter{ + pixel_x = -32 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 8 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/security/prison) "jJW" = ( /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ dir = 10 @@ -15520,6 +15567,21 @@ }, /turf/simulated/floor/tiled/steel, /area/rnd/xenoarch_storage) +"kbG" = ( +/obj/structure/bed/chair/sofa/beige/left{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/security/prison/upper) "kcb" = ( /obj/structure/railing{ dir = 4 @@ -15713,12 +15775,6 @@ }, /turf/simulated/floor/plating, /area/engineering/engine_eva) -"khf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/monotile, -/area/security/security_cell_hallway) "khg" = ( /obj/structure/catwalk, /obj/structure/disposalpipe/segment{ @@ -15841,7 +15897,6 @@ /turf/simulated/floor/tiled/steel, /area/rnd/xenobiology/xenoflora/lab_atmos) "kko" = ( -/obj/machinery/door/firedoor/glass, /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, /obj/effect/paint/babyblue, /turf/simulated/floor/plating, @@ -15854,6 +15909,9 @@ /obj/structure/cable/green{ icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) "kkQ" = ( @@ -15968,10 +16026,6 @@ /obj/item/instrument/eguitar, /turf/simulated/floor/wood/broken, /area/maintenance/maint_bar) -"koh" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/turf/simulated/floor/tiled/monotile, -/area/security/security_cell_hallway) "koz" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/brown/border, @@ -16133,7 +16187,6 @@ }, /obj/structure/metal_edge, /turf/simulated/floor/plating/lythios43c, -/turf/simulated/floor/outdoors/snow/noblend/lythios43c, /area/rift/surfacebase/outside/outside1) "ktI" = ( /obj/effect/floor_decal/industrial/outline/yellow, @@ -16193,11 +16246,16 @@ /turf/simulated/floor/carpet/sblucarpet, /area/crew_quarters/medbreak) "kwn" = ( -/obj/structure/cable/green{ - icon_state = "2-4" +/obj/machinery/door/airlock/glass/security{ + id_tag = "cell_lock_2"; + name = "Cell 2"; + req_one_access = null }, -/turf/simulated/floor/tiled/steel, -/area/security/prison) +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/turf/simulated/floor/tiled/monodark, +/area/security/prison/upper) "kwz" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 5 @@ -16328,9 +16386,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/janitor) -"kzX" = ( -/turf/simulated/wall/r_wall/prepainted, -/area/maintenance/security/lower) "kAb" = ( /turf/simulated/wall/r_wall/prepainted, /area/rift/trade_shop) @@ -16371,6 +16426,12 @@ }, /turf/simulated/floor/tiled/monowhite, /area/security/forensics) +"kDo" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/monotile, +/area/security/prison/upper) "kDx" = ( /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, /obj/machinery/atmospherics/pipe/simple/visible/supply, @@ -16481,26 +16542,6 @@ /obj/machinery/light_construct/small, /turf/simulated/floor/carpet/turcarpet, /area/maintenance/maint_bar) -"kFR" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/effect/floor_decal/rust, -/obj/structure/closet/emcloset, -/obj/item/clothing/suit/space/emergency, -/obj/item/clothing/suit/space/emergency, -/obj/item/clothing/suit/space/emergency, -/obj/item/clothing/head/helmet/space/emergency, -/obj/item/clothing/head/helmet/space/emergency, -/obj/item/clothing/head/helmet/space/emergency, -/obj/item/tank/oxygen, -/obj/item/tank/oxygen, -/obj/item/tank/oxygen, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/turf/simulated/floor/tiled/steel, -/area/security/prison) "kGM" = ( /obj/structure/closet/crate/hydroponics, /obj/item/reagent_containers/spray/plantbgone, @@ -16898,6 +16939,23 @@ }, /turf/simulated/floor/tiled/steel, /area/rift/station/public_garden) +"kRN" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/security/prison) "kSd" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -16932,8 +16990,11 @@ "kSK" = ( /obj/effect/floor_decal/borderfloor/corner, /obj/effect/floor_decal/corner/red/bordercorner, +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 8 + }, /turf/simulated/floor/tiled/steel, -/area/security/security_cell_hallway) +/area/security/prison) "kSV" = ( /obj/structure/railing{ dir = 8 @@ -16941,7 +17002,6 @@ /turf/simulated/floor/plating, /area/maintenance/engineering/pumpstation) "kTn" = ( -/obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ dir = 4; id = "test_chamber_blast"; @@ -17075,12 +17135,6 @@ }, /turf/simulated/floor/tiled/steel, /area/rift/stairwell/primary/surfaceone) -"kVO" = ( -/obj/structure/table/steel, -/obj/item/reagent_containers/food/drinks/cans/waterbottle, -/obj/machinery/light/small, -/turf/simulated/floor/tiled/steel, -/area/security/prison) "kWq" = ( /turf/simulated/wall/wood/hardwood, /area/tether/surfacebase/entertainment) @@ -17227,6 +17281,19 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, /area/maintenance/research/lower) +"lbY" = ( +/obj/machinery/fire_alarm/north_mount, +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 5 + }, +/obj/machinery/camera/network/security{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/security/prison/upper) "lcb" = ( /obj/machinery/librarycomp, /obj/structure/table/wooden_reinforced, @@ -17306,14 +17373,6 @@ }, /turf/simulated/floor/tiled/steel, /area/rnd/hallway) -"ley" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/structure/table/steel, -/obj/structure/bedsheetbin, -/turf/simulated/floor/tiled/steel, -/area/security/prison) "leM" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /obj/structure/disposalpipe/segment{ @@ -17355,6 +17414,15 @@ }, /turf/simulated/floor/tiled/white, /area/medical/patient_wing) +"lfB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/tiled/monotile, +/area/security/prison) "lfK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -17419,12 +17487,24 @@ /turf/simulated/floor, /area/maintenance/substation/medical) "liA" = ( -/obj/machinery/light/small{ +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/extinguisher_cabinet{ + dir = 4; + pixel_x = -30 + }, +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 4 }, -/obj/effect/floor_decal/rust, -/turf/simulated/floor/plating, -/area/maintenance/lowmedbaymaint) +/turf/simulated/floor/tiled/steel, +/area/security/prison) "liP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -17511,8 +17591,23 @@ /turf/simulated/floor/wood, /area/maintenance/maint_bar) "llC" = ( -/turf/simulated/wall/r_wall/prepainted/security, -/area/prison/solitary) +/obj/structure/railing/grey{ + dir = 1 + }, +/obj/structure/railing/grey{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 5 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 5 + }, +/turf/simulated/floor/tiled/steel, +/area/security/prison/upper) "llZ" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/techfloor, @@ -17729,9 +17824,16 @@ }, /turf/simulated/floor/tiled/steel, /area/quartermaster/hallway) -"luv" = ( -/turf/simulated/open, -/area/security/prison) +"luX" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/machinery/power/apc/east_mount, +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/turf/simulated/floor/tiled/dark, +/area/security/prison/upper) "lvm" = ( /obj/effect/floor_decal/borderfloorwhite/corner{ dir = 4 @@ -17879,10 +17981,15 @@ /obj/structure/table/standard, /turf/simulated/floor/tiled/techfloor/grid, /area/rnd/xenoarch_storage) -"lBS" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/turf/simulated/floor/plating, -/area/security/security_cell_hallway) +"lCd" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/tiled/monotile, +/area/security/prison/upper) "lCg" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, @@ -18021,14 +18128,6 @@ /obj/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_hallway) -"lGQ" = ( -/obj/structure/table/steel, -/obj/item/deck/cards, -/obj/item/radio/intercom{ - pixel_y = -24 - }, -/turf/simulated/floor/tiled/steel, -/area/security/prison) "lHl" = ( /turf/simulated/wall/r_wall/prepainted, /area/medical/virologymaint) @@ -18041,10 +18140,6 @@ }, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/medical/virologyisolation) -"lHI" = ( -/obj/effect/floor_decal/rust, -/turf/simulated/floor/tiled/steel, -/area/security/prison) "lHT" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -18098,6 +18193,12 @@ }, /turf/simulated/floor/tiled/monotile, /area/quartermaster/office) +"lJl" = ( +/obj/effect/floor_decal/industrial/loading{ + dir = 8 + }, +/turf/simulated/floor/tiled/monotile, +/area/security/prison) "lJs" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -18145,9 +18246,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/rift/surfaceeva/aa/surface_north) -"lLp" = ( -/turf/simulated/wall/r_wall/prepainted/security, -/area/security/brig/bathroom) "lLs" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -18268,6 +18366,25 @@ /obj/machinery/vending, /turf/simulated/floor/lino, /area/tether/surfacebase/entertainment/backstage) +"lPp" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/closet/hydrant{ + dir = 4; + pixel_x = -32 + }, +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/security/prison) "lPC" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -18484,14 +18601,6 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/chemistry_lab) -"lXV" = ( -/obj/effect/floor_decal/rust, -/obj/structure/bed/chair, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/steel, -/area/security/prison) "lYg" = ( /obj/structure/symbol/sa, /turf/simulated/wall/prepainted, @@ -18543,17 +18652,6 @@ }, /turf/simulated/floor/plating/lythios43c, /area/engineering/engine_eva) -"maH" = ( -/obj/effect/floor_decal/rust, -/obj/structure/table/steel, -/turf/simulated/floor/plating, -/area/security/prison) -"maP" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/research/lower) "maS" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -18916,50 +19014,6 @@ /obj/structure/table/steel, /turf/simulated/floor/tiled/techfloor, /area/maintenance/library) -"mmi" = ( -/obj/machinery/button/flasher{ - dir = 4; - id = "solitary_f"; - name = "Solitary Flasher"; - pixel_x = 24; - pixel_y = 2; - req_one_access = list(2) - }, -/obj/machinery/button/windowtint{ - id = "solitary"; - name = "airlock tint control"; - pixel_x = 24; - pixel_y = -8 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 5 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 5 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 5 - }, -/obj/effect/floor_decal/corner/red/bordercorner2{ - dir = 4 - }, -/obj/effect/floor_decal/corner/red/bordercorner2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/steel, -/area/security/security_cell_hallway) "mmk" = ( /obj/machinery/door/airlock/maintenance/common, /obj/machinery/door/firedoor/glass, @@ -19335,6 +19389,26 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_breakroom) +"muR" = ( +/obj/machinery/door/airlock/glass/security{ + name = "Prison Overwatch"; + req_access = list(); + req_one_access = list(2,4) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/turf/simulated/floor/tiled/monodark, +/area/security/prison/upper) "muW" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 @@ -19555,7 +19629,6 @@ /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) "mCK" = ( -/obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ dir = 4; id = "test_chamber_blast"; @@ -19577,11 +19650,6 @@ /obj/structure/transit_tube/high_velocity, /turf/simulated/floor/tiled/white, /area/medical/virologytransitwest) -"mDl" = ( -/obj/item/stack/rods, -/obj/item/stack/rods, -/turf/simulated/floor/plating, -/area/maintenance/maint_bar) "mDM" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/structure/disposalpipe/segment{ @@ -19738,6 +19806,15 @@ }, /turf/simulated/floor/tiled/steel, /area/rnd/hallway) +"mIw" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/plating, +/area/maintenance/lowmedbaymaint) "mIB" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 9 @@ -19749,12 +19826,6 @@ /obj/machinery/camera/network/medbay, /turf/simulated/floor/tiled/white, /area/medical/virologyisolation) -"mIY" = ( -/obj/structure/closet/secure_closet/brig, -/obj/effect/floor_decal/industrial/outline/red, -/obj/machinery/light, -/turf/simulated/floor/tiled/red, -/area/security/security_cell_hallway) "mJi" = ( /obj/effect/floor_decal/rust, /obj/structure/catwalk, @@ -19776,13 +19847,6 @@ /obj/machinery/light, /turf/simulated/floor/tiled/steel, /area/rnd/tankstorage) -"mJO" = ( -/obj/structure/table/steel, -/obj/machinery/microwave, -/obj/item/storage/box/donkpockets, -/obj/effect/floor_decal/rust, -/turf/simulated/floor/tiled/steel, -/area/security/prison) "mJU" = ( /obj/structure/bed/chair/office/light{ dir = 8 @@ -19801,30 +19865,19 @@ "mKe" = ( /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_main) -"mKA" = ( -/obj/effect/floor_decal/rust, -/turf/simulated/floor/plating, -/area/maintenance/starboard) "mKQ" = ( -/obj/machinery/light{ - dir = 8; - light_range = 12 - }, /obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/medical/psych) "mLf" = ( /obj/effect/overlay/snow/floor, /turf/simulated/floor/plating/lythios43c, /area/rift/surfacebase/outside/outside1) -"mMk" = ( -/obj/machinery/light/small, -/obj/machinery/portable_atmospherics/hydroponics, -/obj/effect/floor_decal/rust, -/turf/simulated/floor/tiled/steel, -/area/security/prison) "mNj" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -19839,6 +19892,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) "mNo" = ( @@ -20165,7 +20219,7 @@ "mWf" = ( /obj/machinery/holopad, /turf/simulated/floor/tiled/monotile, -/area/security/security_cell_hallway) +/area/security/prison) "mWg" = ( /obj/structure/lattice, /obj/machinery/door/firedoor/glass, @@ -20368,10 +20422,6 @@ }, /turf/simulated/floor/tiled/steel_grid/lythios43c, /area/rift/surfacebase/outside/outside1) -"nbp" = ( -/obj/effect/floor_decal/rust, -/turf/simulated/floor/plating, -/area/maintenance/lowmedbaymaint) "nbI" = ( /obj/structure/catwalk, /obj/effect/floor_decal/rust, @@ -20708,20 +20758,6 @@ /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/grass, /area/medical/psych) -"nmA" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/steel, -/area/security/security_cell_hallway) "nmF" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -21241,6 +21277,16 @@ "nDb" = ( /turf/simulated/floor/tiled/monotile, /area/quartermaster/garage) +"nDc" = ( +/obj/machinery/button/remote/blast_door{ + id = "cell_lock_1"; + name = "Cell 1 Lock"; + pixel_x = 7; + pixel_y = 30; + req_access = list(1,2,4,38) + }, +/turf/simulated/floor/tiled/monodark, +/area/security/prison/upper) "nDl" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 @@ -21288,12 +21334,6 @@ }, /turf/simulated/floor/tiled/steel, /area/quartermaster/hallway) -"nEg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/tiled/monotile, -/area/security/security_cell_hallway) "nEH" = ( /obj/structure/sink/kitchen{ dir = 4; @@ -21324,6 +21364,16 @@ }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/cmo) +"nFg" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/machinery/computer/security{ + dir = 4; + icon_state = "computer" + }, +/turf/simulated/floor/tiled/dark, +/area/security/prison/upper) "nFk" = ( /obj/structure/table/reinforced, /obj/random/toy, @@ -21399,6 +21449,10 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/plating, /area/maintenance/tool_storage) +"nHJ" = ( +/obj/effect/floor_decal/borderfloorblack, +/turf/simulated/floor/tiled/dark, +/area/security/prison/upper) "nHP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/black, @@ -21424,14 +21478,6 @@ /obj/structure/table/hardwoodtable, /turf/simulated/floor/plating, /area/maintenance/starboard) -"nIQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/steel, -/area/security/prison) "nJn" = ( /obj/structure/disposalpipe/junction, /obj/structure/catwalk, @@ -21740,14 +21786,6 @@ /obj/effect/floor_decal/corner/brown/bordercorner2, /turf/simulated/floor/tiled/steel, /area/quartermaster/hallway) -"nRV" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/effect/floor_decal/rust, -/obj/structure/bed/padded, -/turf/simulated/floor/tiled/steel, -/area/security/prison) "nRY" = ( /turf/simulated/floor/tiled/techmaint, /area/rift/surfaceeva/aa/surface_south) @@ -21828,14 +21866,17 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, /obj/structure/cable/green{ icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/monotile, -/area/security/security_cell_hallway) +/area/security/prison) "nUJ" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, @@ -21858,21 +21899,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/patient_wing) -"nUS" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/extinguisher_cabinet{ - dir = 4; - pixel_x = -30 - }, -/turf/simulated/floor/tiled/steel, -/area/security/security_cell_hallway) "nUU" = ( /obj/structure/curtain/open/bed, /turf/simulated/floor/wood, @@ -22089,6 +22115,21 @@ }, /turf/simulated/floor/tiled/white, /area/medical/virologytransitwest) +"obG" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/security/prison) "obP" = ( /obj/machinery/button/remote/blast_door{ dir = 1; @@ -22371,18 +22412,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden, /turf/simulated/floor/tiled/steel_grid, /area/rift/surfaceeva/airlock/main/secondary) -"oiL" = ( -/obj/machinery/flasher{ - id = "solitary_f"; - pixel_x = 26 - }, -/obj/effect/floor_decal/industrial/loading{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/effect/floor_decal/rust, -/turf/simulated/floor/tiled/monotile, -/area/prison/solitary) "oiO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -22445,6 +22474,15 @@ }, /turf/simulated/floor/tiled/steel, /area/quartermaster/office) +"okr" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/maintenance/lowmedbaymaint) "okx" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -22700,10 +22738,41 @@ "otM" = ( /turf/simulated/floor/tiled/monotile, /area/hallway/primary/surfaceone) +"oux" = ( +/obj/effect/floor_decal/borderfloor/corner{ + dir = 8 + }, +/obj/effect/floor_decal/corner/red/bordercorner{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled/monotile, +/area/security/prison/upper) "ouF" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/monotile, /area/rnd/xenobiology/xenoflora) +"ouI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/red/bordercorner{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals5, +/turf/simulated/floor/tiled/steel, +/area/security/prison/upper) "ouJ" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1; @@ -22776,15 +22845,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/quartermaster/office) -"oxY" = ( -/obj/effect/floor_decal/rust, -/obj/structure/table/rack, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/obj/random/contraband, -/obj/random/maintenance/cargo, -/turf/simulated/floor/plating, -/area/maintenance/security/lower) "oyt" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/closet/crate/medical, @@ -22818,6 +22878,31 @@ }, /turf/simulated/floor/tiled/techfloor, /area/server) +"ozq" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/security/prison) "ozG" = ( /obj/structure/mirror/long/broke{ pixel_y = -28 @@ -22845,13 +22930,7 @@ }, /turf/simulated/floor/tiled/monotile, /area/medical/virology) -"oBA" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on, -/turf/simulated/floor/tiled/steel, -/area/security/security_cell_hallway) "oBN" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, /obj/effect/paint/darkred, /turf/simulated/floor/plating, @@ -22931,6 +23010,14 @@ }, /turf/simulated/floor/tiled/steel, /area/rift/stairwell/primary/surfaceone) +"oDu" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/holopad, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/monodark, +/area/security/prison/upper) "oDG" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -23008,6 +23095,18 @@ }, /turf/simulated/floor/tiled/techmaint, /area/rift/surfaceeva/aa/surface_north) +"oFc" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/light, +/obj/effect/floor_decal/industrial/loading{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/turf/simulated/floor/tiled/monotile, +/area/security/prison/upper) "oFn" = ( /obj/machinery/door/airlock/multi_tile/glass{ dir = 4 @@ -23047,8 +23146,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/turf/simulated/floor/tiled/steel, -/area/security/security_cell_hallway) +/turf/simulated/floor/tiled/monotile, +/area/security/prison) "oHy" = ( /obj/machinery/fire_alarm/west_mount{ pixel_x = -24 @@ -23158,6 +23257,24 @@ }, /turf/simulated/floor/tiled/steel, /area/quartermaster/office) +"oLW" = ( +/obj/effect/floor_decal/industrial/warning/full, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing, +/obj/structure/cable/green, +/obj/structure/cable/green{ + icon_state = "16-0" + }, +/turf/simulated/floor/plating, +/area/maintenance/lowmedbaymaint) "oMd" = ( /obj/item/suit_cooling_unit, /obj/item/storage/belt/archaeology, @@ -23570,16 +23687,6 @@ }, /turf/simulated/floor/wood, /area/maintenance/research/lower) -"oWz" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 1 - }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/turf/simulated/floor/tiled/steel, -/area/security/security_cell_hallway) "oWA" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 @@ -23656,13 +23763,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/rnd/testingroom) -"oYT" = ( -/obj/structure/bed/chair, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/steel, -/area/security/prison) "oZc" = ( /obj/structure/cable{ icon_state = "4-8" @@ -23728,6 +23828,12 @@ /obj/structure/catwalk, /turf/simulated/floor/lythios43c, /area/rift/surfacebase/outside/outside1) +"paf" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark, +/area/security/prison/upper) "pan" = ( /obj/structure/table/steel_reinforced, /obj/item/storage/toolbox/mechanical{ @@ -23752,12 +23858,6 @@ }, /turf/simulated/floor/tiled, /area/medical/virologypurge) -"pba" = ( -/obj/item/paper_bin, -/obj/structure/table/rack/shelf/steel, -/obj/item/pen, -/turf/simulated/floor/plating, -/area/security/prison) "pbf" = ( /obj/structure/cable/heavyduty{ icon_state = "4-8" @@ -23950,6 +24050,17 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay_emt_bay) +"peQ" = ( +/obj/structure/bed/chair/sofa/beige/right, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals5, +/turf/simulated/floor/tiled/steel, +/area/security/prison/upper) "pfy" = ( /obj/structure/table/rack/steel, /obj/random/maintenance/research, @@ -23973,13 +24084,6 @@ }, /turf/simulated/floor/tiled/steel, /area/quartermaster/hallway) -"pgK" = ( -/obj/effect/floor_decal/rust, -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/turf/simulated/floor/tiled/steel, -/area/security/prison) "phb" = ( /obj/machinery/computer/security/mining{ dir = 1 @@ -24133,18 +24237,6 @@ }, /turf/simulated/open/lythios43c, /area/rift/surfacebase/outside/outside1) -"pma" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/turf/simulated/floor/tiled/steel, -/area/security/security_cell_hallway) "pmA" = ( /obj/structure/table/rack/steel, /obj/random/tool, @@ -24222,6 +24314,9 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfaceone) +"pnT" = ( +/turf/simulated/wall/r_wall/prepainted/security, +/area/security/prison/upper) "poK" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -24257,11 +24352,6 @@ /obj/structure/girder, /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) -"ppO" = ( -/obj/structure/closet/secure_closet/brig, -/obj/effect/floor_decal/industrial/outline/red, -/turf/simulated/floor/tiled/red, -/area/security/security_cell_hallway) "ppX" = ( /obj/structure/table/woodentable, /obj/item/tape_recorder{ @@ -24312,15 +24402,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/rift/surfaceeva/aa/surface_south) -"prD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/tiled/steel, -/area/security/security_cell_hallway) "prO" = ( /obj/structure/undies_wardrobe, /turf/simulated/floor/wood, @@ -24553,6 +24634,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/white, /area/medical/psych) +"pwW" = ( +/obj/structure/table/reinforced, +/obj/item/flashlight/lamp, +/turf/simulated/floor/tiled/monodark, +/area/security/prison/upper) "pxL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -24562,6 +24648,15 @@ }, /turf/simulated/floor/tiled/monotile, /area/rnd/hallway) +"pys" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/monotile, +/area/security/prison/upper) "pyt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/black, @@ -24643,6 +24738,16 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfaceone) +"pAU" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border, +/obj/effect/floor_decal/borderfloor/corner2, +/obj/effect/floor_decal/corner/red/bordercorner2, +/turf/simulated/floor/tiled/steel, +/area/security/prison/upper) "pAV" = ( /obj/structure/extinguisher_cabinet{ pixel_y = 30 @@ -24654,22 +24759,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/steel, /area/rift/trade_shop) -"pBg" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/holoposter{ - pixel_x = -32 - }, -/turf/simulated/floor/tiled/steel, -/area/security/security_cell_hallway) "pBn" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -24705,6 +24794,24 @@ /obj/structure/railing, /turf/simulated/floor/plating, /area/maintenance/starboard) +"pCU" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/security/prison/upper) "pDh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -24885,6 +24992,16 @@ /obj/structure/railing, /turf/simulated/floor/plating, /area/maintenance/cargo) +"pJd" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/airlock/glass/security{ + layer = 2.8; + name = "Visitation" + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/monotile, +/area/security/prison) "pJn" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/structure/flora/ausbushes/genericbush, @@ -25000,12 +25117,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/cargo) -"pNt" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/maintenance/lowmedbaymaint) "pNv" = ( /obj/structure/table/reinforced, /obj/fiftyspawner/rods, @@ -25052,9 +25163,6 @@ }, /turf/simulated/floor/tiled/steel, /area/rnd/hallway) -"pOR" = ( -/turf/simulated/floor/plating, -/area/maintenance/lowmedbaymaint) "pOV" = ( /obj/structure/table/standard, /obj/item/gun/energy/taser/xeno, @@ -25142,6 +25250,19 @@ }, /turf/simulated/floor/lino, /area/tether/surfacebase/entertainment/backstage) +"pRw" = ( +/obj/structure/table/reinforced, +/obj/item/storage/box/cups, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/machinery/camera/network/security, +/obj/effect/floor_decal/steeldecal/steel_decals5, +/turf/simulated/floor/tiled/steel, +/area/security/prison/upper) "pRD" = ( /obj/machinery/lapvend, /obj/effect/floor_decal/borderfloor{ @@ -25254,6 +25375,38 @@ }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/cmo) +"pUI" = ( +/obj/machinery/button/remote/blast_door{ + dir = 4; + id = "cell_lock_1"; + name = "Cell 1 Lock"; + pixel_x = -24; + pixel_y = -8; + req_access = list(1,2,4,38) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 10 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 8 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/security/prison/upper) "pUJ" = ( /obj/machinery/power/pointdefense{ id_tag = "s1south" @@ -25289,13 +25442,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/research/lower) -"pWP" = ( -/obj/structure/toilet{ - pixel_y = 9 - }, -/obj/effect/floor_decal/rust, -/turf/simulated/floor/tiled/dark, -/area/security/brig/bathroom) "pXg" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/light{ @@ -25324,11 +25470,22 @@ "pYJ" = ( /turf/simulated/floor/tiled, /area/medical/virologypurge) +"pYS" = ( +/obj/structure/bed/chair/sofa/beige/corner, +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 5 + }, +/turf/simulated/floor/tiled/steel, +/area/security/prison/upper) "pZn" = ( -/obj/structure/grille, -/obj/structure/foamedmetal, -/turf/simulated/floor/plating, -/area/maintenance/security/lower) +/obj/effect/floor_decal/borderfloorblack{ + dir = 10 + }, +/turf/simulated/floor/tiled/dark, +/area/security/prison/upper) "qaB" = ( /obj/effect/floor_decal/rust, /obj/structure/cable/green{ @@ -25380,15 +25537,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel, /area/rnd/xenobiology/xenoflora) -"qcH" = ( -/obj/machinery/door/airlock{ - name = "Bathroom" - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/dark, -/area/security/brig/bathroom) "qcL" = ( /obj/machinery/light_switch{ dir = 1; @@ -25540,13 +25688,28 @@ }, /turf/simulated/floor/wood, /area/maintenance/research/lower) +"qhR" = ( +/obj/effect/floor_decal/industrial/warning/full, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing, +/obj/structure/lattice, +/obj/structure/cable/green{ + icon_state = "32-2" + }, +/turf/simulated/open, +/area/maintenance/lowmedbaymaint) "qhZ" = ( /obj/structure/flora/ausbushes/lavendergrass, /turf/simulated/floor/outdoors/snow/lythios43c, /area/rift/surfacebase/outside/outside1) -"qih" = ( -/turf/simulated/floor/plating, -/area/maintenance/lowmedbaymaint) "qiy" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 @@ -25725,6 +25888,13 @@ }, /turf/simulated/floor/plating, /area/maintenance/tool_storage) +"qls" = ( +/obj/structure/metal_edge, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/open, +/area/security/prison/upper) "qlA" = ( /turf/simulated/shuttle/wall/voidcraft/hard_corner, /area/turbolift/rmine/surface) @@ -25832,6 +26002,12 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rift/surfaceeva) +"qpf" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/security/prison/upper) "qpi" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 @@ -25890,6 +26066,16 @@ }, /turf/simulated/floor/tiled/white, /area/rift/trade_shop) +"qrX" = ( +/obj/structure/catwalk, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/plating, +/area/maintenance/lowmedbaymaint) "qse" = ( /obj/structure/bed/chair/bay{ dir = 1 @@ -26051,6 +26237,16 @@ /obj/machinery/disease2/incubator, /turf/simulated/floor/tiled, /area/medical/virology) +"qvO" = ( +/obj/machinery/button/remote/blast_door{ + id = "cell_lock_2"; + name = "Cell 2 Lock"; + pixel_x = 7; + pixel_y = 30; + req_access = list(1,2,4,38) + }, +/turf/simulated/floor/tiled/monodark, +/area/security/prison/upper) "qwp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -26138,6 +26334,13 @@ }, /turf/simulated/floor/wood, /area/tether/surfacebase/entertainment) +"qzy" = ( +/obj/structure/railing/grey{ + dir = 8 + }, +/obj/structure/catwalk, +/turf/simulated/open, +/area/security/prison/upper) "qzB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/black{ @@ -26230,7 +26433,7 @@ dir = 4 }, /turf/simulated/floor/tiled/steel, -/area/security/security_cell_hallway) +/area/security/prison) "qCA" = ( /obj/machinery/door/airlock/engineering{ name = "Medbay Substation"; @@ -26241,16 +26444,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/medical) -"qCL" = ( -/obj/effect/floor_decal/rust, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/structure/cable/green{ - icon_state = "2-8" - }, -/turf/simulated/floor/tiled/steel, -/area/security/prison) "qCS" = ( /obj/structure/railing{ dir = 4 @@ -26323,6 +26516,28 @@ /obj/structure/flora/ausbushes/lavendergrass, /turf/simulated/floor/outdoors/gravsnow/lythios43c, /area/rift/surfacebase/outside/outside1) +"qFO" = ( +/obj/structure/railing/grey{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals5, +/turf/simulated/floor/tiled/steel, +/area/security/prison/upper) +"qGN" = ( +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/open, +/area/security/prison/upper) "qGS" = ( /turf/simulated/wall/wood/hardwood, /area/library/study) @@ -26369,22 +26584,19 @@ "qIr" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, -/obj/machinery/camera/network/security{ - dir = 1 - }, /obj/machinery/power/apc/south_mount, /obj/structure/cable/green, +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 1 + }, /turf/simulated/floor/tiled/steel, -/area/security/security_cell_hallway) +/area/security/prison) "qIG" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 10 }, /turf/simulated/floor/plating, /area/engineering/engine_eva) -"qIO" = ( -/turf/simulated/floor/tiled/dark, -/area/maintenance/security/lower) "qJb" = ( /obj/structure/bed/chair/wood, /obj/machinery/newscaster{ @@ -26479,6 +26691,21 @@ }, /turf/simulated/floor/tiled/steel, /area/rnd/hallway) +"qMD" = ( +/obj/machinery/computer/secure_data, +/obj/effect/floor_decal/borderfloorblack{ + dir = 5 + }, +/obj/item/radio/intercom{ + dir = 1; + pixel_y = 24 + }, +/obj/item/radio/intercom/department/security{ + dir = 1; + pixel_y = 35 + }, +/turf/simulated/floor/tiled/dark, +/area/security/prison/upper) "qNR" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/closet/crate, @@ -26500,6 +26727,24 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay_emt_bay) +"qOe" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 10 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/security/prison/upper) "qOm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -26632,17 +26877,6 @@ /obj/machinery/smartfridge/chemistry, /turf/simulated/floor/plating, /area/rnd/chemistry_lab) -"qRW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/structure/table/steel, -/obj/item/storage/box/gloves, -/turf/simulated/floor/tiled/monotile, -/area/security/security_cell_hallway) "qSJ" = ( /obj/structure/disposalpipe/segment, /obj/structure/catwalk, @@ -26950,6 +27184,12 @@ }, /turf/simulated/floor/tiled/white, /area/medical/psych) +"qZc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/monotile, +/area/security/prison/upper) "qZu" = ( /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 4 @@ -27121,19 +27361,31 @@ }, /turf/simulated/floor/tiled/steel_grid/lythios43c, /area/rift/surfacebase/outside/outside1) -"rhQ" = ( -/obj/machinery/door/airlock/maintenance/sec, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/obj/machinery/atmospherics/pipe/simple/visible/supply, -/turf/simulated/floor/plating, -/area/security/security_cell_hallway) "rii" = ( -/obj/structure/bed/chair{ +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor/corner2{ dir = 4 }, -/obj/effect/floor_decal/industrial/outline/red, -/turf/simulated/floor/tiled/red, -/area/security/security_cell_hallway) +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/steeldecal/steel_decals5, +/turf/simulated/floor/tiled/steel, +/area/security/prison) "rik" = ( /turf/simulated/floor/tiled/techfloor, /area/maintenance/tool_storage) @@ -27161,11 +27413,6 @@ /obj/machinery/disease2/incubator, /turf/simulated/floor/tiled, /area/medical/virology) -"rkg" = ( -/obj/effect/floor_decal/rust, -/obj/machinery/recharge_station, -/turf/simulated/floor/tiled/steel, -/area/security/prison) "rkh" = ( /obj/item/stool/padded, /turf/simulated/floor/wood/broken, @@ -27220,6 +27467,9 @@ }, /obj/machinery/camera/network/medbay, /obj/structure/flora/pottedplant/decorative, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/medical/psych) "rmE" = ( @@ -27236,10 +27486,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/starboard) -"rmQ" = ( -/obj/structure/sign/department/prison, -/turf/simulated/wall/prepainted/security, -/area/security/security_cell_hallway) "rnp" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 10 @@ -27306,15 +27552,11 @@ /area/maintenance/research/lower) "roa" = ( /obj/machinery/door/airlock/glass/security{ - name = "Confinement Processing"; - req_access = list(2) - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + name = "Genpop" }, /obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/steel, -/area/security/security_cell_hallway) +/turf/simulated/floor/tiled/monotile, +/area/security/prison) "roQ" = ( /obj/structure/railing{ dir = 8 @@ -27398,14 +27640,6 @@ "rrk" = ( /turf/simulated/wall/prepainted/medical, /area/medical/exam_room) -"rrt" = ( -/obj/item/reagent_containers/glass/bucket/wood, -/obj/structure/sink/kitchen{ - dir = 8; - pixel_x = 15 - }, -/turf/simulated/floor/tiled/steel, -/area/security/prison) "rsj" = ( /turf/simulated/floor/plating, /area/maintenance/tool_storage) @@ -27428,15 +27662,30 @@ /obj/effect/floor_decal/industrial/danger, /turf/simulated/floor/tiled/steel, /area/rnd/xenobiology/xenoflora/lab_atmos) -"rtJ" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 5 +"rtc" = ( +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/effect/floor_decal/corner/red/border{ - dir = 5 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/light, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/red/border, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 1 }, /turf/simulated/floor/tiled/steel, -/area/security/security_cell_hallway) +/area/security/prison/upper) "rtL" = ( /obj/effect/floor_decal/borderfloor{ dir = 9 @@ -27457,6 +27706,12 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/maintenance/maint_bar) +"rug" = ( +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/floor/plating, +/area/maintenance/lowmedbaymaint) "ruk" = ( /obj/machinery/light{ dir = 4 @@ -27472,7 +27727,7 @@ /area/quartermaster/delivery) "rul" = ( /turf/simulated/floor/tiled/steel, -/area/security/security_cell_hallway) +/area/security/prison) "ruA" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -27656,7 +27911,6 @@ /obj/machinery/atmospherics/pipe/simple/visible/supply, /obj/machinery/door/airlock/maintenance/common, /obj/structure/disposalpipe/segment, -/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/starboard) "rzz" = ( @@ -27737,6 +27991,17 @@ }, /turf/simulated/floor/tiled/steel, /area/rnd/testingroom) +"rBA" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/machinery/fire_alarm/north_mount, +/obj/effect/floor_decal/steeldecal/steel_decals5, +/turf/simulated/floor/tiled/steel, +/area/security/prison/upper) "rCN" = ( /obj/structure/railing{ dir = 8 @@ -27970,6 +28235,12 @@ }, /turf/simulated/floor/tiled/steel, /area/security/checkpoint) +"rHw" = ( +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/turf/simulated/floor/plating, +/area/maintenance/lowmedbaymaint) "rHJ" = ( /obj/machinery/light/small, /obj/effect/floor_decal/rust, @@ -27998,6 +28269,30 @@ /mob/living/simple_mob/animal/sif/sakimm/dexter, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_breakroom) +"rIK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 8 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/security/prison/upper) "rJv" = ( /turf/simulated/floor, /area/maintenance/starboard) @@ -28201,6 +28496,15 @@ }, /turf/simulated/floor/tiled/monotile, /area/security/checkpoint) +"rOP" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/monotile, +/area/security/prison/upper) "rOR" = ( /obj/structure/table/reinforced, /obj/effect/floor_decal/borderfloor{ @@ -28339,7 +28643,7 @@ /area/maintenance/cargo) "rSd" = ( /turf/simulated/floor/tiled/monotile, -/area/security/security_cell_hallway) +/area/security/prison) "rSM" = ( /obj/structure/reagent_dispensers/watertank, /obj/item/reagent_containers/glass/bucket, @@ -28351,12 +28655,6 @@ }, /turf/simulated/floor/tiled/steel, /area/rnd/xenobiology/xenoflora) -"rSV" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/tiled/steel, -/area/security/security_cell_hallway) "rTa" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -28469,19 +28767,21 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/quartermaster/foyer) +"rXW" = ( +/obj/item/radio/intercom{ + dir = 1; + pixel_y = 24 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/structure/table/steel, +/turf/simulated/floor/tiled/dark, +/area/security/prison/upper) "rYs" = ( /obj/structure/sign/warning/biohazard, /turf/simulated/wall/prepainted/science, /area/rnd/hallway) -"rZr" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 6 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 6 - }, -/turf/simulated/floor/tiled/steel, -/area/security/security_cell_hallway) "rZs" = ( /turf/simulated/floor/tiled/monotile, /area/quartermaster/office) @@ -28585,8 +28885,14 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/monotile, -/area/security/security_cell_hallway) +/area/security/prison) "seP" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/purple/border, @@ -28677,12 +28983,6 @@ }, /turf/simulated/floor/tiled/steel, /area/quartermaster/hallway) -"sfP" = ( -/obj/structure/bed/chair, -/obj/item/handcuffs/cable/white, -/obj/effect/floor_decal/rust, -/turf/simulated/floor/tiled/dark, -/area/maintenance/security/lower) "sgf" = ( /obj/structure/flora/ausbushes, /obj/structure/window/wooden{ @@ -28703,6 +29003,41 @@ }, /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) +"she" = ( +/obj/machinery/button/remote/blast_door{ + dir = 4; + id = "cell_lock_2"; + name = "Cell 2 Lock"; + pixel_x = -24; + pixel_y = -8; + req_access = list(1,2,4,38) + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 10 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 8 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 10 + }, +/obj/machinery/camera/network/security{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/security/prison/upper) "shs" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/purple/border, @@ -28908,10 +29243,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/lino, /area/security/detectives_office) "skw" = ( @@ -29048,10 +29385,6 @@ }, /turf/simulated/floor/tiled/steel, /area/security/checkpoint) -"snf" = ( -/obj/machinery/light/small, -/turf/simulated/floor/plating, -/area/maintenance/research/lower) "snj" = ( /obj/machinery/atmospherics/pipe/simple/visible/supply, /obj/machinery/atmospherics/pipe/simple/visible/black, @@ -29089,6 +29422,18 @@ }, /turf/simulated/floor/tiled/steel_grid/lythios43c, /area/rift/surfacebase/outside/outside1) +"snM" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/loading{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/security/prison/upper) "snN" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 1 @@ -29107,6 +29452,27 @@ "snT" = ( /turf/simulated/wall/prepainted, /area/maintenance/library) +"snU" = ( +/obj/structure/railing/grey{ + dir = 4 + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 4 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/security/prison/upper) "soS" = ( /obj/structure/extinguisher_cabinet{ dir = 4; @@ -29335,12 +29701,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/virologyisolation) -"suf" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/darkred, -/obj/structure/cable/green, -/turf/simulated/floor/plating, -/area/security/security_cell_hallway) "sur" = ( /obj/structure/flora/ausbushes/ppflowers, /turf/simulated/floor/outdoors/grass/heavy/interior, @@ -29526,9 +29886,6 @@ }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/medical_restroom) -"sAz" = ( -/turf/simulated/floor/wood/broken, -/area/maintenance/maint_bar) "sBt" = ( /obj/structure/disposalpipe/segment, /obj/spawner/window/low_wall/reinforced/full/firelocks, @@ -29554,6 +29911,12 @@ }, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/medical/virologyisolation) +"sCY" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark, +/area/security/prison/upper) "sDz" = ( /obj/structure/table/hardwoodtable, /obj/machinery/light_construct/small{ @@ -29633,6 +29996,25 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfaceone) +"sFJ" = ( +/obj/structure/railing/grey{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals5, +/turf/simulated/floor/tiled/steel, +/area/security/prison/upper) "sFL" = ( /obj/structure/catwalk, /obj/structure/railing{ @@ -29712,7 +30094,6 @@ /turf/simulated/open/lythios43c, /area/rift/surfacebase/outside/outside1) "sHE" = ( -/obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/shutters{ dir = 8; id = "warehouse"; @@ -30003,6 +30384,11 @@ "sOh" = ( /turf/simulated/wall/prepainted/cargo, /area/quartermaster/foyer) +"sPu" = ( +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/darkred, +/turf/simulated/floor/plating, +/area/security/prison/upper) "sPz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -30127,6 +30513,24 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/engineering/engine_eva) +"sSZ" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 5 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 5 + }, +/turf/simulated/floor/tiled/steel, +/area/security/prison) "sTp" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 5 @@ -30143,29 +30547,6 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_autopsy) -"sTF" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 6 - }, -/obj/effect/floor_decal/corner/red/bordercorner2{ - dir = 6 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/steel, -/area/security/security_cell_hallway) "sVh" = ( /obj/machinery/button/remote/blast_door{ id = "warehouse"; @@ -30207,10 +30588,6 @@ }, /turf/simulated/open/lythios43c, /area/rift/surfacebase/outside/outside1) -"sWx" = ( -/obj/structure/kitchenspike, -/turf/simulated/floor/tiled/dark, -/area/maintenance/security/lower) "sWN" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/brown/border, @@ -30222,21 +30599,6 @@ }, /turf/simulated/floor/tiled/steel, /area/quartermaster/foyer) -"sWR" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 10 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 10 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 8 - }, -/obj/effect/floor_decal/corner/red/bordercorner2{ - dir = 8 - }, -/turf/simulated/floor/tiled/steel, -/area/security/security_cell_hallway) "sWY" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, @@ -30262,6 +30624,14 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/game_room) +"sXD" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/monotile, +/area/security/prison) "sXQ" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -30495,6 +30865,24 @@ /obj/effect/floor_decal/corner/beige/border, /turf/simulated/floor/tiled/white, /area/medical/psych) +"tgm" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 8 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/security/prison/upper) "tgG" = ( /obj/item/clothing/mask/gas/sexyclown, /obj/item/toy/figure/clown, @@ -30546,6 +30934,15 @@ }, /turf/simulated/floor/plating, /area/rift/trade_shop) +"tif" = ( +/obj/machinery/camera/network/security{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/security/prison/upper) "tim" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/effect/floor_decal/spline/plain{ @@ -30599,23 +30996,6 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/medbreak) -"tjL" = ( -/obj/effect/floor_decal/industrial/warning/full, -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/maintenance/lowmedbaymaint) "tjR" = ( /turf/simulated/floor/wood, /area/library) @@ -30685,6 +31065,12 @@ "tlw" = ( /turf/simulated/floor/water/indoors, /area/rift/station/public_garden) +"tlF" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/security/prison/upper) "tlU" = ( /obj/structure/bed/chair/office/dark{ dir = 1 @@ -30767,6 +31153,18 @@ }, /turf/simulated/floor/wood, /area/rnd/outpost/xenobiology/outpost_office) +"tnA" = ( +/obj/effect/floor_decal/borderfloor/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/red/bordercorner{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/security/prison/upper) "tnJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -30794,12 +31192,6 @@ /obj/structure/table/bench/wooden, /turf/simulated/floor/snow, /area/rift/surfacebase/outside/outside1) -"toj" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/wood, -/area/maintenance/maint_bar) "toy" = ( /obj/machinery/camera/network/medbay{ dir = 1; @@ -30887,6 +31279,18 @@ "trb" = ( /turf/simulated/floor/tiled/steel, /area/rift/trade_shop) +"trx" = ( +/obj/effect/floor_decal/borderfloor/corner{ + dir = 8 + }, +/obj/effect/floor_decal/corner/red/bordercorner{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/security/prison/upper) "trC" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -31017,6 +31421,25 @@ "twG" = ( /turf/simulated/wall/r_wall/prepainted/medical, /area/medical/psych_ward) +"txe" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 9 + }, +/obj/machinery/fire_alarm/west_mount, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/security/prison) "txE" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -31108,10 +31531,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/medical/patient_wing) -"tyY" = ( -/obj/machinery/washing_machine, -/turf/simulated/floor/tiled/steel, -/area/security/prison) "tzf" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 @@ -31169,7 +31588,7 @@ /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/effect/paint/darkred, /turf/simulated/floor/plating, -/area/security/security_cell_hallway) +/area/security/prison) "tBl" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/random/trash_pile, @@ -31393,6 +31812,15 @@ /obj/machinery/recharge_station, /turf/simulated/floor/tiled/white, /area/medical/psych) +"tGS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled/monotile, +/area/security/prison/upper) "tGW" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -31451,16 +31879,6 @@ }, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/rift/station/public_garden) -"tHW" = ( -/obj/machinery/door/airlock/glass/security{ - name = "Permanent Confinement"; - req_access = list(2) - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/steel, -/area/security/security_cell_hallway) "tIx" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -31555,6 +31973,29 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/outpost/xenobiology/outpost_hallway) +"tLi" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 10 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/security/prison) "tLt" = ( /obj/effect/floor_decal/rust, /obj/structure/catwalk, @@ -31889,6 +32330,21 @@ /obj/effect/floor_decal/corner/purple/border, /turf/simulated/floor/tiled/steel, /area/rnd/hallway) +"tVQ" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals5, +/obj/structure/bed/chair, +/obj/item/radio/intercom/department/security{ + dir = 1; + pixel_y = 24 + }, +/turf/simulated/floor/tiled/steel, +/area/security/prison/upper) "tWs" = ( /obj/structure/bookcase/legal/corpreg, /turf/simulated/floor/wood, @@ -31914,9 +32370,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/cargo) -"tXc" = ( -/turf/simulated/floor/plating, -/area/maintenance/starboard) "tXh" = ( /obj/structure/stairs/spawner/west, /turf/simulated/floor/plating, @@ -31935,11 +32388,6 @@ "tXx" = ( /turf/simulated/shuttle/wall/voidcraft, /area/turbolift/rsurface/level1) -"tXC" = ( -/obj/machinery/cryopod, -/obj/effect/floor_decal/rust, -/turf/simulated/floor/tiled/steel, -/area/security/prison) "tXS" = ( /obj/structure/closet/firecloset, /obj/effect/floor_decal/industrial/outline/yellow, @@ -32040,6 +32488,12 @@ }, /turf/simulated/floor/wood, /area/tether/surfacebase/entertainment) +"uai" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/tiled/monotile, +/area/security/prison/upper) "uap" = ( /obj/structure/grille, /obj/structure/sign/warning/secure_area, @@ -32084,6 +32538,12 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/hallway) +"ubi" = ( +/obj/structure/table/steel, +/obj/effect/floor_decal/borderfloorblack, +/obj/item/storage/firstaid/regular, +/turf/simulated/floor/tiled/dark, +/area/security/prison/upper) "ubp" = ( /turf/simulated/floor/tiled/steel_grid/lythios43c, /area/rift/surfacebase/outside/outside1) @@ -32149,6 +32609,13 @@ /obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_decon) +"uel" = ( +/obj/effect/floor_decal/rust, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/maintenance/library) "ueA" = ( /turf/simulated/wall/prepainted/civilian, /area/tether/station/public_meeting_room) @@ -32229,6 +32696,23 @@ }, /turf/simulated/floor/tiled/white, /area/medical/patient_wing) +"uhV" = ( +/obj/machinery/camera/network/security{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals5, +/turf/simulated/floor/tiled/steel, +/area/security/prison/upper) +"uih" = ( +/obj/machinery/door_timer/cell_1{ + id = "isolation"; + name = "Isolation" + }, +/turf/simulated/wall/r_wall/prepainted/security, +/area/security/prison/upper) "uii" = ( /obj/machinery/door/airlock/multi_tile/glass, /obj/machinery/door/firedoor/glass, @@ -32372,34 +32856,25 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/surface_one) -"ulr" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloor/corner2{ +"ukS" = ( +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 8 }, -/obj/effect/floor_decal/corner/red/bordercorner2{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/floor_decal/corner/red/bordercorner2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/structure/catwalk, +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 +/obj/machinery/light/small{ + dir = 1 }, -/obj/machinery/fire_alarm/north_mount, -/turf/simulated/floor/tiled/steel, -/area/security/security_cell_hallway) +/turf/simulated/floor/plating, +/area/maintenance/security/lower) "ulQ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -32420,11 +32895,6 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, /area/maintenance/research/lower) -"ulY" = ( -/obj/effect/floor_decal/rust, -/obj/machinery/vending/hydronutrients, -/turf/simulated/floor/tiled/steel, -/area/security/prison) "umf" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/brown/border, @@ -32442,14 +32912,6 @@ }, /turf/simulated/floor/tiled/steel, /area/quartermaster/office) -"und" = ( -/obj/machinery/door/firedoor/glass{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloor/corner, -/obj/effect/floor_decal/corner/red/bordercorner, -/turf/simulated/floor/tiled/steel, -/area/security/security_cell_hallway) "une" = ( /obj/machinery/light_construct/small{ dir = 8 @@ -32521,6 +32983,25 @@ }, /turf/simulated/floor/tiled/steel, /area/rnd/hallway) +"uoM" = ( +/obj/structure/table/reinforced, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals5, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/pen{ + pixel_x = 2; + pixel_y = 2 + }, +/turf/simulated/floor/tiled/steel, +/area/security/prison/upper) "uoZ" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -32566,9 +33047,37 @@ "upz" = ( /turf/simulated/wall/prepainted/civilian, /area/maintenance/tool_storage) +"upE" = ( +/obj/structure/table/steel, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/structure/extinguisher_cabinet{ + dir = 8; + pixel_x = 30 + }, +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/obj/machinery/recharger{ + pixel_x = 5; + pixel_y = 3 + }, +/turf/simulated/floor/tiled/dark, +/area/security/prison/upper) "upJ" = ( /turf/simulated/floor/plating, /area/medical/psych) +"upY" = ( +/obj/machinery/vending/snack, +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 9 + }, +/turf/simulated/floor/tiled/steel, +/area/security/prison/upper) "uqa" = ( /obj/effect/floor_decal/borderfloorwhite/corner{ dir = 1 @@ -32821,6 +33330,10 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay_emt_bay) +"uvs" = ( +/obj/machinery/computer/cryopod, +/turf/simulated/wall/r_wall/prepainted/security, +/area/security/prison/upper) "uvA" = ( /obj/machinery/air_alarm{ dir = 1; @@ -32847,20 +33360,30 @@ }, /turf/simulated/floor/tiled/techfloor, /area/quartermaster/garage) -"uwn" = ( -/obj/structure/disposalpipe/segment{ +"uwf" = ( +/obj/structure/bed/chair/sofa/beige{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ +/obj/effect/floor_decal/corner/red/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ +/turf/simulated/floor/tiled/steel, +/area/security/prison/upper) +"uwn" = ( +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/catwalk, /obj/structure/cable{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) "uwt" = ( @@ -33042,6 +33565,38 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/plating, /area/maintenance/starboard) +"uBa" = ( +/obj/machinery/button/remote/blast_door{ + dir = 4; + id = "cell_lock_3"; + name = "Cell 3 Lock"; + pixel_x = -24; + pixel_y = -8; + req_access = list(1,2,4,38) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 10 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/security/prison/upper) "uBj" = ( /obj/effect/floor_decal/techfloor{ dir = 1 @@ -33082,9 +33637,6 @@ "uBP" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/xenoarch_storage) -"uBT" = ( -/turf/simulated/floor/plating, -/area/maintenance/research/lower) "uBV" = ( /obj/machinery/disposal, /obj/effect/floor_decal/borderfloor{ @@ -33108,12 +33660,6 @@ }, /turf/simulated/floor/tiled/steel, /area/rnd/xenobiology/xenoflora) -"uCg" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/steel, -/area/security/prison) "uCt" = ( /obj/effect/floor_decal/spline/plain{ dir = 8 @@ -33230,17 +33776,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/psych_ward) -"uFU" = ( -/obj/effect/floor_decal/techfloor/orange{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techfloor, -/area/quartermaster/garage) "uFZ" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -33478,8 +34013,11 @@ /obj/effect/floor_decal/corner/red/border{ dir = 4 }, +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 8 + }, /turf/simulated/floor/tiled/steel, -/area/security/security_cell_hallway) +/area/security/prison) "uPk" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -33589,9 +34127,6 @@ }, /turf/simulated/floor/tiled/steel, /area/security/checkpoint) -"uTe" = ( -/turf/simulated/floor/tiled/dark, -/area/prison/solitary) "uTy" = ( /obj/machinery/atmospherics/portables_connector, /obj/effect/floor_decal/borderfloor{ @@ -33848,6 +34383,22 @@ "vbN" = ( /turf/simulated/wall/r_wall/prepainted/medical, /area/medical/virologytransitwest) +"vbY" = ( +/obj/structure/bed/chair/office/dark{ + dir = 1 + }, +/obj/landmark/spawnpoint/job/security_officer, +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = -24; + pixel_y = 38 + }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/turf/simulated/floor/tiled/monodark, +/area/security/prison/upper) "vca" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ @@ -34067,7 +34618,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/airlock/maintenance/common, /obj/machinery/atmospherics/pipe/simple/visible/supply{ dir = 8 }, @@ -34079,7 +34629,7 @@ icon_state = "4-8" }, /turf/simulated/floor/plating, -/area/maintenance/lowmedbaymaint) +/area/maintenance/security/lower) "vke" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -34121,9 +34671,6 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/civilian_hallway_mid) -"vky" = ( -/turf/simulated/floor/plating, -/area/maintenance/research/lower) "vls" = ( /obj/machinery/door/airlock/engineering{ name = "Cargo Substation"; @@ -34222,9 +34769,23 @@ /obj/structure/flora/pottedplant/minitree, /turf/simulated/floor/wood, /area/maintenance/maint_bar) -"vsb" = ( -/obj/effect/floor_decal/rust, -/turf/simulated/floor/plating, +"vrP" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 6 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, /area/security/prison) "vtt" = ( /obj/effect/floor_decal/borderfloor, @@ -34317,20 +34878,17 @@ /turf/simulated/floor/tiled/steel_grid/lythios43c, /area/rift/surfacebase/outside/outside1) "vwu" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 +/obj/effect/floor_decal/borderfloor/corner{ + dir = 4 }, -/obj/effect/floor_decal/corner/red/border{ - dir = 8 +/obj/effect/floor_decal/corner/red/bordercorner{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/closet/hydrant{ - dir = 4; - pixel_x = -32 +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 8 }, /turf/simulated/floor/tiled/steel, -/area/security/security_cell_hallway) +/area/security/prison) "vwA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -34387,11 +34945,6 @@ /obj/structure/bed/double/padded, /turf/simulated/floor/carpet, /area/maintenance/research/lower) -"vyU" = ( -/obj/effect/floor_decal/rust, -/obj/machinery/portable_atmospherics/hydroponics, -/turf/simulated/floor/plating, -/area/security/prison) "vzD" = ( /obj/random/tool, /turf/simulated/floor/plating, @@ -34469,6 +35022,31 @@ }, /turf/simulated/floor/tiled/steel, /area/rnd/tankstorage) +"vBr" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/vending/snack, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/turf/simulated/floor/tiled/steel, +/area/security/prison) "vBt" = ( /obj/machinery/air_alarm/monitor/isolation{ pixel_y = 26 @@ -34568,6 +35146,10 @@ }, /turf/simulated/floor/wood, /area/tether/surfacebase/entertainment) +"vFf" = ( +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/maintenance/security/lower) "vFs" = ( /obj/machinery/light/flamp/noshade, /turf/simulated/floor/plating/lythios43c, @@ -34693,10 +35275,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/virologyaccess) -"vLm" = ( -/obj/structure/table/steel, -/turf/simulated/floor/tiled/steel, -/area/security/prison) "vLK" = ( /obj/structure/closet/crate, /obj/item/circuitboard/machine/lathe/autolathe, @@ -34708,6 +35286,20 @@ }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/library) +"vMy" = ( +/obj/structure/railing/grey, +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 6 + }, +/obj/machinery/camera/network/security{ + dir = 8 + }, +/obj/effect/floor_decal/spline/plain, +/turf/simulated/floor/tiled/steel, +/area/security/prison/upper) "vMO" = ( /obj/machinery/vending/coffee, /obj/effect/floor_decal/borderfloor{ @@ -34721,12 +35313,6 @@ }, /turf/simulated/floor/tiled/steel, /area/quartermaster/office) -"vNw" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, -/turf/simulated/floor/lino, -/area/tether/surfacebase/entertainment) "vNx" = ( /obj/structure/railing{ dir = 1 @@ -34809,11 +35395,6 @@ /obj/spawner/window/reinforced/full, /turf/simulated/floor/plating, /area/rift/surfacebase/outside/outside1) -"vPL" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/effect/floor_decal/rust, -/turf/simulated/floor/tiled/steel, -/area/security/prison) "vPN" = ( /obj/machinery/button/remote/blast_door{ dir = 1; @@ -34831,6 +35412,17 @@ "vQb" = ( /turf/simulated/floor/tiled/monotile, /area/quartermaster/foyer) +"vQi" = ( +/obj/structure/catwalk, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plating, +/area/maintenance/lowmedbaymaint) "vQy" = ( /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -35084,6 +35676,21 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/chemistry_lab) +"vWS" = ( +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/obj/machinery/door/window/brigdoor/eastright{ + id = "isolation"; + name = "Isolation" + }, +/obj/machinery/door/window/brigdoor/westleft{ + id = "isolation"; + name = "Isolation" + }, +/obj/structure/curtain/open/black, +/turf/simulated/floor/tiled/monodark, +/area/security/prison/upper) "vWY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 5 @@ -35093,28 +35700,22 @@ "vXh" = ( /turf/simulated/floor/carpet/gaycarpet, /area/tether/surfacebase/funny/clownoffice) -"vXr" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/wood/broken, -/area/maintenance/maint_bar) "vXw" = ( /obj/effect/overlay/snow/floor, /obj/structure/grille, /turf/simulated/floor/outdoors/snow/lythios43c, /area/rift/surfacebase/outside/outside1) "vXz" = ( -/obj/machinery/light/small{ - dir = 4 +/obj/machinery/door/airlock/glass/security{ + id_tag = "cell_lock_1"; + name = "Cell 1"; + req_one_access = null }, -/obj/effect/floor_decal/rust, -/obj/machinery/air_alarm{ - dir = 8; - pixel_x = 24 +/obj/machinery/door/firedoor/glass{ + dir = 8 }, -/turf/simulated/floor/tiled/dark, -/area/security/brig/bathroom) +/turf/simulated/floor/tiled/monodark, +/area/security/prison/upper) "vYy" = ( /turf/simulated/floor/wood, /area/lawoffice) @@ -35344,9 +35945,6 @@ /obj/structure/table/rack/shelf/steel, /turf/simulated/floor/plating, /area/maintenance/research/lower) -"weV" = ( -/turf/simulated/floor/wood, -/area/maintenance/maint_bar) "wft" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -35367,6 +35965,13 @@ }, /turf/simulated/floor/tiled/white, /area/medical/psych_ward) +"wgs" = ( +/obj/structure/railing/grey{ + dir = 1 + }, +/obj/structure/catwalk, +/turf/simulated/open, +/area/security/prison/upper) "wgx" = ( /obj/item/radio/intercom{ dir = 1; @@ -35400,15 +36005,6 @@ /obj/machinery/space_heater, /turf/simulated/floor/plating, /area/maintenance/tool_storage) -"whP" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/obj/machinery/fire_alarm/south_mount{ - pixel_y = -24 - }, -/turf/simulated/floor/tiled/steel, -/area/security/prison) "whS" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -35421,6 +36017,17 @@ }, /turf/simulated/floor/tiled/white, /area/medical/psych_ward) +"wiQ" = ( +/obj/structure/bed/padded, +/turf/simulated/floor/tiled/monodark, +/area/security/prison/upper) +"wiU" = ( +/obj/machinery/door/airlock/maintenance/sec, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/simple/visible/supply, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating, +/area/security/prison) "wjj" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -35441,6 +36048,13 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_hallway) +"wjk" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 6 + }, +/obj/machinery/photocopier, +/turf/simulated/floor/tiled/dark, +/area/security/prison/upper) "wjG" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -35748,21 +36362,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/cargo) -"wsl" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 9 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 9 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 10 - }, -/obj/effect/floor_decal/corner/red/bordercorner2{ - dir = 10 - }, -/turf/simulated/floor/tiled/steel, -/area/security/security_cell_hallway) "wsx" = ( /obj/effect/floor_decal/spline/plain{ dir = 4 @@ -35856,6 +36455,16 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfaceone) +"wuy" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals5, +/turf/simulated/floor/tiled/steel, +/area/security/prison/upper) "wuO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/black{ @@ -35886,6 +36495,19 @@ }, /turf/simulated/floor/tiled/steel_dirty, /area/rnd/tankstorage) +"wva" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals5, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/security/prison) "wvd" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -35902,6 +36524,9 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/civilian_hallway_mid) +"wvf" = ( +/turf/simulated/floor/tiled/monodark, +/area/security/prison/upper) "wvp" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -35917,6 +36542,18 @@ }, /turf/simulated/floor/tiled/monotile, /area/quartermaster/delivery) +"wvw" = ( +/obj/structure/cryofeed{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 9 + }, +/turf/simulated/floor/tiled/steel, +/area/security/prison/upper) "wvD" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 6 @@ -36100,13 +36737,6 @@ /obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/tiled/steel_dirty, /area/rnd/tankstorage) -"wCi" = ( -/obj/structure/toilet{ - pixel_y = 9 - }, -/obj/effect/floor_decal/rust, -/turf/simulated/floor/tiled/red, -/area/prison/solitary) "wCk" = ( /obj/machinery/atmospherics/pipe/simple/visible/green, /turf/simulated/floor/tiled, @@ -36176,10 +36806,6 @@ }, /turf/simulated/floor/tiled/steel, /area/quartermaster/hallway) -"wDT" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/turf/simulated/floor/tiled/steel, -/area/security/prison) "wEf" = ( /obj/structure/closet/secure_closet/detective, /turf/simulated/floor/lino, @@ -36227,14 +36853,6 @@ }, /turf/simulated/floor/tiled/white, /area/security/forensics) -"wFV" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/structure/catwalk, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/research/lower) "wGa" = ( /obj/machinery/light/fairy{ dir = 8 @@ -36318,15 +36936,6 @@ /obj/landmark/spawnpoint/job/paramedic, /turf/simulated/floor/tiled/white, /area/medical/medbay_emt_bay) -"wGU" = ( -/obj/effect/floor_decal/rust, -/obj/structure/table/rack, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/obj/random/plushie, -/obj/random/maintenance/cargo, -/turf/simulated/floor/plating, -/area/maintenance/security/lower) "wGW" = ( /obj/effect/floor_decal/spline/plain{ dir = 4 @@ -36363,23 +36972,6 @@ /obj/structure/bookcase, /turf/simulated/floor/wood, /area/maintenance/research/lower) -"wIz" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 4 - }, -/obj/machinery/camera/network/security{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/steel, -/area/security/security_cell_hallway) "wIJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -36514,10 +37106,6 @@ }, /turf/simulated/floor/holofloor/tiled/dark, /area/turbolift/rmine/surface) -"wNE" = ( -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/research/lower) "wOB" = ( /obj/structure/grille, /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ @@ -37030,10 +37618,6 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/library) -"xen" = ( -/obj/structure/table, -/turf/simulated/floor/wood/broken, -/area/maintenance/maint_bar) "xex" = ( /obj/structure/table/woodentable, /obj/random/maintenance/clean, @@ -37093,13 +37677,6 @@ /obj/fiftyspawner/rods, /turf/simulated/floor/tiled/steel_grid, /area/quartermaster/garage) -"xgh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/holopad, -/turf/simulated/floor/tiled/steel, -/area/security/prison) "xgG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/spawner/window/low_wall/reinforced/full/firelocks, @@ -37296,21 +37873,18 @@ /turf/simulated/floor/tiled/white, /area/medical/patient_a) "xlo" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/monotile, -/area/security/security_cell_hallway) -"xlB" = ( -/obj/structure/sign/poster{ - pixel_y = 32 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 }, -/turf/simulated/floor/wood/broken, -/area/maintenance/maint_bar) +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/tiled/monotile, +/area/security/prison) "xlG" = ( /obj/structure/bed/double/padded, /obj/item/bedsheet/clowndouble, @@ -37562,13 +38136,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) -"xvA" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/lowmedbaymaint) "xvD" = ( /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -37728,6 +38295,14 @@ /obj/random/plushie, /turf/simulated/floor/tiled/white, /area/medical/psych) +"xyy" = ( +/obj/effect/floor_decal/borderfloor/corner, +/obj/effect/floor_decal/corner/red/bordercorner, +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/security/prison/upper) "xyO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -37798,6 +38373,29 @@ /obj/item/extinguisher, /turf/simulated/floor/tiled/techmaint, /area/rnd/outpost/xenobiology/outpost_storage) +"xBg" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 6 + }, +/obj/effect/floor_decal/borderfloor/corner2, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 6 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 6 + }, +/obj/effect/floor_decal/corner/red/bordercorner2, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 + }, +/obj/machinery/camera/network/security{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/security/prison) "xBi" = ( /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/steel, @@ -37848,7 +38446,7 @@ /turf/simulated/floor/plating, /area/engineering/engine_eva) "xDd" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, /obj/effect/paint/babyblue, /turf/simulated/floor/plating, /area/medical/medbay_emt_bay) @@ -37892,7 +38490,7 @@ "xEf" = ( /obj/structure/stairs/spawner/east, /turf/simulated/floor/tiled/steel, -/area/security/security_cell_hallway) +/area/security/prison) "xEl" = ( /obj/machinery/vending/snack{ dir = 4 @@ -37996,6 +38594,41 @@ "xIm" = ( /turf/simulated/wall/prepainted, /area/rnd/outpost/xenobiology/outpost_stairs) +"xJK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals5, +/turf/simulated/floor/tiled/steel, +/area/security/prison/upper) +"xJP" = ( +/obj/machinery/air_alarm{ + desc = " "; + pixel_y = 24 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 10 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 10 + }, +/turf/simulated/floor/tiled/steel, +/area/security/prison/upper) "xJV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -38062,20 +38695,6 @@ }, /turf/simulated/floor/wood, /area/tether/surfacebase/medical/mentalhealth) -"xMr" = ( -/obj/effect/floor_decal/rust, -/obj/machinery/vending/wallmed1{ - name = "Emergency NanoMed"; - pixel_y = 32 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/security/prison) -"xMw" = ( -/turf/simulated/floor/wood, -/area/maintenance/lowmedbaymaint) "xMJ" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -38088,6 +38707,30 @@ }, /turf/simulated/floor/tiled/white, /area/medical/virologyisolation) +"xNr" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 4 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 10 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 10 + }, +/turf/simulated/floor/tiled/steel, +/area/security/prison/upper) "xND" = ( /obj/machinery/light, /obj/machinery/atmospherics/pipe/simple/hidden/black{ @@ -38150,6 +38793,18 @@ /obj/random/toolbox, /turf/simulated/floor/tiled/steel, /area/storage/tools) +"xPa" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/security/prison/upper) "xPm" = ( /turf/simulated/shuttle/wall/voidcraft, /area/turbolift/rmine/surface) @@ -38217,15 +38872,6 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/maintenance/evahallway) -"xQG" = ( -/obj/machinery/power/apc/north_mount{ - cell_type = /obj/item/cell/super - }, -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/turf/simulated/floor/tiled/steel, -/area/security/prison) "xRb" = ( /turf/simulated/floor/tiled/steel, /area/hallway/secondary/civilian_hallway_mid) @@ -38319,18 +38965,6 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_main) -"xTV" = ( -/obj/effect/floor_decal/borderfloor/corner{ - dir = 4 - }, -/obj/effect/floor_decal/corner/red/bordercorner{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass{ - dir = 1 - }, -/turf/simulated/floor/tiled/steel, -/area/security/security_cell_hallway) "xUv" = ( /obj/structure/catwalk, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, @@ -38463,29 +39097,6 @@ }, /turf/simulated/floor/reinforced/lythios43c, /area/rift/surfacebase/outside/outside1) -"xXG" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 6 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 6 - }, -/obj/effect/floor_decal/borderfloor/corner2, -/obj/effect/floor_decal/corner/red/bordercorner2, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/steel, -/area/security/security_cell_hallway) "xXX" = ( /obj/effect/blocker, /turf/simulated/open/lythios43c, @@ -38515,6 +39126,10 @@ "xZM" = ( /turf/simulated/wall/prepainted, /area/tether/surfacebase/funny/mimeoffice) +"yaq" = ( +/obj/effect/floor_decal/rust, +/turf/simulated/wall/r_wall/prepainted/security, +/area/security/prison) "yav" = ( /obj/structure/table/hardwoodtable, /obj/machinery/chemical_dispenser/catering/bar_soft, @@ -38609,18 +39224,14 @@ /obj/structure/sign/securearea, /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_hallway) -"yeC" = ( -/obj/structure/table/steel, -/obj/item/clothing/gloves/sterile/latex, -/obj/item/surgical/hemostat, -/obj/item/tool/screwdriver, -/obj/item/tool/wirecutters, -/turf/simulated/floor/tiled/dark, -/area/maintenance/security/lower) "yeH" = ( /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/tool_storage) +"yeR" = ( +/obj/structure/table/reinforced, +/turf/simulated/floor/tiled/monotile, +/area/security/prison/upper) "yeX" = ( /turf/simulated/floor/plating, /area/maintenance/evahallway) @@ -38644,11 +39255,17 @@ /obj/machinery/door/airlock/maintenance/cargo, /turf/simulated/floor/plating, /area/quartermaster/garage) -"ygW" = ( -/obj/effect/floor_decal/rust, -/obj/machinery/portable_atmospherics/hydroponics, +"ygq" = ( +/obj/structure/bed/chair/sofa/beige, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals5, /turf/simulated/floor/tiled/steel, -/area/security/prison) +/area/security/prison/upper) "ygX" = ( /obj/structure/closet, /obj/random/maintenance/clean, @@ -38692,14 +39309,14 @@ /turf/simulated/floor/wood, /area/rnd/outpost/xenobiology/outpost_office) "yiU" = ( -/obj/structure/bed/chair/office/dark{ +/obj/machinery/door/firedoor/glass{ dir = 8 }, -/obj/machinery/camera/network/security{ - dir = 6 +/obj/machinery/door/airlock/security{ + name = "Visitation" }, -/turf/simulated/floor/tiled/steel, -/area/security/security_cell_hallway) +/turf/simulated/floor/tiled/monotile, +/area/security/prison) "yja" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -48957,7 +49574,7 @@ hgE oFp aeP jfd -jzl +aeP gso qLr wRf @@ -49733,7 +50350,7 @@ oFp oFp hmw jfd -jzl +aeP pPL reU oFp @@ -50310,7 +50927,7 @@ xvP eCU eFz gnR -uFU +eCU qIp pMh eCU @@ -50948,9 +51565,9 @@ qvB lCB lCB rZY -fLU -fLU -fLU +aIk +aIk +aIk aeZ oXj uap @@ -51332,7 +51949,7 @@ wOB heV evk qvB -fLU +aIk aeZ oXj oXj @@ -51535,8 +52152,8 @@ rZY rZY rZY hZe -fLU -fLU +aIk +aIk eHL rZY rZY @@ -51729,13 +52346,13 @@ mHx mHx rZY hZe -uBT -fLU +aIk +aIk kmM rZY jVg aIk -fLU +aIk rZY rZY oXj @@ -51851,7 +52468,7 @@ oke suV vgQ fUY -nbp +axD brW xqn wRP @@ -51923,14 +52540,14 @@ mHx mHx rZY eHL -fLU -uBT +aIk +aIk dAB rZY eHL eFL -fLU -snf +aIk +dFT rZY oXj rZY @@ -52045,7 +52662,7 @@ uaw iKU sTp fUY -iVw +brW mBD xqn wRP @@ -52124,7 +52741,7 @@ rZY rZY rZY eHL -fLU +aIk rZY oXj eHL @@ -52240,8 +52857,8 @@ fUY fUY fUY rLZ -xMw -iVw +xqn +brW wRP bBn ebQ @@ -52304,7 +52921,7 @@ bwN bwN sSY oXj -wFV +kpd iFZ tmg oal @@ -52314,14 +52931,14 @@ uBP xku xwq rRj -fLU +aIk phU rZY jVg -fLU +aIk rZY oXj -fLU +aIk rZY rZY rZY @@ -52434,7 +53051,7 @@ pkC pkC miX bxj -qih +mBD xqn wRP vaP @@ -52512,10 +53129,10 @@ eXb qRt rZY eHL -fLU +aIk gFo oXj -fLU +aIk rZY lkl vTJ @@ -52701,7 +53318,7 @@ rDX uBP phU xku -fLU +aIk xku ozG rZY @@ -52709,7 +53326,7 @@ rZY rZY rZY oXj -fLU +aIk rZY qhJ vTJ @@ -52894,7 +53511,7 @@ uBP uBP uBP xku -fLU +aIk xku nZq nUs @@ -52903,7 +53520,7 @@ jEl kiX rZY oXj -fLU +aIk gFo vTJ vTJ @@ -53087,17 +53704,17 @@ lQO grR rDX uBP -fLU +aIk xkq -fLU -fLU +aIk +aIk xku rZY jSH wHW rZY oXj -fLU +aIk rZY vTJ vTJ @@ -53179,7 +53796,7 @@ ofx kHo kdy hIo -pOR +mBD buH dwP eIl @@ -53281,17 +53898,17 @@ mUc uBP uBP uBP -fLU +aIk phU xku xku xku frG -fLU +aIk iRH rZY oXj -fLU +aIk rZY qhJ vTJ @@ -53373,7 +53990,7 @@ cov rDn lOq hIo -pOR +mBD buH dwP eha @@ -53476,16 +54093,16 @@ yhF mNV uBP vcv -fLU +aIk xku -fLU +aIk xmD rZY iRH -fLU +aIk rZY oXj -fLU +aIk rZY wIf vTJ @@ -53672,14 +54289,14 @@ uBP xku nXv phU -fLU +aIk dNB rZY voo voo rZY gLx -fLU +aIk rZY rZY rZY @@ -53873,7 +54490,7 @@ rZY rZY rZY oXj -fLU +aIk rZY hgE hgE @@ -53958,17 +54575,17 @@ rUE oGF buH buH -pOR +mBD nkJ wTn lie xky nkJ mCe -pOR -nbp -nbp -nbp +mBD +axD +axD +axD uBK sFY rrk @@ -54059,11 +54676,11 @@ uBP oXj oXj oXj -wNE -wNE -wNE oXj -wNE +oXj +oXj +oXj +oXj oXj oXj oXj @@ -54150,20 +54767,20 @@ gkg eIC cmU oGF -nbp +axD buH -pOR +mBD nkJ dVV xtE jof nkJ -pOR -pOR -pOR -pOR -nbp -nbp +mBD +eWs +qwF +rHw +axD +axD buH pcA haC @@ -54251,10 +54868,10 @@ jdA jdA kkQ kPf -fLU -vky -eXK -eXK +aIk +aIk +aIk +aIk rZY sZP vZn @@ -54344,23 +54961,23 @@ gkg oRe sKU oGF -nbp +axD hik -pOR +mBD lUw oZc iHL cQP kgr qwF -qwF -tjL -qwF +gur +gXG +rug qwF qaB eHK -pOR -pOR +mBD +mBD cKY vTx sZk @@ -54445,8 +55062,8 @@ jLS hDy uBP uob -fMu -vky +aIk +aIk eHL eHL rZY @@ -54538,20 +55155,20 @@ sDY oVa sDY sDY -pOR +mBD hik -pOR +mBD mZJ qCA nkJ nkJ mZJ -pOR -pOR -pOR -pOR -pOR -nbp +mBD +mBD +okr +mBD +mBD +axD daS gTC gTC @@ -54639,7 +55256,7 @@ cYM tpH tpH uob -fLU +aIk rZY rZY rZY @@ -54732,7 +55349,7 @@ mKQ pfT tGQ sDY -pOR +mBD buH buH buH @@ -54740,12 +55357,12 @@ eSY sNy sNy sNy -sNy -sNy -sNy -sNy -sNy -sNy +mIw +dki +gyx +dki +dki +dki kku wUo qwF @@ -54756,12 +55373,12 @@ qwF dyA qwF ehd -gXG -pOR -pOR -pOR -pOR -pOR +oLW +mBD +mBD +mBD +mBD +mBD kjp eBp pzE @@ -54833,7 +55450,7 @@ cYM mHx rZY uob -vky +aIk rZY hgE hgE @@ -54926,36 +55543,36 @@ oKE bxi oYs sDY -pOR +mBD buH -pOR -pOR -pOR -pOR -pOR -pOR -pOR -pOR +mBD +mBD +mBD +mBD +mBD +mBD +qhR +qwF gKI -pOR -pOR -pOR -eSY -sNy -sNy -sNy +mBD +mBD +mBD +qrX +dki +dki +dki hdq -sNy -sNy -sNy -sNy +vQi +dki +dki +dki aEC -hYf -sNy -sNy -sNy -sNy -sNy +iIN +dki +dki +dki +vQi +iIN uwn eBp kLo @@ -55027,7 +55644,7 @@ cYM mHx rZY uob -fLU +aIk rZY hgE hgE @@ -55122,34 +55739,34 @@ fJW sDY gTC nQl -tdI -tdI -tdI -tdI -tdI -tdI -tdI -tdI -tdI -tdI -tdI -tdI -tdI -tdI -pOR -pOR -pOR -pOR -nbp -nbp -pOR -xvA -pNt -pOR -pOR -pOR -pOR -pOR +pnT +pnT +pnT +pnT +pnT +pnT +pnT +pnT +pnT +pnT +pnT +pnT +pnT +hFE +hFE +hFE +hFE +hFE +hFE +yaq +hFE +cIf +aml +aml +aml +aml +aml +aml mNj eBp eBp @@ -55221,7 +55838,7 @@ cYM mHx rZY uob -fLU +aIk rZY hgE hgE @@ -55314,38 +55931,38 @@ pfT uEt pNx sDY -pOR +mBD buH -tdI -pZn -pZn -pZn -pZn -pZn -pZn -pZn -pZn -pZn -pZn +pnT +paf +tif pZn -pZn -tdI -nbp -nbp -nbp -nbp -liA -pOR -pOR +pnT +pwW +emN +pnT +pwW +emN +pnT +pwW +emN +hFE +goO +exp +txe +tBg +vBr +kRN +tLi aDx jJS -pOR -nbp +obG +lPp liA -nbp -gTC +ozq +aml vjW -tdI +dMX dMX iFG bXZ @@ -55415,7 +56032,7 @@ cYM mHx rZY uob -fLU +aIk rZY hgE hgE @@ -55508,37 +56125,37 @@ pfT uEt flr sDY -pOR +mBD buH -tdI -pZn -iTF -iTF -iTF -iTF -iTF -iTF -iTF -lLp -lLp -lLp -lLp -lLp -hFE -hFE -hFE -hFE -hFE +pnT +tlF +wiQ +nHJ +pnT +wiQ +wvf +pnT +wiQ +wvf +pnT +wiQ +wvf hFE -aml -cIf -aml -aml -aml -aml -aml -aml -uHe +eaO +rSd +lfB +pJd +sXD +rSd +elP +xlo +rSd +mWf +rSd +eZl +oGP +wiU +jGC dMX dMX ouV @@ -55609,7 +56226,7 @@ cYM mHx rZY uob -fLU +aIk rZY hgE hgE @@ -55702,37 +56319,37 @@ pfT pfT njD sDY -nbp +axD buH -tdI -pZn -iTF -luv -luv -izR -vsb -kFR -pba -lLp -pWP -jxk -idS -lLp -aml -bfj -rii -ftr -rii +pnT +sCY +qpf +bPj +pnT +hiV +wvf +pnT +qvO +wvf +pnT +nDc +wvf +hFE +sSZ +rSd +xBg tBg -gFi -bGu -pBg -jdg +rii +rSd +rSd +seH +kSK +uPa vwu -nUS -aIo +kSK +qCu aml -uHe +ukS dMX dMX ouV @@ -55803,7 +56420,7 @@ cYM mHx rZY uob -vky +aIk rZY hgE hgE @@ -55898,35 +56515,35 @@ vNy sDY qYv buH -tdI -pZn -iTF -abL -luv -izR -erN -vsb +pnT +uih +vWS +pnT +pnT +iFM +hzO +pnT kwn -qcH -ecn +hzO +pnT vXz hzO -lLp -aml +hFE +hFE yiU -rSV -oBA +hFE +hFE gcn -fxo -esT -xlo -nEg -mWf rSd -eZl -oGP -rhQ -jGC +rSd +seH +hGe +hFE +wva +eTk +hFE +aml +uHe dMX dMX ouV @@ -55997,7 +56614,7 @@ cYM mHx rZY uob -fLU +aIk rZY hgE hgE @@ -56090,37 +56707,37 @@ pfT pfT toa sDY -pOR +mBD buH -tdI -pZn -iTF -iTF -iTF -iTF -jiM -feR -uCg -lLp -lLp -lLp -lLp -lLp -aml -rmQ +pnT +xJP +bKl +rIK +uBa +tGS +snM +she +tGS +snM +pUI +tGS +iFA +tgm +qOe +bKl roa -lBS -aml -hFE -ulr +rSd +dWU +rSd +rSd seH -kSK -uPa -xTV -und -qCu -aml -hTu +bmR +hFE +rul +rul +hFE +dMX +uHe dMX dMX dMX @@ -56181,9 +56798,9 @@ pVU pVU pVU eHL -eir -fLU -fLU +aIk +aIk +aIk oXj cYM cYM @@ -56191,7 +56808,7 @@ cYM rZY rZY uob -fLU +aIk rZY hgE hgE @@ -56284,41 +56901,41 @@ qtZ qtZ gKx sDY -pOR +mBD buH -tdI -pZn -iTF -lHI -lHI -glj -erN -eoU -nIQ -tHW -prD -koh -bPJ -rSd -mWf -rSd -khf -eZl -pma -iQT -jBw +pnT +lbY +xPa +hPd +xyy +gQC +gQC +snU +gQC +gQC +gGC +tnA +pys +bKl +bKl +bKl +roa +lJl +dWU +vrP +vwu nUE qIr hFE -rul -rul +xEf +xEf hFE -aml -uHe dMX +uHe dMX dMX dMX +gvB bXZ sII enu @@ -56385,7 +57002,7 @@ gQl eHL ygX uob -fLU +aIk rZY hgE hgE @@ -56478,34 +57095,34 @@ hVY hVY wxq sDY -nbp +axD buH -tdI -pZn -iTF -nRV -vLm -iTF -pgK -ejq -qCL -bQs -mmi -irQ -evU -nmA -wIz -jkz -eFH -sTF -xXG -suf +pnT +pnT +uvs +jya +ejz +qls +gcW +gcW +gcW +gcW +gcW +qFO +pys +bKl +bKl +pAU +hFE +dtA +erN +hFE gKJ -iEy +seH aUS hFE -xEf -xEf +hFE +hFE hFE dMX jJW @@ -56579,7 +57196,7 @@ oQb oQb oQb vST -fLU +aIk rZY hgE hgE @@ -56672,27 +57289,27 @@ bqE hVY qkQ sDY -nbp +axD buH -tdI -pZn -iTF -iTF -iTF -iTF -xMr -iWv -whP -llC -llC -jrX -llC -llC -aml -rmQ -fcI -aml -aml +pnT +wvw +eIt +bRw +trx +eBk +qGN +gcW +gcW +gcW +gcW +qFO +lCd +tGS +tGS +oux +xNr +tGS +oFc nqs nqs sku @@ -56766,14 +57383,14 @@ gsm kFo kFo jnd -fLU +aIk tTu -fLU -fLU -fLU -fLU -fLU -fLU +aIk +aIk +aIk +aIk +aIk +aIk rZY hgE hgE @@ -56866,27 +57483,27 @@ sDY eck sDY sDY -nbp +axD buH -tdI -pZn -iTF -lHI -erN -glj -uCg -oYT -kVO +pnT +cvf +flT +ouI +ibA +gQC +bIy +gcW +gcW +gcW +hsB llC -wCi -uTe -fVb -llC -ppO -wsl -elP -sWR -ppO +gQC +gQC +gQC +gQC +gQC +tnA +iUq nqs jrz iaK @@ -56919,7 +57536,7 @@ oVt dNx kbe iNE -mKA +dZn iNE dzN kbe @@ -56960,7 +57577,7 @@ fZh fZh rqe jnd -fLU +aIk tTu dAB rZY @@ -57060,27 +57677,27 @@ rRV pfT vjl sDY -nbp +axD buH -tdI -pZn -iTF -nRV -iaf -iTF -eaU -lXV -lGQ -llC -dUX -oiL -gAz -llC -fav -oWz -qRW -iwC -mIY +pnT +pnT +uvs +jya +ejz +qls +gcW +gcW +gcW +gcW +gcW +fed +gcW +gcW +gcW +gcW +gcW +iXO +cQN nqs wEf guj @@ -57154,7 +57771,7 @@ tuV nXV dHq jnd -fLU +aIk tTu eHL rZY @@ -57254,27 +57871,27 @@ egd xMJ qYD sDY -nbp +axD hik -tdI -pZn -iTF -iTF -iTF -iTF -xQG -xgh -fJY -llC -llC -llC -llC -llC -ppO -rtJ -cwk -rZr -ppO +pnT +upY +pCU +bBB +ejz +cVb +gcW +gcW +gcW +gcW +gcW +gcW +gcW +gcW +gcW +gcW +gcW +iXO +cQN nqs fOz uXB @@ -57348,9 +57965,9 @@ xwp wuY dUG jnd -vky +aIk tTu -fLU +aIk rZY hgE hgE @@ -57450,25 +58067,25 @@ pfT sDY ppr hik -tdI -pZn -iTF -erN -erN -ees -lHI -iWv -iHk -him -vyU -wDT -ygW -iTF -hFE -hFE -hFE -hmK -hFE +pnT +uoM +iOy +bKl +ejz +cVb +gcW +gcW +gcW +gcW +gcW +gcW +gcW +gcW +gcW +gcW +gcW +iXO +cQN nqs eNh nqk @@ -57542,9 +58159,9 @@ uiu rlw rlw jnd -vky +aIk tTu -vky +aIk rZY hgE hgE @@ -57642,27 +58259,27 @@ sDY sDY sDY sDY -pOR +mBD hik -tdI -pZn -iTF -nRV -maH -iTF -gvU -iWv -lHI -erN -erN -erN -erN -lHI -ulY -iTF -yeC -hQd -sWx +pnT +pRw +rOP +gFS +ejz +cVb +gcW +gcW +gcW +gcW +gcW +gcW +gcW +gcW +gcW +gcW +gcW +iXO +cQN nqs lCl cZd @@ -57695,8 +58312,8 @@ kEs uVN mjk jBF -mKA -mKA +dZn +dZn ueA ueA eal @@ -57736,9 +58353,9 @@ sJM rvd rlw jnd -fLU +aIk tTu -ium +dFT rZY hgE hgE @@ -57836,27 +58453,27 @@ upJ aMb vpu sDY -pOR +mBD buH -tdI -pZn -iTF -iTF -iTF -iTF -bmT -hCE -vsb -lHI -erN -erN -erN -erN -mMk -iTF -sfP -qIO -coC +pnT +hek +qZc +bKl +ejz +cVb +gcW +gcW +gcW +gcW +gcW +gcW +gcW +gcW +gcW +gcW +gcW +iXO +cQN nqs wEf lSE @@ -57885,8 +58502,8 @@ vRV wUt xTe rAo -mKA -mKA +dZn +dZn iNE jBF iNE @@ -57930,9 +58547,9 @@ jnd jnd jnd jnd -fLU +aIk tTu -eir +aIk rZY hgE hgE @@ -58030,27 +58647,27 @@ upJ upJ upJ chz -pOR +mBD buH -tdI -pZn -iTF -lHI -lHI -glj -erN -lHI -erN -erN -vsb -lHI -erN -rrt -gxu -iTF -gSP -hhv -hQd +pnT +rBA +uai +kDo +ejz +cVb +gcW +gcW +gcW +gcW +gcW +gcW +gcW +gcW +gcW +gcW +gcW +iXO +cQN nqs csy lSE @@ -58126,7 +58743,7 @@ oQb oQb oQb vST -fLU +aIk rZY hgE hgE @@ -58224,27 +58841,27 @@ upJ txO wtn sDY -pOR +mBD buH -tdI -pZn -iTF -nRV -vLm -iTF -lHI -ley -tyY -erN -vPL -bmG -vyU -iTF -iTF -iTF -tdI -tdI -tdI +pnT +tVQ +bKl +bKl +ejz +qls +gcW +gcW +gcW +gcW +gcW +gcW +gcW +gex +gcW +gcW +gcW +sFJ +rtc nqs nqs eNr @@ -58277,7 +58894,7 @@ ydA ydA nKh adJ -mKA +dZn rAo ueA poK @@ -58296,31 +58913,31 @@ hEu eeN mQx rZY -fLU -fLU +aIk +aIk +ccj +aIk +aIk +aIk ccj -fLU -vky -fLU -maP -fLU -vky -fLU -fLU -fLU -fLU -fLU -fLU -fLU -fLU +aIk +aIk +aIk +aIk +aIk +aIk +aIk +aIk +aIk +aIk ccj -fLU -vky -fLU -fLU -fLU -fLU -fLU +aIk +aIk +aIk +aIk +aIk +aIk +aIk rZY hgE hgE @@ -58418,29 +59035,29 @@ sDY sDY sDY sDY -pOR +mBD buH -tdI -pZn -iTF -iTF -iTF -iTF -glj -iTF -iTF -hdy -iTF -iTF -iTF -iTF -pZn -pZn -pZn -tdI -dMX -dMX -dMX +pnT +iwn +bKl +bKl +ejz +cVb +gcW +gcW +gcW +gcW +gcW +gcW +hsB +cSI +qzy +qzy +qzy +uhV +xJK +fRT +vFf mpF dMX dMX @@ -58612,29 +59229,29 @@ hgE hgE hgE gTC -pOR +mBD buH -tdI -pZn -pZn -iTF -mJO -lHI -erN -iTF -fae -erN -tXC -iTF -pZn -pZn -pZn -tdI -tdI -tdI -dMX -cFW -cFW +pnT +wuy +bKl +bKl +ejz +cVb +gcW +gcW +gcW +gcW +gcW +gcW +gcW +wgs +sPu +sPu +sPu +pnT +muR +pnT +pnT lUJ jAY jAY @@ -58691,12 +59308,12 @@ vAz fJB xBA kbe -fLU -fLU -fLU -fLU -fLU -fLU +aIk +aIk +aIk +aIk +aIk +aIk mTF rZY jhM @@ -58704,9 +59321,9 @@ byi eHL dqb eHL -fLU -fLU -fLU +aIk +aIk +aIk rZY hgE hgE @@ -58806,29 +59423,29 @@ hgE hgE hgE gTC -pOR +mBD buH -tdI -tdI -pZn -iTF -cCK -aBy -rkg +pnT +peQ +yeR +yeR +ejz +cVb +gcW +gcW +gcW +gcW +gcW +gcW +gcW +wgs +sPu +aGe +nFg +hyP +aCj iTF -aVt -dCR -acE -iTF -pZn -kzX -tdI -tdI -hmF -dMX -dMX -dMX -dMX +pnT dMX dMX dMX @@ -58890,16 +59507,16 @@ hGO iGc iGc fVM -fLU -fLU +aIk +aIk gFo -fLU -fLU -fLU -fLU -fLU -fLU -fLU +aIk +aIk +aIk +aIk +aIk +aIk +aIk dFT rZY hgE @@ -59002,30 +59619,30 @@ gTC gTC qYv buH -pOR -tdI -pZn -iTF -iTF -iTF -iTF -iTF -iTF -iTF -iTF -iTF -pZn -kzX -wGU -ouV -ouV -dMX -dMX -dMX -dMX -dMX +pnT +ygq +yeR +yeR +ejz +cVb +gcW +gcW +gcW +gcW +gcW +gcW +gcW +wgs +sPu +rXW +vbY +oDu +hVB +ubi +pnT dMX dMX +gvB tdI dMX mol @@ -59079,13 +59696,13 @@ vAz ier qqU kbe -fLU +aIk dYp tjd tjd gpn -fLU -fLU +aIk +aIk rZY rZY rZY @@ -59193,30 +59810,30 @@ hgE hgE hgE gTC -pOR -pOR +mBD +mBD buH -pOR -kzX -pZn -pZn -pZn -pZn -pZn -pZn -pZn -pZn -pZn -pZn -pZn -kzX -oxY -dob -iFG -dMX -dMX -dMX -dMX +pnT +pYS +uwf +kbG +vMy +qls +gcW +gcW +gcW +gcW +gcW +gcW +cpb +wgs +sPu +qMD +upE +bDe +luX +wjk +pnT dMX dMX dMX @@ -59273,12 +59890,12 @@ sNo bUV mnd kbe -fLU +aIk wUp tjd tjd xre -fLU +aIk nkz rZY hgE @@ -59387,30 +60004,30 @@ gzd gzd hgE gTC -pOR -pOR +mBD +mBD buH -pOR -kzX -kzX -kzX -kzX -kzX -kzX -kzX -kzX -kzX -kzX -kzX -kzX -kzX -tdI -tdI -tdI -tdI -dMX -dMX -dMX +pnT +pnT +pnT +pnT +pnT +pnT +pnT +pnT +pnT +pnT +pnT +pnT +pnT +eeH +pnT +pnT +pnT +pnT +pnT +pnT +pnT dMX dMX dMX @@ -59460,19 +60077,19 @@ rDi rDi sIP wBu -mKA -mKA +dZn +dZn vAz vAz tLG lJY kbe -fLU +aIk oWp ook ook awp -fLU +aIk fIR rZY hgE @@ -59581,7 +60198,7 @@ gzd gzd hgE gTC -nbp +axD buH buH buH @@ -59602,7 +60219,7 @@ awP awP awP snT -snT +rnG snT snT snT @@ -59637,11 +60254,11 @@ kIO smQ rmO tFN -mKA -mKA +dZn +dZn iNE hdi -tXc +iNE agE eWC kbe @@ -59661,12 +60278,12 @@ vAz xrC iEQ kbe -fLU -fLU -fLU -fLU -fLU -fLU +aIk +aIk +aIk +aIk +aIk +aIk fIR rZY hgE @@ -59775,7 +60392,7 @@ gzd hgE hgE gTC -nbp +axD gsS xve bXD @@ -59855,12 +60472,12 @@ cGn kgx dBA kbe -fLU +aIk fIR fIR fIR -fLU -fLU +aIk +aIk eKk rZY hgE @@ -60223,7 +60840,7 @@ xRb xNO lHm hdi -tXc +iNE kbe rJv rJv @@ -60378,7 +60995,7 @@ hgE hgE hgE snT -fiF +eEY oZF snT ryW @@ -60572,7 +61189,7 @@ hgE hgE hgE snT -rnG +uel oZF snT snT @@ -60756,7 +61373,7 @@ tFw eGb sHk rkh -jhW +bny jxa cBk hgE @@ -60947,7 +61564,7 @@ hgE hgE cBk cZm -mDl +eGb ftg rkh bny @@ -61193,7 +61810,7 @@ fCX iNE iNE hdi -tXc +iNE kbe hgE hgE @@ -61336,10 +61953,10 @@ hgE cBk hcE mXL -jhW +bny lHT mXL -jhW +bny cBk hgE xSV @@ -61530,9 +62147,9 @@ hgE cBk rWI mXL -jlF -vXr -jhW +cIt +lHT +bny nHc cBk hgE @@ -61578,7 +62195,7 @@ bxK pXY jeg fCX -tXc +iNE iNE hdi iNE @@ -61775,7 +62392,7 @@ fCX iNE iNE hdi -tXc +iNE kbe hgE hgE @@ -61966,7 +62583,7 @@ tjR bHO gPk fCX -tXc +iNE iNE hdi dTX @@ -62114,7 +62731,7 @@ xxZ wTT jxa koD -jlF +cIt jKI cBk toc @@ -62138,7 +62755,7 @@ xad tvX dcT cKp -vNw +nLd nLd mxM syR @@ -62305,9 +62922,9 @@ cBk cBk cBk itT -xen +iAE pDj -toj +koD mXL kVC cBk @@ -62356,8 +62973,8 @@ bbD rAo iNE iNE -tXc -tXc +iNE +iNE cPs iNE iNE @@ -62689,11 +63306,11 @@ hgE hgE cBk jgE -jlF +cIt hPe nKU mXL -jlF +cIt lje eDQ nyh @@ -63080,7 +63697,7 @@ sMS dix pKE cBk -weV +bny mXL cBk xUB @@ -63275,7 +63892,7 @@ cBk cBk cBk mXL -jhW +bny hhC xUB faL @@ -63662,7 +64279,7 @@ aCk wAc wXJ fRc -jlF +cIt ajI cBk cBk @@ -63852,15 +64469,15 @@ hgE hgE hgE cBk -xlB +aCk nAb pmJ rtX -sAz +mXL mXL cBk mXL -sAz +mXL lnK cBk hgE @@ -64050,7 +64667,7 @@ bah dSz hTB ixM -jhW +bny bah cBk bEb diff --git a/maps/rift/levels/rift-05-surface2.dmm b/maps/rift/levels/rift-05-surface2.dmm index c86b22c9364..8972d4d46df 100644 --- a/maps/rift/levels/rift-05-surface2.dmm +++ b/maps/rift/levels/rift-05-surface2.dmm @@ -21,15 +21,14 @@ /turf/simulated/floor/tiled/white, /area/medical/sleeper) "aaU" = ( -/obj/machinery/light{ - dir = 8; - light_range = 12 - }, /obj/machinery/light_switch{ dir = 8; pixel_x = -24; pixel_y = 6 }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/pool/changing_room) "aaW" = ( @@ -501,6 +500,57 @@ /obj/machinery/atmospherics/pipe/simple/visible/supply, /turf/simulated/floor/plating, /area/maintenance/medbay) +"auL" = ( +/obj/structure/table/rack/shelf/steel, +/obj/item/material/twohanded/folded_metal_chair, +/obj/item/material/twohanded/folded_metal_chair, +/obj/item/material/twohanded/folded_metal_chair, +/obj/item/material/twohanded/folded_metal_chair, +/obj/item/material/twohanded/folded_metal_chair{ + pixel_y = 5 + }, +/obj/item/material/twohanded/folded_metal_chair{ + pixel_y = 5 + }, +/obj/item/material/twohanded/folded_metal_chair{ + pixel_y = 5 + }, +/obj/item/material/twohanded/folded_metal_chair{ + pixel_y = 5 + }, +/obj/item/material/twohanded/folded_metal_chair{ + pixel_y = 10 + }, +/obj/item/material/twohanded/folded_metal_chair{ + pixel_y = 10 + }, +/obj/item/material/twohanded/folded_metal_chair{ + pixel_y = 10 + }, +/obj/item/material/twohanded/folded_metal_chair{ + pixel_y = 10 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/security/lobby) +"auX" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 1 + }, +/obj/machinery/light, +/turf/simulated/floor/tiled/steel, +/area/security/hallway) "auZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -599,9 +649,8 @@ /obj/effect/floor_decal/steeldecal/steel_decals_central1{ dir = 1 }, -/obj/machinery/light, /turf/simulated/floor/tiled/monotile, -/area/security/brig) +/area/security/hallway) "axh" = ( /obj/structure/table/reinforced, /obj/effect/floor_decal/borderfloor{ @@ -737,6 +786,13 @@ }, /turf/simulated/floor/plating, /area/maintenance/research/rnd) +"ayW" = ( +/obj/landmark/spawnpoint/job/security_officer, +/obj/structure/bed/chair/office/dark{ + dir = 8 + }, +/turf/simulated/floor/tiled/monotile, +/area/security/lobby) "aAG" = ( /obj/structure/table/reinforced, /obj/item/storage/firstaid/surgery, @@ -836,6 +892,9 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/plating, /area/maintenance/lower/medsec_maintenance) "aBR" = ( @@ -1153,6 +1212,22 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/asmaint2) +"aLU" = ( +/obj/structure/table/steel_reinforced, +/obj/machinery/door/window/brigdoor/northright{ + name = "security reception"; + req_one_access = list(1) + }, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 4; + icon_state = "pdoor0"; + id = "security_lockdown"; + name = "Security Blast Doors"; + opacity = 0 + }, +/turf/simulated/floor/tiled/steel, +/area/security/lobby) "aMU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -1316,10 +1391,10 @@ old_wall = 1 }, /turf/simulated/floor/maglev{ + desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"; dir = 8; icon_state = "maglevup"; - name = "launch rail"; - desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!" + name = "launch rail" }, /area/shuttle/hammerhead/general) "aTl" = ( @@ -2063,16 +2138,6 @@ /obj/structure/cable/green, /turf/simulated/floor/tiled, /area/security/briefing_room) -"biL" = ( -/obj/machinery/papershredder, -/obj/machinery/fire_alarm/west_mount{ - pixel_x = -24 - }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 10 - }, -/turf/simulated/floor/tiled/dark, -/area/security/lobby) "bjq" = ( /obj/effect/floor_decal/techfloor{ dir = 6 @@ -2113,10 +2178,10 @@ old_wall = 1 }, /turf/simulated/floor/maglev{ + desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"; dir = 8; icon_state = "maglevup"; - name = "launch rail"; - desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!" + name = "launch rail" }, /area/shuttle/hammerhead/cockpit) "bli" = ( @@ -2179,28 +2244,40 @@ /turf/simulated/floor/tiled/steel, /area/rnd/research) "bmS" = ( -/obj/effect/paint/babyblue, /obj/spawner/window/low_wall/reinforced/electrochromic/full{ - id = "operating_theatre_2"; + id = null; spawn_grille = 0 }, +/obj/effect/paint/babyblue, /turf/simulated/floor/plating, /area/medical/surgery2) "bmY" = ( -/obj/machinery/computer/secure_data, -/obj/effect/floor_decal/borderfloorblack{ - dir = 5 +/obj/effect/floor_decal/borderfloor{ + dir = 4 }, -/obj/item/radio/intercom{ - dir = 1; - pixel_y = 24 +/obj/effect/floor_decal/corner/red/border{ + dir = 4 }, -/obj/item/radio/intercom/department/security{ - dir = 1; - pixel_y = 35 +/obj/machinery/light{ + dir = 4 }, -/turf/simulated/floor/tiled/dark, +/obj/machinery/photocopier, +/turf/simulated/floor/tiled/steel, /area/security/lobby) +"bnf" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/air_alarm{ + dir = 8; + pixel_x = 24 + }, +/turf/simulated/floor/tiled/steel, +/area/security/hallway) "bnh" = ( /obj/machinery/door/firedoor/glass{ dir = 8 @@ -2402,24 +2479,6 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/pool/changing_room) -"btj" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 4 - }, -/obj/effect/floor_decal/corner/red/bordercorner2{ - dir = 4 - }, -/obj/machinery/air_alarm{ - pixel_y = 24 - }, -/turf/simulated/floor/tiled/steel, -/area/security/brig) "btA" = ( /obj/structure/flora/pottedplant/stoutbush, /obj/effect/floor_decal/borderfloor{ @@ -2726,6 +2785,21 @@ }, /turf/simulated/floor/tiled/steel, /area/rift/station/public_garden/stairwell) +"bDn" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/turf/simulated/floor/tiled/monotile, +/area/security/lobby) "bDx" = ( /obj/effect/overlay/snow/floor, /turf/simulated/floor/plating, @@ -2804,10 +2878,10 @@ dir = 4 }, /turf/simulated/floor/maglev{ + desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"; dir = 8; icon_state = "maglevup"; - name = "launch rail"; - desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!" + name = "launch rail" }, /area/shuttle/hammerhead/general) "bFQ" = ( @@ -2847,6 +2921,12 @@ }, /turf/simulated/floor, /area/maintenance/substation/cafeteria_dock) +"bHa" = ( +/obj/effect/floor_decal/industrial/loading{ + dir = 4 + }, +/turf/simulated/floor/tiled/monodark, +/area/security/security_processing) "bHs" = ( /obj/machinery/light/small{ dir = 4 @@ -3181,21 +3261,12 @@ /turf/simulated/floor/tiled/dark, /area/security/security_processing) "bVr" = ( -/obj/machinery/door/blast/regular{ - density = 0; - dir = 4; - icon_state = "pdoor0"; - id = "security_lockdown"; - name = "Security Blast Doors"; - opacity = 0 - }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/darkred, /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/plating, -/area/security/brig) +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/monotile, +/area/security/hallway) "bWd" = ( /obj/effect/floor_decal/techfloor{ dir = 10 @@ -3270,6 +3341,10 @@ }, /turf/simulated/floor/reinforced, /area/security/hammerhead_bay) +"bYE" = ( +/obj/structure/closet/firecloset, +/turf/simulated/floor/plating, +/area/maintenance/lower/medsec_maintenance) "bZj" = ( /obj/structure/bed/chair{ dir = 8 @@ -3301,18 +3376,6 @@ }, /turf/simulated/floor, /area/maintenance/substation/security) -"cbn" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 6 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 1 - }, -/turf/simulated/floor/tiled/steel, -/area/security/hallway) "cbA" = ( /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -3358,6 +3421,14 @@ "cdE" = ( /turf/simulated/floor/plating, /area/maintenance/locker) +"ceg" = ( +/obj/machinery/door/airlock/glass/security{ + name = "Holding Cell"; + req_one_access = list(1,2,4,38) + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/monodark, +/area/security/security_processing) "cem" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -3549,6 +3620,27 @@ /obj/machinery/papershredder, /turf/simulated/floor/tiled/dark, /area/security/security_processing) +"cin" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/security/hallway) "civ" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/maintenance/common, @@ -3597,7 +3689,13 @@ }, /turf/simulated/floor/tiled/steel, /area/rnd/research/researchdivision) +"cjM" = ( +/turf/simulated/floor/tiled/monotile, +/area/security/lobby) "ckC" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, /obj/effect/floor_decal/borderfloor{ dir = 8 }, @@ -3610,12 +3708,11 @@ /obj/effect/floor_decal/corner/red/bordercorner2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, /turf/simulated/floor/tiled/steel, -/area/security/brig) +/area/security/hallway) "ckI" = ( /turf/simulated/wall/prepainted, /area/maintenance/substation/cafeteria_dock) @@ -3943,21 +4040,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/steel, /area/rnd/research/researchdivision) -"cxh" = ( -/obj/machinery/photocopier, -/obj/machinery/light{ - dir = 8; - light_range = 12 - }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 8 - }, -/obj/machinery/computer/guestpass{ - dir = 4; - pixel_x = -24 - }, -/turf/simulated/floor/tiled/dark, -/area/security/lobby) "cxu" = ( /obj/machinery/door/blast/regular{ id = "xenobiodiv3"; @@ -4122,14 +4204,13 @@ /obj/effect/floor_decal/corner/red/border{ dir = 8 }, -/obj/machinery/light{ - dir = 8; - light_range = 12 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled/steel, /area/security/hallway) "cEt" = ( @@ -4178,8 +4259,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /turf/simulated/floor/tiled/steel, /area/security/hallway) @@ -4390,20 +4470,23 @@ /turf/simulated/floor/tiled/dark, /area/security/security_equiptment_storage) "cMm" = ( -/obj/structure/table/steel, -/obj/item/folder/red{ - pixel_y = 3 - }, -/obj/item/folder/red{ - pixel_x = 3 +/obj/effect/floor_decal/borderfloor{ + dir = 4 }, -/obj/effect/floor_decal/borderfloorblack{ +/obj/effect/floor_decal/corner/red/border{ dir = 4 }, -/obj/effect/floor_decal/borderfloorblack/corner2{ +/obj/effect/floor_decal/borderfloor/corner2{ dir = 5 }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 5 + }, +/obj/machinery/camera/network/security{ + dir = 8 + }, +/obj/structure/filingcabinet/chestdrawer, +/turf/simulated/floor/tiled/steel, /area/security/lobby) "cMt" = ( /obj/structure/railing{ @@ -4456,6 +4539,15 @@ }, /turf/simulated/floor/tiled/monowhite, /area/medical/resleeving) +"cPE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled/monodark, +/area/security/security_processing) "cPP" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -4666,6 +4758,11 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/breakroom) +"cXo" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/maintenance/sec, +/turf/simulated/floor/plating, +/area/security/lobby) "cXI" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, @@ -4742,18 +4839,6 @@ /obj/machinery/light/small, /turf/simulated/floor/tiled/dark, /area/rnd/breakroom) -"dbc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/dark, -/area/security/lobby) "dbd" = ( /obj/machinery/power/apc/east_mount, /obj/structure/cable/green, @@ -4936,6 +5021,9 @@ /obj/structure/disposalpipe/trunk{ dir = 4 }, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacetwo) "djA" = ( @@ -5401,9 +5489,6 @@ /turf/simulated/wall/prepainted/medical, /area/medical/medbay_primary_storage) "dyd" = ( -/obj/machinery/door/firedoor/glass{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -5568,14 +5653,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacetwo) -"dBB" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/effect/floor_decal/industrial/loading{ - dir = 1; - pixel_y = 1 - }, -/turf/simulated/floor/tiled/monotile, -/area/security/brig) "dCz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -5660,7 +5737,6 @@ /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) "dDP" = ( -/obj/machinery/door/firedoor/glass, /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, /obj/effect/paint/darkred, /turf/simulated/floor/plating, @@ -5775,6 +5851,9 @@ /obj/item/pinpointer{ pixel_x = -8 }, +/obj/item/modular_computer/laptop/preset/custom_loadout/standard/security/hos{ + pixel_x = 5 + }, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hos) "dGm" = ( @@ -6025,6 +6104,19 @@ }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) +"dMT" = ( +/obj/machinery/door/blast/regular{ + density = 0; + dir = 4; + icon_state = "pdoor0"; + id = "security_lockdown"; + name = "Security Blast Doors"; + opacity = 0 + }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/darkred, +/turf/simulated/floor/plating, +/area/security/lobby) "dNb" = ( /obj/structure/flora/pottedplant/unusual, /obj/effect/floor_decal/borderfloor{ @@ -6094,11 +6186,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, /turf/simulated/floor/tiled/monotile, -/area/security/brig) +/area/security/hallway) "dPH" = ( /obj/machinery/light_switch{ pixel_x = 25 @@ -6154,22 +6243,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/telescience_lab/storage) -"dRG" = ( -/obj/structure/table/steel_reinforced, -/obj/machinery/door/window/brigdoor/northright{ - name = "security reception"; - req_one_access = list(1) - }, -/obj/machinery/door/blast/regular{ - density = 0; - dir = 4; - icon_state = "pdoor0"; - id = "security_lockdown"; - name = "Security Blast Doors"; - opacity = 0 - }, -/turf/simulated/floor/tiled/dark, -/area/security/lobby) "dRQ" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 10 @@ -6389,24 +6462,6 @@ /obj/structure/table/steel, /turf/simulated/floor/plating, /area/maintenance/dormitory) -"ebx" = ( -/obj/machinery/door/window/brigdoor/southleft{ - dir = 4; - id = "Cell 1"; - name = "Cell 1"; - req_access = list(2) - }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 8 - }, -/obj/effect/floor_decal/corner/red{ - dir = 6 - }, -/turf/simulated/floor/tiled/dark, -/area/security/brig) "ebM" = ( /turf/simulated/floor/tiled/white, /area/medical/reception) @@ -6443,6 +6498,29 @@ }, /turf/simulated/floor/reinforced, /area/security/hammerhead_bay) +"ecR" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 8 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 8 + }, +/obj/structure/table/steel, +/obj/machinery/photocopier/faxmachine{ + department = "Security" + }, +/obj/machinery/air_alarm{ + dir = 4; + pixel_x = -24 + }, +/turf/simulated/floor/tiled/steel, +/area/security/lobby) "edb" = ( /obj/structure/railing{ dir = 4 @@ -6455,8 +6533,7 @@ dir = 4 }, /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /turf/simulated/open, /area/rift/station/public_garden/gantry) @@ -6624,8 +6701,6 @@ /turf/simulated/floor/tiled/steel, /area/crew_quarters/sleep) "eke" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, /obj/effect/paint/darkred, /turf/simulated/floor/plating, @@ -6761,7 +6836,6 @@ /turf/simulated/wall/prepainted/science, /area/assembly/robotics) "eon" = ( -/obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/shutters{ density = 0; dir = 8; @@ -6855,7 +6929,6 @@ /area/rift/station/public_garden/gantry) "esQ" = ( /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, -/obj/machinery/door/firedoor/glass, /obj/effect/paint/darkred, /obj/structure/cable/green, /turf/simulated/floor/plating, @@ -7114,9 +7187,6 @@ "eCq" = ( /turf/simulated/floor/tiled/dark, /area/security/evidence_storage) -"eCy" = ( -/turf/simulated/wall/prepainted/security, -/area/maintenance/substation/cafeteria_dock) "eCN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -7305,6 +7375,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/white, /area/medical/surgery2) +"eJW" = ( +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/darkred, +/turf/simulated/floor/plating, +/area/security/lobby) "eKx" = ( /obj/effect/floor_decal/spline/plain{ dir = 4 @@ -7404,35 +7479,28 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/maintenance/dormitory) -"eQx" = ( -/obj/structure/table/woodentable, -/obj/machinery/microwave, -/obj/item/storage/box/donkpockets, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_1) -"eRf" = ( +"eOK" = ( /obj/effect/floor_decal/borderfloor{ - dir = 5 + dir = 10 }, /obj/effect/floor_decal/corner/red/border{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 9 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 5 + dir = 10 }, -/obj/effect/floor_decal/corner/red/bordercorner2{ - dir = 5 +/obj/structure/table/steel, +/obj/item/folder/red{ + pixel_y = 3 }, -/obj/structure/reagent_dispensers/water_cooler/full, -/obj/item/reagent_containers/glass/cooler_bottle, -/obj/machinery/holoposter{ - pixel_x = 32 +/obj/item/folder/red{ + pixel_x = 3 }, /turf/simulated/floor/tiled/steel, -/area/hallway/primary/surfacetwo) +/area/security/lobby) +"eQx" = ( +/obj/structure/table/woodentable, +/obj/machinery/microwave, +/obj/item/storage/box/donkpockets, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_1) "eRg" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 4 @@ -7732,26 +7800,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/rnd/research/researchdivision) -"eZe" = ( -/obj/structure/bed/chair/office/dark, -/obj/machinery/button/remote/airlock{ - id = "BrigFoyer"; - name = "Lobby Door Control"; - pixel_x = 24; - pixel_y = 5; - req_access = list(1) - }, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = 24; - pixel_y = -8 - }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 6 - }, -/obj/landmark/spawnpoint/job/security_officer, -/turf/simulated/floor/tiled/dark, -/area/security/lobby) "eZQ" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -7818,24 +7866,6 @@ }, /turf/simulated/floor/plating, /area/rnd/telescience_lab/chamber) -"fbe" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 8 - }, -/obj/machinery/camera/network/security{ - dir = 4 - }, -/obj/machinery/power/apc/west_mount, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "0-4" - }, -/turf/simulated/floor/tiled/steel, -/area/security/brig) "fbQ" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -7904,9 +7934,6 @@ pixel_x = -5 }, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/radio/intercom{ - pixel_y = -24 - }, /obj/structure/reagent_dispensers/peppertank{ pixel_x = -32 }, @@ -8055,18 +8082,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/warden) -"fhH" = ( -/obj/structure/table/steel, -/obj/item/storage/firstaid/regular, -/obj/effect/floor_decal/borderfloorblack{ - dir = 8 - }, -/obj/machinery/power/apc/west_mount, -/obj/structure/cable/green{ - icon_state = "0-4" - }, -/turf/simulated/floor/tiled/dark, -/area/security/lobby) "fic" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -8097,16 +8112,16 @@ /obj/effect/floor_decal/corner/red/border{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/borderfloor/corner2{ dir = 8 }, /obj/effect/floor_decal/corner/red/bordercorner2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel, -/area/security/brig) +/area/security/hallway) "fiK" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 10 @@ -8244,10 +8259,10 @@ name = "Fighter Launch Tube" }, /turf/simulated/floor/maglev{ + desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"; dir = 8; icon_state = "maglevup"; - name = "launch rail"; - desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!" + name = "launch rail" }, /area/shuttle/hammerhead/cockpit) "fof" = ( @@ -8260,24 +8275,6 @@ }, /turf/simulated/floor/plating, /area/rift/trade_shop/loading) -"foy" = ( -/obj/machinery/door/window/brigdoor/southleft{ - dir = 4; - id = "Cell 3"; - name = "Cell 3"; - req_access = list(2) - }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 8 - }, -/obj/effect/floor_decal/corner/red{ - dir = 6 - }, -/turf/simulated/floor/tiled/dark, -/area/security/brig) "foH" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, @@ -8294,10 +8291,10 @@ old_wall = 1 }, /turf/simulated/floor/maglev{ + desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"; dir = 8; icon_state = "maglevup"; - name = "launch rail"; - desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!" + name = "launch rail" }, /area/shuttle/hammerhead/general) "fqf" = ( @@ -8383,6 +8380,21 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacetwo) +"frf" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 8 + }, +/obj/machinery/computer/secure_data{ + dir = 4 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/security/lobby) "frQ" = ( /obj/structure/cable/orange{ icon_state = "1-8" @@ -8491,12 +8503,6 @@ /obj/structure/barricade, /turf/simulated/floor/outdoors/safeice/lythios43c/indoors, /area/rift/surfacebase/outside/outside2) -"fwk" = ( -/obj/machinery/door/firedoor/glass, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, -/obj/effect/paint/babyblue, -/turf/simulated/floor/plating, -/area/medical/resleeving) "fxc" = ( /obj/structure/table/steel, /obj/effect/floor_decal/borderfloorblack{ @@ -8730,8 +8736,7 @@ "fIH" = ( /obj/structure/railing, /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /turf/simulated/open, /area/rift/station/public_garden/gantry) @@ -8964,11 +8969,15 @@ "fPA" = ( /obj/effect/floor_decal/borderfloor, /obj/structure/table/steel, -/obj/item/phone, /obj/effect/floor_decal/corner/red/border, /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 6 }, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/pen, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacetwo) "fPN" = ( @@ -9086,17 +9095,14 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, /turf/simulated/floor/tiled/monotile, -/area/security/brig) +/area/security/hallway) "fSS" = ( -/obj/effect/paint/babyblue, /obj/spawner/window/low_wall/reinforced/electrochromic/full{ - id = "operating_theatre_1"; + id = null; spawn_grille = 0 }, +/obj/effect/paint/babyblue, /turf/simulated/floor/plating, /area/medical/surgery) "fTu" = ( @@ -9200,7 +9206,7 @@ "fWX" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, -/obj/machinery/vending/coffee, +/obj/structure/reagent_dispensers/water_cooler/full, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacetwo) "fXf" = ( @@ -9370,6 +9376,15 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) +"gbY" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/hallway/primary/surfacetwo) "gcE" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled/dark, @@ -9525,8 +9540,6 @@ /turf/simulated/floor/tiled/steel, /area/rift/stairwell/primary/surfacetwo) "gjq" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/red/border, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, @@ -9536,10 +9549,13 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/light, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/red/border, +/obj/effect/floor_decal/borderfloor/corner2, +/obj/effect/floor_decal/corner/red/bordercorner2, /turf/simulated/floor/tiled/steel, /area/security/hallway) "gjx" = ( @@ -9701,6 +9717,14 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel, /area/crew_quarters/pool/changing_room) +"gnQ" = ( +/obj/structure/table/steel, +/obj/item/modular_computer/tablet/preset/custom_loadout/standard/security, +/obj/item/modular_computer/tablet/preset/custom_loadout/standard/security, +/obj/item/modular_computer/tablet/preset/custom_loadout/standard/security, +/obj/item/modular_computer/tablet/preset/custom_loadout/standard/security, +/turf/simulated/floor/tiled/monotile, +/area/security/lobby) "gon" = ( /obj/effect/floor_decal/spline/plain{ dir = 8 @@ -9822,6 +9846,34 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay_primary_storage) +"grp" = ( +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/structure/table/steel, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/red/border, +/obj/item/pen/red{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/pen, +/turf/simulated/floor/tiled/steel, +/area/security/lobby) +"grI" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/security/hallway) "grT" = ( /obj/machinery/mech_recharger, /obj/mecha/combat/fighter/baron/sec/loaded{ @@ -10360,6 +10412,18 @@ }, /turf/simulated/floor/tiled, /area/rnd/telescience_lab/foyer) +"gEP" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 9 + }, +/turf/simulated/floor/tiled/steel, +/area/security/lobby) "gFl" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -10591,6 +10655,15 @@ }, /turf/simulated/floor/tiled/monotile, /area/security/hallway) +"gMG" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals_central6{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/hallway/primary/surfacetwo) "gMM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -10886,24 +10959,6 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacetwo) -"hbY" = ( -/obj/machinery/door/window/brigdoor/southleft{ - dir = 4; - id = "Cell 2"; - name = "Cell 2"; - req_access = list(2) - }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 8 - }, -/obj/effect/floor_decal/corner/red{ - dir = 6 - }, -/turf/simulated/floor/tiled/dark, -/area/security/brig) "hcy" = ( /obj/structure/table/steel, /obj/machinery/light{ @@ -10962,6 +11017,13 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacetwo) +"hdO" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/random/trash_pile, +/turf/simulated/floor/plating, +/area/maintenance/lower/medsec_maintenance) "heZ" = ( /turf/simulated/wall/prepainted/medical, /area/medical/morgue) @@ -10987,12 +11049,7 @@ /obj/item/storage/box/evidence, /obj/item/camera, /obj/effect/floor_decal/borderfloorblack, -/obj/machinery/light_switch{ - pixel_y = -24 - }, -/obj/machinery/camera/network/security{ - dir = 1 - }, +/obj/machinery/light, /turf/simulated/floor/tiled/dark, /area/security/security_processing) "hga" = ( @@ -11134,30 +11191,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/carpet/purcarpet, /area/rnd/breakroom) -"hkV" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/machinery/door_timer/cell_3{ - id = "Cell 1"; - name = "Cell 1"; - pixel_x = 32 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/steel, -/area/security/brig) "hlq" = ( /obj/structure/sign/department/medbay{ pixel_x = -32 }, /obj/structure/disposalpipe/segment, +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, /obj/effect/paint/babyblue, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ - id = "medbay outer" - }, /turf/simulated/floor/plating, /area/medical/reception) "hlW" = ( @@ -11562,16 +11602,16 @@ /turf/simulated/floor/tiled/dark, /area/security/armory/blue) "hBp" = ( -/obj/effect/floor_decal/borderfloor/corner{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 6 }, -/obj/effect/floor_decal/corner/red/bordercorner{ - dir = 8 +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/steel, -/area/security/brig) +/area/security/hallway) "hBC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 @@ -11752,6 +11792,10 @@ pixel_y = 7 }, /obj/item/pen, +/obj/item/tape_recorder{ + pixel_x = 10; + pixel_y = 2 + }, /turf/simulated/floor/tiled/red, /area/security/security_processing) "hGK" = ( @@ -11977,9 +12021,6 @@ /turf/simulated/floor/wood, /area/security/breakroom) "hLM" = ( -/obj/effect/floor_decal/steeldecal/steel_decals_central6{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -12330,19 +12371,37 @@ /turf/simulated/floor/tiled/steel, /area/holodeck_control) "hRV" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/maintenance/sec, -/turf/simulated/floor/plating, -/area/security/brig) -"hSd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 +/obj/machinery/door/firedoor/glass{ + dir = 8 }, /obj/structure/cable/green{ - icon_state = "1-2" + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/airlock/glass/security{ + name = "Security Reception"; + req_access = list(); + req_one_access = list(2,4) + }, +/turf/simulated/floor/tiled/steel, +/area/security/lobby) +"hSd" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/tiled/monotile, -/area/security/brig) +/area/security/hallway) "hSj" = ( /obj/effect/floor_decal/spline/plain, /turf/simulated/floor/tiled/freezer, @@ -12376,7 +12435,6 @@ /area/assembly/robotics) "hUf" = ( /obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/red/border, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, @@ -12387,6 +12445,11 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/status_display{ + pixel_y = -32 + }, +/obj/machinery/light, +/obj/effect/floor_decal/corner/red/border, /turf/simulated/floor/tiled/steel, /area/security/hallway) "hUs" = ( @@ -12490,10 +12553,10 @@ }, /obj/machinery/atmospheric_field_generator/perma, /turf/simulated/floor/maglev{ + desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"; dir = 8; icon_state = "maglevup"; - name = "launch rail"; - desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!" + name = "launch rail" }, /area/shuttle/hammerhead/cockpit) "hYR" = ( @@ -12563,10 +12626,10 @@ name = "Fighter Launch Tube" }, /turf/simulated/floor/maglev{ + desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"; dir = 8; icon_state = "maglevup"; - name = "launch rail"; - desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!" + name = "launch rail" }, /area/shuttle/hammerhead/cockpit) "iaY" = ( @@ -12610,16 +12673,6 @@ }, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) -"icx" = ( -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 6 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 1 - }, -/obj/structure/flora/pottedplant/fern, -/turf/simulated/floor/tiled/steel, -/area/security/brig) "idk" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -12803,7 +12856,6 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_3) "ifW" = ( -/obj/machinery/door/firedoor/glass, /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, /turf/simulated/floor/plating, /area/holodeck_control) @@ -12922,19 +12974,6 @@ }, /turf/simulated/floor/tiled/steel, /area/holodeck_control) -"ijr" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/machinery/door/blast/regular{ - density = 0; - dir = 4; - icon_state = "pdoor0"; - id = "security_lockdown"; - name = "Security Blast Doors"; - opacity = 0 - }, -/obj/effect/paint/darkred, -/turf/simulated/floor/plating, -/area/security/brig) "ijv" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -13015,9 +13054,14 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_1) -"ind" = ( -/turf/simulated/wall/r_wall/prepainted, -/area/security/range) +"imP" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/red/border, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/security/hallway) "inX" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 4 @@ -13046,6 +13090,12 @@ /obj/effect/floor_decal/borderfloorblack/corner2{ dir = 9 }, +/obj/machinery/light_switch{ + pixel_y = -24 + }, +/obj/machinery/camera/network/security{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/security/security_processing) "ioQ" = ( @@ -13088,8 +13138,8 @@ "iqw" = ( /obj/effect/floor_decal/corner_techfloor_grid/full, /obj/machinery/computer/security{ - icon_state = "computer"; - dir = 4 + dir = 4; + icon_state = "computer" }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/hammerhead/cockpit) @@ -13190,24 +13240,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/armory/blue) -"iwt" = ( -/obj/structure/closet/hydrant{ - pixel_y = 32 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 1 - }, -/obj/effect/floor_decal/corner/red/bordercorner2{ - dir = 1 - }, -/turf/simulated/floor/tiled/steel, -/area/security/hallway) "ixd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -13903,12 +13935,6 @@ /obj/effect/floor_decal/borderfloor{ dir = 4 }, -/obj/machinery/door/airlock/glass/security{ - id_tag = "BrigFoyer"; - layer = 2.8; - name = "Security"; - req_one_access = list(38,63) - }, /obj/machinery/door/blast/regular{ density = 0; dir = 4; @@ -13922,8 +13948,14 @@ }, /obj/machinery/door/firedoor/glass, /obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/glass/security{ + id_tag = "BrigFoyer"; + layer = 2.8; + name = "Security"; + req_one_access = list(38,63) + }, /turf/simulated/floor/tiled/steel, -/area/security/brig) +/area/security/hallway) "iVL" = ( /obj/structure/railing, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -14250,7 +14282,6 @@ /turf/simulated/floor/plating, /area/medical/chemistry) "jdi" = ( -/obj/machinery/door/firedoor/glass, /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, /obj/machinery/door/blast/shutters{ density = 0; @@ -14957,6 +14988,12 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/medsec_maintenance) +"jHi" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/simulated/floor/tiled/monotile, +/area/security/lobby) "jHS" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -15018,6 +15055,23 @@ /obj/machinery/atmospherics/pipe/simple/hidden/fuel, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/hammerhead/general) +"jKG" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 8 + }, +/obj/machinery/computer/security{ + dir = 4; + icon_state = "computer" + }, +/obj/machinery/air_alarm{ + dir = 4; + pixel_x = -23 + }, +/turf/simulated/floor/tiled/steel, +/area/security/lobby) "jLI" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -15097,6 +15151,12 @@ }, /turf/simulated/floor/tiled/white, /area/medical/reception) +"jMp" = ( +/obj/machinery/turnstile/exit{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/security/security_processing) "jMu" = ( /obj/machinery/light, /turf/simulated/floor/tiled/steel, @@ -15235,19 +15295,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/medical/morgue) -"jQM" = ( -/obj/structure/filingcabinet/chestdrawer{ - pixel_y = 16 - }, -/obj/structure/extinguisher_cabinet{ - dir = 4; - pixel_x = -30 - }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/security/lobby) "jQP" = ( /obj/structure/table/reinforced, /obj/effect/floor_decal/borderfloor, @@ -15306,7 +15353,6 @@ name = "Pen 8 Blast Doors"; opacity = 0 }, -/obj/machinery/door/firedoor, /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/effect/paint/purplegray, /turf/simulated/floor/reinforced, @@ -15561,14 +15607,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/armory/blue) -"jZN" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/railing{ - dir = 8 - }, -/obj/machinery/floodlight, -/turf/simulated/floor/plating, -/area/maintenance/locker) "kap" = ( /obj/machinery/button/remote/blast_door{ id = "armorytactical"; @@ -15713,8 +15751,6 @@ /turf/simulated/floor/tiled/steel, /area/maintenance/medbay) "keC" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, /obj/effect/paint/darkred, /turf/simulated/floor/plating, @@ -16187,24 +16223,24 @@ /turf/simulated/floor/tiled/white, /area/security/security_bathroom) "ksX" = ( -/obj/machinery/holoposter{ - pixel_x = -32 - }, /obj/effect/floor_decal/borderfloor{ - dir = 9 + dir = 5 }, /obj/effect/floor_decal/corner/red/border{ - dir = 9 + dir = 5 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 10 + dir = 5 }, /obj/effect/floor_decal/corner/red/bordercorner2{ - dir = 10 + dir = 5 + }, +/obj/machinery/vending/coffee, +/obj/machinery/light{ + dir = 1 }, -/obj/structure/flora/pottedplant/minitree, /turf/simulated/floor/tiled/steel, -/area/security/hallway) +/area/hallway/primary/surfacetwo) "ksY" = ( /obj/machinery/door/airlock/engineering{ name = "Security Substation"; @@ -16327,9 +16363,6 @@ }, /turf/simulated/floor/tiled/steel, /area/rnd/research/researchdivision) -"kvg" = ( -/turf/simulated/wall/r_wall/prepainted/security, -/area/security/brig) "kvr" = ( /turf/simulated/wall/r_wall/prepainted/security, /area/rift/station/fighter_bay/transport_tunnel_garage_maint) @@ -16396,6 +16429,24 @@ }, /turf/simulated/floor/wood, /area/rift/station/public_garden/gantry) +"kxd" = ( +/obj/effect/floor_decal/steeldecal/steel_decals_central1{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/security/hallway) "kxv" = ( /obj/effect/floor_decal/spline/plain{ dir = 1 @@ -16473,24 +16524,16 @@ /turf/simulated/floor/tiled/white, /area/medical/sleeper) "kzS" = ( -/obj/machinery/door_timer/cell_3{ - pixel_x = 32 - }, /obj/effect/floor_decal/borderfloor{ dir = 4 }, /obj/effect/floor_decal/corner/red/border{ dir = 4 }, -/obj/machinery/door/airlock/glass/security{ - layer = 2.8; - name = "Security"; - req_one_access = list(1,38) - }, -/obj/machinery/door/firedoor/glass, /obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel, -/area/security/brig) +/area/security/hallway) "kAt" = ( /obj/structure/cable/green{ icon_state = "1-8" @@ -16642,7 +16685,6 @@ /area/security/range) "kGz" = ( /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, -/obj/machinery/door/firedoor/glass, /obj/effect/paint/darkred, /obj/structure/cable/green{ icon_state = "0-8" @@ -16726,6 +16768,15 @@ }, /turf/simulated/floor/tiled/white, /area/medical/sleeper) +"kLx" = ( +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/security/lobby) "kMg" = ( /obj/spawner/window/low_wall/full/nogrille/firelocks, /turf/simulated/floor/plating, @@ -17353,8 +17404,6 @@ /turf/simulated/floor/tiled, /area/security/briefing_room) "laa" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/locker) @@ -17702,17 +17751,8 @@ /turf/simulated/floor/tiled/dark, /area/security/armory/blue) "llM" = ( -/obj/machinery/computer/security, -/obj/item/radio/intercom{ - dir = 1; - pixel_y = 24 - }, -/obj/machinery/camera/network/security, -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark, -/area/security/lobby) +/turf/simulated/floor/tiled/monodark, +/area/security/security_processing) "llR" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -17800,10 +17840,10 @@ old_wall = 1 }, /turf/simulated/floor/maglev{ + desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"; dir = 8; icon_state = "maglevup"; - name = "launch rail"; - desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!" + name = "launch rail" }, /area/shuttle/hammerhead/cockpit) "lqA" = ( @@ -18095,7 +18135,6 @@ /turf/simulated/floor/plating, /area/maintenance/security/upper) "lAW" = ( -/obj/machinery/door/firedoor/glass, /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -18105,6 +18144,15 @@ }, /turf/simulated/floor/plating, /area/holodeck_control) +"lBj" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/monodark, +/area/security/security_processing) "lBx" = ( /obj/effect/floor_decal/borderfloor/corner, /obj/effect/floor_decal/corner/lightorange/bordercorner, @@ -18270,8 +18318,7 @@ dir = 4 }, /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /turf/simulated/floor/tiled/steel, /area/security/hammerhead_bay) @@ -18367,16 +18414,6 @@ }, /turf/simulated/floor/tiled/steel, /area/crew_quarters/heads/hor) -"lIf" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 1 - }, -/obj/structure/bed/chair, -/turf/simulated/floor/tiled/steel, -/area/hallway/primary/surfacetwo) "lIF" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -18389,17 +18426,7 @@ /turf/simulated/floor/plating, /area/maintenance/dormitory) "lIZ" = ( -/obj/machinery/door/firedoor/glass, /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, -/obj/machinery/door/blast/shutters{ - density = 0; - dir = 2; - icon_state = "shutter0"; - id = "research_shutter_int"; - name = "Research shutter"; - opacity = 0 - }, -/obj/effect/paint/purplegray, /turf/simulated/floor/plating, /area/rnd/research) "lJq" = ( @@ -18486,12 +18513,6 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/security/upper) -"lNl" = ( -/obj/structure/toilet{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/security/brig) "lNm" = ( /obj/structure/curtain/open/bed{ name = "brown curtain"; @@ -18552,7 +18573,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass/security{ name = "Firing Range"; req_one_access = list(1,2,4) @@ -18560,6 +18580,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/steel, /area/security/range) "lOg" = ( @@ -18899,8 +18922,8 @@ dir = 8 }, /obj/effect/floor_decal/industrial/warning{ - icon_state = "warning"; - dir = 9 + dir = 9; + icon_state = "warning" }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/hammerhead/general) @@ -18987,6 +19010,13 @@ }, /turf/simulated/floor/wood, /area/tether/surfacebase/reading_room) +"mao" = ( +/obj/random/trash_pile, +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/medsec_maintenance) "maJ" = ( /obj/structure/bed/chair{ dir = 8 @@ -19232,23 +19262,6 @@ }, /turf/simulated/floor/tiled/monowhite, /area/medical/sleeper) -"mix" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/red/border, -/obj/effect/floor_decal/borderfloor/corner2, -/obj/effect/floor_decal/corner/red/bordercorner2, -/obj/machinery/light, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/red/bordercorner2{ - dir = 9 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled/steel, -/area/security/hallway) "miH" = ( /obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -19289,6 +19302,12 @@ }, /turf/simulated/floor/tiled/monotile, /area/security/security_lockerroom) +"mjR" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/monotile, +/area/security/lobby) "mjV" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 1 @@ -19554,7 +19573,6 @@ /area/crew_quarters/pool) "mqC" = ( /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, -/obj/machinery/door/firedoor/glass, /obj/effect/paint/darkred, /obj/structure/cable/green{ icon_state = "0-2" @@ -19607,7 +19625,6 @@ /turf/simulated/floor/tiled/white, /area/medical/surgery_hallway) "mrZ" = ( -/obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass/security{ layer = 2.8; name = "EVA Operations"; @@ -19622,6 +19639,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/steel, /area/security/evastorage) "msb" = ( @@ -19654,6 +19674,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/plating, /area/security/hammerhead_bay) "mua" = ( @@ -19709,10 +19732,10 @@ name = "Fighter Launch Tube" }, /turf/simulated/floor/maglev{ + desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"; dir = 8; icon_state = "maglevup"; - name = "launch rail"; - desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!" + name = "launch rail" }, /area/shuttle/hammerhead/cockpit) "mvo" = ( @@ -19791,6 +19814,9 @@ pixel_y = 26; req_access = list(1) }, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/tiled/red, /area/security/security_processing) "mzD" = ( @@ -19863,9 +19889,6 @@ /turf/simulated/floor/tiled/techfloor, /area/shuttle/hammerhead/general) "mAG" = ( -/obj/machinery/door/firedoor/glass{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, @@ -20287,7 +20310,7 @@ /turf/simulated/floor/tiled, /area/rnd/telescience_lab/foyer) "mJx" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, /obj/effect/paint/darkred, /turf/simulated/floor/plating, /area/security/hallway) @@ -20309,17 +20332,23 @@ }, /turf/simulated/floor/tiled, /area/rnd/telescience_lab/storage) -"mLK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +"mLV" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/effect/floor_decal/corner/red/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner2{ dir = 6 }, -/obj/structure/cable/green{ - icon_state = "1-4" +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 6 }, -/turf/simulated/floor/tiled/dark, +/obj/machinery/power/apc/east_mount, +/obj/structure/cable/green, +/obj/machinery/papershredder, +/turf/simulated/floor/tiled/steel, /area/security/lobby) "mMs" = ( /obj/effect/floor_decal/borderfloor{ @@ -20386,6 +20415,31 @@ /obj/random/trash_pile, /turf/simulated/floor/plating, /area/maintenance/dormitory) +"mOm" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 10 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 1 + }, +/obj/machinery/holoposter{ + pixel_x = -32 + }, +/obj/structure/flora/pottedplant/minitree, +/turf/simulated/floor/tiled/steel, +/area/security/hallway) "mPu" = ( /obj/structure/closet/secure_closet/guncabinet/robotics, /turf/simulated/floor/tiled/steel_ridged, @@ -20620,6 +20674,36 @@ /obj/item/gun/ballistic/deagle/taj, /turf/simulated/floor/wood, /area/crew_quarters/heads/hos) +"mVF" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/item/radio/intercom{ + dir = 1; + pixel_y = 24 + }, +/obj/item/radio/intercom/department/security{ + dir = 1; + pixel_y = 35 + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 4 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/security/lobby) "mWB" = ( /turf/simulated/wall/r_wall/prepainted/security, /area/security/security_lockerroom) @@ -20667,6 +20751,10 @@ /obj/machinery/light_construct, /turf/simulated/floor/plating, /area/maintenance/medbay) +"mXv" = ( +/obj/structure/railing, +/turf/simulated/floor/plating, +/area/maintenance/lower/medsec_maintenance) "mXw" = ( /obj/machinery/door/firedoor/glass{ dir = 4 @@ -20707,21 +20795,14 @@ /turf/simulated/floor/plating, /area/maintenance/lower/medsec_maintenance) "mYE" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 6 - }, -/obj/structure/table/steel, -/obj/effect/floor_decal/corner/red/border{ - dir = 6 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 6 - }, -/obj/effect/floor_decal/corner/red/bordercorner2{ - dir = 6 +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/red/border, +/obj/machinery/air_alarm{ + dir = 1; + pixel_y = -24 }, -/obj/structure/closet/hydrant{ - pixel_x = 32 +/obj/structure/bed/chair{ + dir = 1 }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacetwo) @@ -20805,15 +20886,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/assembly/robotics) -"ncH" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloorblack/corner2{ - dir = 6 - }, -/turf/simulated/floor/tiled/dark, -/area/security/lobby) "ncO" = ( /obj/structure/table/rack/shelf/steel, /obj/effect/floor_decal/borderfloorblack{ @@ -20993,6 +21065,9 @@ /obj/effect/floor_decal/spline/plain, /turf/simulated/floor/wood, /area/crew_quarters/heads/hor) +"niy" = ( +/turf/simulated/floor/outdoors/safeice/lythios43c/indoors, +/area/security/prison) "niV" = ( /obj/structure/table/wooden_reinforced, /obj/machinery/computer/skills, @@ -21020,6 +21095,17 @@ /obj/structure/disposalpipe/trunk, /turf/simulated/floor/tiled/white, /area/medical/medbay_primary_storage) +"nkq" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 6 + }, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/closet/secure_closet/genpop, +/turf/simulated/floor/tiled/dark, +/area/security/security_processing) "nkD" = ( /obj/machinery/holopad, /turf/simulated/floor/tiled/monotile, @@ -21030,6 +21116,10 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/breakroom) +"nkM" = ( +/obj/structure/bed/chair/office/dark, +/turf/simulated/floor/tiled/monotile, +/area/security/lobby) "nmy" = ( /obj/effect/floor_decal/techfloor{ dir = 1 @@ -21150,6 +21240,13 @@ }, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) +"nrr" = ( +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4, +/turf/simulated/floor/tiled/steel, +/area/security/lobby) "nrE" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -21400,16 +21497,6 @@ }, /turf/simulated/floor/tiled/steel, /area/security/hammerhead_bay) -"nxD" = ( -/obj/effect/floor_decal/steeldecal/steel_decals_central1, -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/monotile, -/area/security/brig) "nxY" = ( /turf/simulated/wall/r_wall/prepainted, /area/crew_quarters/coffee_shop) @@ -21631,6 +21718,32 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/lower/medsec_maintenance) +"nDY" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 5 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 5 + }, +/obj/structure/extinguisher_cabinet{ + dir = 8; + pixel_x = 30 + }, +/turf/simulated/floor/tiled/steel, +/area/security/hallway) "nEg" = ( /obj/machinery/camera/network/research/xenobio{ dir = 4; @@ -21751,6 +21864,22 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/monotile, /area/medical/reception) +"nJI" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 6 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 6 + }, +/turf/simulated/floor/tiled/steel, +/area/security/hallway) "nJT" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 4 @@ -21835,18 +21964,52 @@ /turf/simulated/floor/tiled/monotile, /area/rnd/workshop) "nMi" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/darkred, -/turf/simulated/floor/plating, -/area/security/brig) +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 8 + }, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/closet/secure_closet/genpop, +/turf/simulated/floor/tiled/dark, +/area/security/security_processing) "nMq" = ( -/obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass/security{ name = "Firing Range"; req_one_access = list(1,2,4) }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/steel, /area/security/range) +"nMx" = ( +/obj/machinery/button/remote/airlock{ + id = "BrigFoyer"; + name = "Lobby Door Control"; + pixel_x = 24; + pixel_y = 5; + req_access = list(1) + }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = 24; + pixel_y = -8 + }, +/obj/structure/bed/chair/office/dark, +/obj/landmark/spawnpoint/job/security_officer, +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 6 + }, +/turf/simulated/floor/tiled/steel, +/area/security/lobby) "nNb" = ( /obj/effect/floor_decal/borderfloor{ dir = 5 @@ -21895,9 +22058,6 @@ /obj/effect/floor_decal/corner/red/border{ dir = 9 }, -/obj/machinery/photocopier/faxmachine{ - department = "Security" - }, /turf/simulated/floor/tiled, /area/security/briefing_room) "nOt" = ( @@ -21929,15 +22089,19 @@ /turf/simulated/floor/plating, /area/maintenance/lower/medsec_maintenance) "nQn" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, -/obj/effect/floor_decal/corner/red/border{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 10 }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, -/area/security/brig) +/area/security/hallway) "nRi" = ( /obj/effect/floor_decal/borderfloorblack/cee{ alpha = 255; @@ -22356,6 +22520,14 @@ /obj/item/reagent_containers/blood/OMinus, /turf/simulated/floor/tiled/white, /area/medical/surgery2) +"ocm" = ( +/obj/structure/table/steel, +/obj/item/modular_computer/laptop/preset/custom_loadout/standard/security, +/obj/item/modular_computer/laptop/preset/custom_loadout/standard/security, +/obj/item/modular_computer/laptop/preset/custom_loadout/standard/security, +/obj/item/modular_computer/laptop/preset/custom_loadout/standard/security, +/turf/simulated/floor/tiled/monotile, +/area/security/lobby) "ocv" = ( /turf/simulated/floor/tiled/monotile, /area/assembly/robotics) @@ -22388,6 +22560,21 @@ }, /turf/simulated/floor/tiled/white, /area/medical/surgery) +"odA" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 6 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 6 + }, +/turf/simulated/floor/tiled/steel, +/area/security/lobby) "odF" = ( /obj/structure/table/steel, /obj/random/maintenance/clean, @@ -22429,7 +22616,6 @@ /turf/simulated/floor/carpet, /area/security/warden) "ofr" = ( -/obj/machinery/door/firedoor/glass, /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, /obj/machinery/door/blast/shutters{ density = 0; @@ -22474,6 +22660,15 @@ }, /turf/simulated/floor/plating, /area/shuttle/hammerhead/general) +"ogI" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/red/border, +/obj/machinery/light, +/obj/machinery/computer/security{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/security/lobby) "ohi" = ( /obj/structure/symbol/sa, /turf/simulated/wall/r_wall/prepainted, @@ -22554,12 +22749,16 @@ /turf/simulated/floor/tiled/white, /area/medical/surgeryprep) "oji" = ( -/obj/structure/table/steel, -/obj/machinery/light/small{ +/obj/effect/floor_decal/borderfloorblack{ dir = 4 }, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/closet/secure_closet/genpop, /turf/simulated/floor/tiled/dark, -/area/security/brig) +/area/security/security_processing) "ojJ" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -22575,6 +22774,17 @@ }, /turf/simulated/floor/tiled/steel, /area/security/hallway) +"okK" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 10 + }, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/closet/secure_closet/genpop, +/turf/simulated/floor/tiled/dark, +/area/security/security_processing) "olp" = ( /obj/structure/table/glass, /obj/machinery/recharger, @@ -22614,6 +22824,11 @@ /obj/random/medical/lite, /turf/simulated/floor/plating, /area/maintenance/asmaint2) +"ooG" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/structure/curtain/open/black, +/turf/simulated/floor/tiled/dark, +/area/security/security_processing) "opb" = ( /obj/structure/table/steel, /obj/item/storage/box/masks{ @@ -22800,14 +23015,7 @@ /area/assembly/chargebay) "owT" = ( /obj/effect/floor_decal/borderfloorblack{ - dir = 9 - }, -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/extinguisher_cabinet{ - dir = 4; - pixel_x = -30 + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/security/security_processing) @@ -23075,7 +23283,7 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/Dorm_4) "oFb" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, /obj/effect/paint/babyblue, /turf/simulated/floor/plating, /area/medical/resleeving) @@ -23194,9 +23402,6 @@ /area/rnd/telescience_lab/foyer) "oLy" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central1, -/obj/machinery/light{ - dir = 1 - }, /turf/simulated/floor/tiled/monotile, /area/hallway/primary/surfacetwo) "oLJ" = ( @@ -23459,13 +23664,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay_primary_storage) -"oSh" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/red/border, -/obj/effect/floor_decal/borderfloor/corner2, -/obj/effect/floor_decal/corner/red/bordercorner2, -/turf/simulated/floor/tiled/steel, -/area/security/brig) "oSn" = ( /obj/machinery/disposal, /obj/machinery/light{ @@ -23495,8 +23693,8 @@ dir = 4 }, /obj/effect/floor_decal/industrial/warning{ - icon_state = "warning"; - dir = 6 + dir = 6; + icon_state = "warning" }, /obj/effect/floor_decal/sign/dock/two, /turf/simulated/floor/tiled/techmaint, @@ -23538,6 +23736,20 @@ }, /turf/simulated/floor/tiled/monotile, /area/security/security_lockerroom) +"oTT" = ( +/obj/structure/table/steel, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 8 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/security/lobby) "oUb" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -23669,9 +23881,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals_central1{ dir = 8 }, -/obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/maintenance/common, -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, @@ -23681,6 +23891,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/steel, /area/maintenance/lower/medsec_maintenance) "oWD" = ( @@ -23739,8 +23952,12 @@ /area/crew_quarters/pool) "oXc" = ( /obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/maintenance/sec, -/turf/simulated/floor/plating, +/obj/machinery/door/airlock/glass/security/polarized{ + id_tint = "seclocker"; + name = "Locker Room"; + req_one_access = list(2) + }, +/turf/simulated/floor/tiled/steel, /area/security/security_lockerroom) "oXn" = ( /obj/effect/floor_decal/spline/plain, @@ -23892,8 +24109,8 @@ dir = 4 }, /obj/effect/floor_decal/industrial/warning{ - icon_state = "warning"; - dir = 5 + dir = 5; + icon_state = "warning" }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/hammerhead/general) @@ -24047,11 +24264,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_4) -"pge" = ( -/obj/structure/table/rack, -/obj/random/firstaid, -/turf/simulated/floor/plating, -/area/maintenance/lower/medsec_maintenance) "pgh" = ( /obj/machinery/door/airlock/engineering{ name = "Science Substation"; @@ -24125,6 +24337,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, +/obj/machinery/camera/network/security{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/security/interrogation) "pkN" = ( @@ -24232,10 +24447,6 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacetwo) -"pmi" = ( -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/security/upper) "pmF" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -24246,28 +24457,6 @@ /obj/effect/floor_decal/sign/dock/one, /turf/simulated/floor/tiled/techmaint, /area/shuttle/hammerhead/general) -"pnl" = ( -/obj/structure/table/steel, -/obj/item/storage/box/evidence, -/obj/item/pen/red{ - pixel_x = -2; - pixel_y = -2 - }, -/obj/item/pen{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/machinery/requests_console/preset/security{ - pixel_y = 30 - }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 9 - }, -/obj/machinery/newscaster{ - pixel_x = -32 - }, -/turf/simulated/floor/tiled/dark, -/area/security/lobby) "pnZ" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, @@ -24481,6 +24670,20 @@ }, /turf/simulated/floor/tiled/steel, /area/security/security_lockerroom) +"pvp" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 4 + }, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/closet/secure_closet/genpop, +/turf/simulated/floor/tiled/dark, +/area/security/security_processing) "pvE" = ( /obj/structure/table/reinforced, /obj/item/surgical/bioregen, @@ -24518,8 +24721,7 @@ dir = 1 }, /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /turf/simulated/floor/reinforced, /area/rnd/telescience_lab/chamber) @@ -24673,6 +24875,12 @@ "pBj" = ( /turf/simulated/mineral/icerock/lythios43c, /area/rift/surfacebase/outside/outside2) +"pBw" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/red/border, +/obj/structure/table/steel, +/turf/simulated/floor/tiled/steel, +/area/security/lobby) "pBz" = ( /obj/item/radio/beacon/anchored, /turf/simulated/floor/tiled/techfloor, @@ -25487,6 +25695,26 @@ }, /turf/simulated/floor/plating, /area/maintenance/dormitory) +"qiX" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/structure/table/steel, +/obj/effect/floor_decal/corner/red/border{ + dir = 6 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 6 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 6 + }, +/obj/structure/closet/hydrant{ + pixel_x = 32 + }, +/obj/item/toy/figure/secofficer, +/turf/simulated/floor/tiled/steel, +/area/hallway/primary/surfacetwo) "qjg" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -25912,15 +26140,6 @@ /obj/machinery/light, /turf/simulated/floor/water/pool, /area/triumph/surfacebase/sauna) -"qvp" = ( -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 6 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 1 - }, -/turf/simulated/floor/tiled/steel, -/area/security/brig) "qvx" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -26316,6 +26535,9 @@ dir = 1 }, /obj/structure/lattice, +/obj/structure/cable/green{ + icon_state = "32-4" + }, /turf/simulated/open, /area/maintenance/lower/medsec_maintenance) "qJa" = ( @@ -26620,8 +26842,8 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/turf/simulated/floor/tiled/dark, -/area/security/lobby) +/turf/simulated/floor/tiled/monodark, +/area/security/security_processing) "qSY" = ( /obj/machinery/air_alarm{ desc = " "; @@ -26720,9 +26942,8 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, -/area/security/brig) +/area/security/hallway) "qUt" = ( /obj/structure/closet/crate/freezer, /obj/item/nif/bad, @@ -26743,6 +26964,20 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/lower/medsec_maintenance) +"qUR" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/closet/secure_closet/genpop, +/turf/simulated/floor/tiled/dark, +/area/security/security_processing) "qVn" = ( /obj/effect/floor_decal/borderfloorwhite/corner{ dir = 8 @@ -26867,6 +27102,20 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) +"rav" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/security/hallway) "raA" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, @@ -26905,12 +27154,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/hammerhead/general) -"rba" = ( -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/medsec_maintenance) "rbb" = ( /obj/effect/floor_decal/spline/plain{ dir = 5 @@ -26950,25 +27193,20 @@ }, /turf/simulated/shuttle/wall/voidcraft/red, /area/shuttle/hammerhead/general) -"rcB" = ( -/obj/machinery/door_timer/cell_3{ - id = "Cell 2"; - name = "Cell 2"; - pixel_x = 32 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/steel, -/area/security/brig) "rcQ" = ( /obj/machinery/smartfridge/chemistry, /turf/simulated/wall/r_wall/prepainted, /area/medical/chemistry) +"rcS" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/tiled/monotile, +/area/security/lobby) "rda" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -27043,11 +27281,14 @@ /area/crew_quarters/pool) "reL" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable/green{ - icon_state = "1-2" + icon_state = "1-8" }, /turf/simulated/floor/tiled/monotile, -/area/security/brig) +/area/security/hallway) "rfv" = ( /obj/machinery/space_heater, /obj/effect/floor_decal/industrial/outline/yellow, @@ -27437,15 +27678,18 @@ /obj/effect/floor_decal/corner/red/border{ dir = 8 }, -/obj/machinery/fire_alarm/west_mount{ - pixel_x = -24 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 8 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 8 + }, /turf/simulated/floor/tiled/steel, -/area/security/brig) +/area/security/hallway) "rnP" = ( /obj/structure/catwalk, /obj/structure/cable/green{ @@ -27501,6 +27745,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/light, /turf/simulated/floor/tiled/steel, /area/security/hallway) "rrr" = ( @@ -27817,6 +28062,10 @@ /obj/effect/paint/purplegray, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) +"rDz" = ( +/obj/effect/floor_decal/borderfloorblack/corner, +/turf/simulated/floor/tiled/dark, +/area/security/security_processing) "rEg" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/maintenance/engi{ @@ -28097,20 +28346,14 @@ /obj/effect/floor_decal/borderfloor{ dir = 8 }, -/obj/machinery/door/airlock/glass/security{ - layer = 2.8; - name = "Security"; - req_one_access = list(1,38) - }, /obj/effect/floor_decal/corner/red/border{ dir = 8 }, -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel, -/area/security/brig) +/area/security/hallway) "rNb" = ( /turf/simulated/wall/prepainted/security, /area/security/security_lockerroom) @@ -28316,8 +28559,8 @@ }, /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/effect/paint/darkred, -/turf/simulated/floor/plating, -/area/security/brig) +/turf/simulated/floor/tiled/monotile, +/area/security/hallway) "rTn" = ( /turf/simulated/floor/carpet/blue, /area/security/breakroom) @@ -28327,23 +28570,21 @@ /turf/simulated/floor/tiled/monotile, /area/rnd/research) "rTT" = ( -/obj/machinery/door/airlock/glass/security{ - name = "Security Reception"; - req_access = list(); - req_one_access = list(2,4) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/door/firedoor/glass{ + dir = 8 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/machinery/door/airlock/glass/security{ + name = "Processing"; + req_one_access = list(1,2,4,38) }, -/turf/simulated/floor/tiled/monotile, -/area/security/lobby) +/turf/simulated/floor/tiled/monodark, +/area/security/security_processing) "rUn" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 5 @@ -28361,16 +28602,12 @@ /obj/effect/floor_decal/corner/red{ dir = 1 }, -/obj/machinery/camera/network/security{ - dir = 1 - }, /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 }, /turf/simulated/floor/tiled/dark, /area/security/interrogation) "rVb" = ( -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -28388,6 +28625,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/steel, /area/security/security_lockerroom) "rVf" = ( @@ -28435,6 +28675,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/medical/surgery) +"rWX" = ( +/turf/simulated/wall/r_wall/prepainted/security, +/area/security/security_processing) "rXz" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -28560,6 +28803,23 @@ }, /turf/simulated/floor/tiled/dark, /area/security/interrogation) +"sdt" = ( +/obj/structure/table/steel, +/obj/item/storage/firstaid/regular, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 10 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 10 + }, +/turf/simulated/floor/tiled/steel, +/area/security/lobby) "sdv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -28573,7 +28833,6 @@ /turf/simulated/floor/water/deep/pool, /area/crew_quarters/pool) "sdE" = ( -/obj/machinery/door/firedoor/glass, /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, /turf/simulated/floor/plating, /area/triumph/surfacebase/sauna) @@ -28605,18 +28864,6 @@ }, /turf/simulated/floor/tiled/steel, /area/rnd/research/researchdivision) -"seB" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/steel, -/area/security/brig) "seE" = ( /obj/machinery/light/no_nightshift{ dir = 8 @@ -28627,8 +28874,8 @@ pixel_x = -24 }, /obj/machinery/computer/shuttle_control/explore/hammerhead{ - icon_state = "computer"; - dir = 4 + dir = 4; + icon_state = "computer" }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/hammerhead/cockpit) @@ -28686,17 +28933,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay_primary_storage) -"shx" = ( -/obj/structure/bed/chair/office/dark{ - dir = 1 - }, -/obj/landmark/spawnpoint/job/security_officer, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/obj/structure/cable/green{ - icon_state = "2-8" - }, -/turf/simulated/floor/tiled/dark, -/area/security/lobby) "siA" = ( /turf/simulated/wall/prepainted/science, /area/rnd/research/researchdivision) @@ -28859,15 +29095,9 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_2) "soJ" = ( -/obj/item/paper_bin{ - pixel_x = -3; - pixel_y = 7 - }, -/obj/structure/table/steel, -/obj/item/pen, /obj/effect/floor_decal/borderfloorblack, /turf/simulated/floor/tiled/dark, -/area/security/lobby) +/area/security/security_processing) "spg" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/reinforced, @@ -29052,8 +29282,7 @@ /area/rift/station/public_garden/gantry) "sxp" = ( /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /turf/simulated/floor/reinforced, /area/rnd/telescience_lab/chamber) @@ -29168,9 +29397,6 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacetwo) -"szQ" = ( -/turf/simulated/floor/plating, -/area/maintenance/lower/medsec_maintenance) "sAv" = ( /obj/structure/catwalk, /obj/structure/cable/green{ @@ -29256,14 +29482,10 @@ /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "sEs" = ( -/obj/effect/floor_decal/borderfloor/corner{ +/obj/effect/floor_decal/borderfloor{ dir = 4 }, -/obj/machinery/status_display{ - pixel_x = 32; - pixel_y = 32 - }, -/obj/effect/floor_decal/corner/red/bordercorner{ +/obj/effect/floor_decal/corner/red/border{ dir = 4 }, /obj/structure/disposalpipe/segment, @@ -29357,8 +29579,7 @@ dir = 1 }, /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /turf/simulated/open, /area/rift/station/public_garden/gantry) @@ -29558,6 +29779,17 @@ /obj/effect/floor_decal/spline/plain, /turf/simulated/floor/water/pool, /area/crew_quarters/pool) +"sOJ" = ( +/obj/machinery/door/firedoor/glass{ + dir = 4 + }, +/obj/machinery/door/airlock/glass/security{ + name = "Security Reception"; + req_access = list(); + req_one_access = list(2,4) + }, +/turf/simulated/floor/tiled/steel, +/area/security/lobby) "sPc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -29940,12 +30172,6 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacetwo) -"teZ" = ( -/obj/structure/filingcabinet/chestdrawer{ - name = "Scan Records" - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/medsec_maintenance) "tfk" = ( /obj/structure/curtain/open/bed{ name = "brown curtain" @@ -30047,6 +30273,22 @@ }, /turf/simulated/floor/tiled/white, /area/medical/sleeper) +"tkZ" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 4 + }, +/obj/structure/disposalpipe/junction{ + dir = 1; + icon_state = "pipe-j2" + }, +/obj/machinery/camera/network/security{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/security/hallway) "tll" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 6 @@ -30084,19 +30326,6 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, /area/maintenance/dormitory) -"tmt" = ( -/obj/machinery/door/blast/regular{ - density = 0; - dir = 4; - icon_state = "pdoor0"; - id = "security_lockdown"; - name = "Security Blast Doors"; - opacity = 0 - }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/darkred, -/turf/simulated/floor/plating, -/area/security/lobby) "tmA" = ( /obj/structure/table/steel, /obj/item/folder/red, @@ -30149,16 +30378,6 @@ /obj/random/maintenance/research, /turf/simulated/floor/plating, /area/maintenance/asmaint2) -"toi" = ( -/obj/machinery/holopad, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/turf/simulated/floor/tiled/monotile, -/area/security/brig) "toG" = ( /obj/structure/table/steel, /obj/item/integrated_electronics/debugger{ @@ -30480,6 +30699,29 @@ }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) +"tyF" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/red/border, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 9 + }, +/turf/simulated/floor/tiled/steel, +/area/security/hallway) "tyH" = ( /obj/structure/catwalk, /turf/simulated/floor/plating, @@ -30660,12 +30902,8 @@ "tDr" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, -/obj/machinery/air_alarm{ - dir = 1; - pixel_y = -24 - }, /obj/structure/table/steel, -/obj/item/toy/figure/secofficer, +/obj/item/storage/box/cups, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacetwo) "tDY" = ( @@ -30880,6 +31118,12 @@ }, /turf/simulated/floor/tiled/steel, /area/crew_quarters/sleep) +"tJz" = ( +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/security/security_processing) "tJG" = ( /obj/machinery/door/airlock/glass/research{ name = "Telescience Wing" @@ -31172,6 +31416,28 @@ "tVG" = ( /turf/simulated/floor/plating/lythios43c, /area/rift/surfacebase/outside/outside2) +"tWm" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/steel, +/area/security/lobby) "tWJ" = ( /obj/effect/floor_decal/borderfloorblack{ alpha = 255; @@ -31239,7 +31505,6 @@ /turf/simulated/floor/plating, /area/maintenance/medbay) "tZG" = ( -/obj/machinery/door/firedoor/glass, /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, /obj/machinery/door/blast/shutters{ density = 0; @@ -31256,19 +31521,6 @@ "tZW" = ( /turf/simulated/floor, /area/maintenance/substation/security) -"tZX" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 10 - }, -/obj/structure/bed/chair, -/turf/simulated/floor/tiled/steel, -/area/hallway/primary/surfacetwo) "uax" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -31670,6 +31922,13 @@ }, /turf/simulated/floor/tiled/steel, /area/security/hallway) +"uoj" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/structure/curtain/open/black, +/turf/simulated/floor/tiled/dark, +/area/security/security_processing) "uom" = ( /turf/simulated/wall/prepainted, /area/maintenance/research/xenobio) @@ -31835,8 +32094,23 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacetwo) +"uxa" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/security/hallway) "uxm" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -31990,6 +32264,15 @@ /obj/landmark/spawnpoint/job/scientist, /turf/simulated/floor/tiled/monotile, /area/rnd/research) +"uEK" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/red/border, +/obj/structure/bed/chair{ + dir = 1 + }, +/obj/machinery/light, +/turf/simulated/floor/tiled/steel, +/area/hallway/primary/surfacetwo) "uFa" = ( /obj/effect/floor_decal/spline/plain{ dir = 1 @@ -32175,11 +32458,26 @@ /turf/simulated/floor/tiled/steel, /area/rnd/research/researchdivision) "uLD" = ( -/obj/machinery/light/small{ +/obj/effect/floor_decal/borderfloor{ dir = 1 }, -/turf/simulated/floor/plating, -/area/maintenance/lower/medsec_maintenance) +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/structure/table/steel, +/obj/machinery/recharger{ + pixel_x = 5; + pixel_y = 3 + }, +/obj/machinery/recharger{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/turf/simulated/floor/tiled/steel, +/area/security/lobby) "uLE" = ( /obj/effect/floor_decal/borderfloorblack{ alpha = 255; @@ -32308,11 +32606,6 @@ /obj/machinery/disposal, /turf/simulated/floor/tiled/monotile, /area/security/security_lockerroom) -"uOj" = ( -/obj/machinery/door/airlock/maintenance/common, -/obj/item/barrier_tape_segment/engineering, -/turf/simulated/floor/plating, -/area/maintenance/lower/medsec_maintenance) "uOH" = ( /obj/structure/table/reinforced, /obj/machinery/recharger, @@ -33254,6 +33547,9 @@ /area/hallway/primary/surfacetwo) "vlE" = ( /obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/plating, /area/security/hammerhead_bay) "vmd" = ( @@ -33326,6 +33622,14 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/coffee_shop) +"vpt" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/closet/emcloset, +/turf/simulated/floor/plating, +/area/maintenance/lower/medsec_maintenance) "vpB" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -33449,15 +33753,22 @@ /turf/simulated/floor/tiled/white, /area/medical/sleeper) "vtq" = ( -/obj/machinery/light{ +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ dir = 8 }, -/obj/structure/closet/secure_closet/brig{ - id = "Cell 1"; - name = "Cell 1 Locker" +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/light{ + dir = 8 }, +/obj/structure/closet/secure_closet/genpop, /turf/simulated/floor/tiled/dark, -/area/security/brig) +/area/security/security_processing) "vtu" = ( /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ dir = 4 @@ -33683,10 +33994,10 @@ icon_state = "4-8" }, /turf/simulated/floor/maglev{ + desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"; dir = 8; icon_state = "maglevup"; - name = "launch rail"; - desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!" + name = "launch rail" }, /area/shuttle/hammerhead/cockpit) "vBG" = ( @@ -33758,10 +34069,10 @@ icon_state = "2-4" }, /turf/simulated/floor/maglev{ + desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"; dir = 8; icon_state = "maglevup"; - name = "launch rail"; - desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!" + name = "launch rail" }, /area/shuttle/hammerhead/cockpit) "vFi" = ( @@ -33873,9 +34184,8 @@ /obj/structure/cable/orange{ icon_state = "1-4" }, -/obj/effect/floor_decal/industrial/warning, /obj/effect/floor_decal/industrial/warning{ - dir = 8 + dir = 10 }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/hammerhead/general) @@ -33899,14 +34209,13 @@ }, /obj/machinery/mech_recharger, /turf/simulated/floor/maglev{ + desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"; dir = 8; icon_state = "maglevup"; - name = "launch rail"; - desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!" + name = "launch rail" }, /area/shuttle/hammerhead/general) "vKj" = ( -/obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/shutters{ density = 0; dir = 2; @@ -33937,13 +34246,15 @@ /area/hallway/primary/surfacetwo) "vLE" = ( /obj/machinery/door/airlock/maintenance/sec, -/obj/machinery/door/firedoor/glass, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/steel, /area/security/range) "vLT" = ( @@ -33965,6 +34276,20 @@ }, /turf/simulated/floor/tiled/steel, /area/rnd/research/researchdivision) +"vNc" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 1 + }, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/closet/secure_closet/genpop, +/turf/simulated/floor/tiled/dark, +/area/security/security_processing) "vNQ" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -33999,10 +34324,8 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/locker) "vPP" = ( +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, /obj/effect/paint/babyblue, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ - id = "medbay outer" - }, /turf/simulated/floor/plating, /area/medical/reception) "vQg" = ( @@ -34367,7 +34690,6 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_2) "weU" = ( -/obj/machinery/light, /obj/effect/floor_decal/steeldecal/steel_decals_central1{ dir = 1 }, @@ -34408,19 +34730,6 @@ }, /turf/simulated/floor/tiled/steel, /area/rift/stairwell/primary/surfacetwo) -"wft" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 4 - }, -/obj/structure/reagent_dispensers/peppertank{ - pixel_x = 32 - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/steel, -/area/security/brig) "wfD" = ( /obj/structure/railing{ dir = 1 @@ -34650,6 +34959,28 @@ }, /turf/simulated/floor/tiled/monotile, /area/security/hallway) +"wop" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 9 + }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/disposal, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 1 + }, +/obj/machinery/requests_console/preset/security{ + pixel_y = 32 + }, +/turf/simulated/floor/tiled/steel, +/area/security/lobby) "woM" = ( /obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 4 @@ -34763,10 +35094,10 @@ /area/medical/reception) "wqC" = ( /turf/simulated/floor/maglev{ + desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"; dir = 8; icon_state = "maglevup"; - name = "launch rail"; - desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!" + name = "launch rail" }, /area/shuttle/hammerhead/cockpit) "wrb" = ( @@ -34818,7 +35149,6 @@ /turf/simulated/floor/tiled/monowhite, /area/medical/resleeving) "wto" = ( -/obj/machinery/door/firedoor/glass, /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, /obj/structure/cable/green{ icon_state = "4-8" @@ -35078,6 +35408,23 @@ }, /turf/simulated/floor/tiled/steel, /area/assembly/robotics) +"wCk" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 10 + }, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/closet/secure_closet/genpop, +/turf/simulated/floor/tiled/dark, +/area/security/security_processing) "wCr" = ( /obj/machinery/fire_alarm/west_mount{ pixel_x = -24 @@ -35283,6 +35630,16 @@ /obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/techfloor, /area/medical/morgue) +"wKT" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/red/border, +/obj/structure/table/steel, +/obj/machinery/computer/guestpass{ + dir = 1; + pixel_y = -24 + }, +/turf/simulated/floor/tiled/steel, +/area/security/lobby) "wLS" = ( /obj/machinery/door/blast/regular{ density = 0; @@ -35325,6 +35682,20 @@ /obj/landmark/spawnpoint/job/medical_doctor, /turf/simulated/floor/tiled/monowhite, /area/medical/medbay_primary_storage) +"wNG" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 10 + }, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/closet/secure_closet/genpop, +/turf/simulated/floor/tiled/dark, +/area/security/security_processing) "wNZ" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -35341,9 +35712,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/asmaint2) -"wOG" = ( -/turf/simulated/floor/plating, -/area/maintenance/security/upper) "wPF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -35659,6 +36027,15 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/security/upper) +"wZc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/tiled/monotile, +/area/security/lobby) "xax" = ( /obj/structure/railing{ dir = 1 @@ -35668,6 +36045,16 @@ }, /turf/simulated/open/lythios43c, /area/rift/surfacebase/outside/outside2) +"xaJ" = ( +/obj/effect/floor_decal/borderfloor/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/red/bordercorner{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/steel, +/area/hallway/primary/surfacetwo) "xaM" = ( /obj/structure/cable/orange{ icon_state = "4-8" @@ -35692,18 +36079,15 @@ /area/security/evastorage) "xbD" = ( /obj/effect/floor_decal/corner_techfloor_grid/diagonal, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, /obj/machinery/button/remote/blast_door{ id = "hammerheadtba"; name = "Fighter Tube Access"; pixel_x = -26; pixel_y = 8 }, +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/hammerhead/general) "xbW" = ( @@ -35723,6 +36107,18 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) +"xcj" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/structure/closet/hydrant{ + pixel_y = 32 + }, +/turf/simulated/floor/tiled/steel, +/area/security/hallway) "xco" = ( /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, @@ -35837,11 +36233,6 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/showers) -"xgN" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/closet/emcloset, -/turf/simulated/floor/plating, -/area/maintenance/locker) "xhk" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, @@ -36025,22 +36416,11 @@ /turf/simulated/floor/tiled/white, /area/medical/sleeper) "xpX" = ( -/obj/structure/table/steel, -/obj/item/tape_recorder{ - pixel_x = -2; - pixel_y = -2 - }, -/obj/item/tape_recorder{ - pixel_x = 2; - pixel_y = 2 - }, /obj/machinery/air_alarm{ dir = 1; pixel_y = -25 }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 10 - }, +/obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/borderfloorblack/corner2{ dir = 9 }, @@ -36166,9 +36546,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/sleeper) -"xsX" = ( -/turf/simulated/floor/tiled/dark, -/area/security/brig) "xtd" = ( /obj/machinery/recharger/wallcharger{ pixel_y = 26 @@ -36305,6 +36682,25 @@ }, /turf/simulated/floor/tiled/red, /area/security/evidence_storage) +"xys" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 5 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 5 + }, +/obj/machinery/lapvend, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/security/lobby) "xyC" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -36441,10 +36837,10 @@ icon_state = "1-2" }, /turf/simulated/floor/maglev{ + desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"; dir = 8; icon_state = "maglevup"; - name = "launch rail"; - desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!" + name = "launch rail" }, /area/shuttle/hammerhead/cockpit) "xFu" = ( @@ -36896,11 +37292,6 @@ }, /turf/simulated/floor/tiled/steel, /area/rift/stairwell/primary/surfacetwo) -"xOW" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/darkred, -/turf/simulated/floor/plating, -/area/security/lobby) "xPj" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -36978,6 +37369,13 @@ pixel_y = 26; req_access = list(1) }, +/obj/structure/extinguisher_cabinet{ + dir = 4; + pixel_x = -30 + }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled/red, /area/security/security_processing) "xQH" = ( @@ -37248,16 +37646,31 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/reading_room) "xXR" = ( -/obj/effect/floor_decal/borderfloor/corner{ - dir = 1 - }, -/obj/effect/floor_decal/corner/red/bordercorner{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 10 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 10 + }, +/obj/machinery/fire_alarm/west_mount{ + pixel_x = -24 + }, /turf/simulated/floor/tiled/steel, -/area/security/brig) +/area/security/hallway) +"xYb" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/monotile, +/area/security/lobby) "xYc" = ( /obj/machinery/door/blast/regular{ density = 0; @@ -37351,9 +37764,6 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 5 }, -/obj/machinery/light{ - dir = 4 - }, /obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/dark, /area/security/security_processing) @@ -37403,6 +37813,9 @@ /obj/structure/cable/green{ icon_state = "1-4" }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, /turf/simulated/floor/plating, /area/maintenance/lower/medsec_maintenance) "ydS" = ( @@ -37425,7 +37838,10 @@ }, /obj/structure/table/steel_reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/item/paper/armory_info, +/obj/item/paper/armory_info{ + pixel_x = 16 + }, +/obj/item/modular_computer/laptop/preset/custom_loadout/standard/security/warden, /turf/simulated/floor/carpet, /area/security/warden) "yeu" = ( @@ -37448,9 +37864,9 @@ /turf/simulated/floor/water/pool, /area/triumph/surfacebase/sauna) "yeT" = ( -/obj/structure/bed/padded, -/turf/simulated/floor/tiled/dark, -/area/security/brig) +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/monodark, +/area/security/security_processing) "yfc" = ( /obj/machinery/power/apc/south_mount, /obj/effect/floor_decal/rust, @@ -37520,16 +37936,6 @@ }, /turf/simulated/floor/tiled/steel, /area/rift/station/public_garden/stairwell) -"ygT" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/steel, -/area/hallway/primary/surfacetwo) "yhc" = ( /obj/effect/floor_decal/borderfloorwhite/corner{ dir = 1 @@ -48071,8 +48477,8 @@ oLJ oLJ kid kid -fwk -fwk +oFb +oFb kid kid kid @@ -48656,7 +49062,7 @@ eYx gHr ixy odu -fwk +oFb jvX vjt wnW @@ -48850,7 +49256,7 @@ eYx iKu kRa lto -fwk +oFb eUN dyj wBH @@ -49044,7 +49450,7 @@ oUw dTk bor lto -fwk +oFb epz tQp xkt @@ -51133,7 +51539,7 @@ enB nFd enB enB -enB +niy enB enB enB @@ -53119,10 +53525,10 @@ jOk jOk sLL mpJ -mYq +mao cYo xco -rba +bVi hpT tci hhp @@ -53281,16 +53687,16 @@ uWX cgA lxh qIG -szQ -szQ -szQ +bVi +bVi +bVi bWq -szQ -szQ +bVi +bVi tMV -szQ -szQ -szQ +bVi +bVi +bVi gcX jGy lFw @@ -53298,16 +53704,16 @@ mDK yaL mDK eVV -szQ +bVi mYq oMM wGP -szQ +bVi mYq -szQ -szQ -szQ -szQ +bVi +bVi +bVi +bVi nxc gNc bue @@ -53482,15 +53888,15 @@ otA tmh tmh dKq -szQ -szQ -szQ +bVi +bVi +bVi gcX -szQ +bVi xyC -szQ +bVi ora -szQ +bVi lTc ryQ ryQ @@ -53499,20 +53905,20 @@ ryQ ryQ ryQ ryQ -szQ -szQ -szQ -szQ -szQ -szQ +bVi +bVi +bVi +bVi +bVi +bVi tdp +bVi +bVi qUB -szQ -szQ -xco -szQ bVi -szQ +odF +mYq +bVi sJg mHQ twZ @@ -53668,17 +54074,17 @@ tZW tZW cbe lxh -qUB -szQ -szQ -szQ +gne +bVi +bVi +bVi bWq xco xco ssT xco -szQ -szQ +bVi +bVi diz kXq jBV @@ -53694,19 +54100,19 @@ ldl xRj ryQ qDl -szQ +bVi mYq yjX mYq -szQ -szQ +bVi +bVi +bVi +mXv qUB -szQ -xco -xco -xco -xco -szQ +bVi +bVi +bVi +bVi sJg mHQ mHQ @@ -53862,8 +54268,8 @@ aLs tZW lQX lxh -qUB -ind +gne +qjY xPp xPp xPp @@ -53877,8 +54283,8 @@ dep vLE dep dep -ora -xco +qSP +ssT lTc ryQ ayC @@ -53892,15 +54298,15 @@ mWB mWB mWB mWB +odF +bVi mYq -szQ +mXv qUB -bWq -bWq -uOj -bWq -bWq -uLD +bVi +hdO +vpt +bYE xPE lzT met @@ -54057,7 +54463,7 @@ sfs oqx nyq ycY -ind +qjY xPp dTx dTx @@ -54071,32 +54477,32 @@ jQY mEM uNo dep -qSP -ssT -lTc +epm +ckI +eVY ryQ rkB vnm vfF aeO uLE -ryQ +mWB mWB buN nSn uNX mWB mWB -szQ -qUB -bWq -mYq -szQ -pge -bWq -szQ -szQ -szQ +xjt +xjt +xjt +cXo +xjt +xjt +xjt +xjt +xjt +yjX sJg iBi pFC @@ -54251,7 +54657,7 @@ lxh lxh lxh gne -ind +qjY xPp dTx lOg @@ -54265,9 +54671,9 @@ fyx dOP mpk dep -epm -ckI -eVY +eFZ +gDE +yfc ryQ hPT vnm @@ -54281,15 +54687,15 @@ eGD pvo fcX mWB -szQ -qUB -bWq -szQ -szQ -mYq -bWq -bWq -bWq +wop +oTT +sdt +kLx +ecR +frf +jKG +eOK +xjt bWq oWC bWq @@ -54445,7 +54851,7 @@ aEk xco xco xFu -ind +qjY xPp sfI dTx @@ -54459,9 +54865,9 @@ fyx jxw bYv dep -eFZ -gDE -yfc +lQr +nKp +jOn ryQ qmn vnm @@ -54475,15 +54881,15 @@ mjL hRp umt oXc -qUB -qUB -bWq -teZ -szQ -odF -bWq -bWq -bWq +gEP +jHi +jHi +cjM +cjM +cjM +ayW +wKT +xjt djg riA fZA @@ -54635,11 +55041,11 @@ tll kXL hPc lTi -szQ -szQ -szQ +bVi +bVi +bVi gne -ind +qjY xPp dTx lOg @@ -54653,9 +55059,9 @@ fyx xdO kre dep -lQr -nKp -jOn +iiw +vcn +bGX ryQ rNs vnm @@ -54669,15 +55075,15 @@ wWl lSx sjU mWB -uLD -qUB -xjt -xjt -xjt -xjt -xjt -xjt -xjt +mVF +rcS +xYb +cjM +cjM +cjM +cjM +pBw +dMT jNi lQY fPA @@ -54833,7 +55239,7 @@ ayG cwt cwt fse -ind +qjY xPp sfI dTx @@ -54847,9 +55253,9 @@ fyx tut fNI dep -iiw -vcn -bGX +jbk +jbk +jbk ryQ fPN vnm @@ -54862,16 +55268,16 @@ iKd oTn von qNS -mWB -szQ -qUB -xjt -pnl -fhH -cxh -jQM -biL -xjt +eke +auL +wZc +cjM +ocm +gnQ +cjM +nkM +ogI +dMT obA qTk sDd @@ -55024,10 +55430,10 @@ fxj uAn lTi gne -szQ -szQ -szQ -ind +bVi +bVi +bVi +qjY xPp dTx lOg @@ -55041,9 +55447,9 @@ fyx tut lvP dep -eCy -eCy -eCy +jbk +rEC +rEC ryQ ies axV @@ -55056,16 +55462,16 @@ iKd wWl von lUK -mWB -kvg -hRV -xjt -llM -shx -mLK -qSU -soJ -tmt +eke +uLD +bDn +mjR +cjM +cjM +cjM +cjM +grp +dMT kVi lYJ bew @@ -55218,10 +55624,10 @@ gQB uAn qjY gne -szQ +bVi yjX -szQ -ind +bVi +qjY xPp dTx dTx @@ -55251,15 +55657,15 @@ mfE mZa qBn mWB -icx -qvp -xjt +xys +tWm +mLV bmY cMm -dbc -ncH -eZe -dRG +nrr +odA +nMx +aLU gxK wja wPF @@ -55415,7 +55821,7 @@ msH uAn uAn yga -xPp +yga xPp dep dep @@ -55430,8 +55836,8 @@ lNS dep dep jbk -rEC -rEC +uxa +imP ryQ ryQ ryQ @@ -55445,15 +55851,15 @@ rVb rNb eke mWB -btj -oSh +xjt +hRV xjt xjt -xOW -rTT -xOW xjt -tmt +sOJ +eJW +xjt +dMT uwD hCS vkb @@ -55626,7 +56032,7 @@ ezU fAu dyd mAG -llR +rav fUV hSr elc @@ -55640,11 +56046,11 @@ soA ojJ rMY xXR -hBp +cin rnL -fbe +uVt ckC -seB +hBp fiF qUk sLC @@ -55833,10 +56239,10 @@ lhR kvL weU bVr -nxD +gMv reL dPC -toi +ewu hSd fSE axb @@ -56027,16 +56433,16 @@ nJT scJ hpE kzS +bnf +tkZ +vCw +grI +nDY nQn -wft -rcB -nQn -wft -hkV -nQn +nJI iUP -ygT sEs +xaJ bSS rtZ vnU @@ -56220,17 +56626,17 @@ ukp uSV uUo hUf -kvg -foy -kvg -kvg -hbY -kvg -kvg -ebx -kvg -kvg -lIf +rWX +rWX +rWX +jMp +rWX +rWX +rTT +rWX +rWX +rWX +gbY hhN fWX vnU @@ -56413,18 +56819,18 @@ oPH vKj tiu bhS -nuH -nMi -xsX -vtq -nMi -xsX -vtq +tyF +keC +vNc +wCk +bHa nMi -xsX +wNG +lBj vtq -ijr -tZX +okK +rWX +gbY hLM tDr vnU @@ -56607,20 +57013,20 @@ wsa vKj tiu bhS -nuH -nMi -dBB -yeT -nMi -dBB -yeT -nMi -dBB +kxd +ceg +llM +llM +llM +llM yeT -ijr -eRf -qUz -mYE +cPE +qSU +soJ +rWX +gbY +hLM +uEK kiM yaF vnU @@ -56802,19 +57208,19 @@ ukp tiu bhS gjq -kvg -lNl +keC +pvp oji -kvg -lNl +tJz +rDz +qUR oji -kvg -lNl oji -kvg -jbk -uDc -jbk +nkq +rWX +gbY +gMG +mYE vnU cdE vnU @@ -56996,20 +57402,20 @@ vKj tiu bhS rrl -kvg -kvg -kvg -kvg -kvg -kvg -kvg -kvg -kvg -kvg +rWX +rWX +rWX +uoj +ooG +rWX +rWX +rWX +rWX +rWX ksX -cbn -jbk -jZN +qUz +qiX +vnU cdE vnU gtD @@ -57199,11 +57605,11 @@ uaX jVH iHi pch -uaX -iwt -mix +gBj jbk -xgN +uDc +jbk +vnU cdE vnU plZ @@ -57393,9 +57799,9 @@ gvr qpE cIY pjS -jrD -pwT -dyg +uaX +mOm +auX jbk jNL sym @@ -57587,9 +57993,9 @@ uaX pcO uMY rUw -uaX -nsP -mrE +jrD +pwT +dyg jbk gmT dVi @@ -57782,8 +58188,8 @@ jnl jIN scA uaX -tiu -hiE +nsP +mrE jbk gap nDj @@ -57976,7 +58382,7 @@ mqC kGz esQ gBj -tiu +xcj cXI jbk gmT @@ -58920,7 +59326,7 @@ nfd wFc iLp qGR -pmi +lMt nLl wiw hLf @@ -60864,7 +61270,7 @@ pBj pBj kcn qdL -wOG +vBG nNc kcn vBG diff --git a/maps/rift/levels/rift-06-surface3.dmm b/maps/rift/levels/rift-06-surface3.dmm index dc76fa06fd5..b84524a8c39 100644 --- a/maps/rift/levels/rift-06-surface3.dmm +++ b/maps/rift/levels/rift-06-surface3.dmm @@ -881,8 +881,8 @@ pixel_y = 1 }, /obj/machinery/embedded_controller/radio/airlock/docking_port{ - id_tag = "expshuttle_dock"; frequency = 1380; + id_tag = "expshuttle_dock"; pixel_y = 29 }, /turf/simulated/floor/tiled/steel_grid, @@ -2831,8 +2831,7 @@ icon_state = "0-4" }, /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/general) @@ -3364,8 +3363,8 @@ /area/crew_quarters/locker/laundry_arrival) "akc" = ( /obj/machinery/power/smes/buildable/power_shuttle{ - name = "Courser Charging Port"; - RCon_tag = "Courser Charging Port" + RCon_tag = "Courser Charging Port"; + name = "Courser Charging Port" }, /obj/structure/catwalk, /obj/structure/cable/pink{ @@ -4553,14 +4552,13 @@ /obj/structure/railing{ dir = 4 }, -/obj/machinery/light{ - dir = 8; - light_range = 12 - }, /obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/phoronlock{ frequency = 1379; scrub_id = "shop_south_scrubber" }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/plating, /area/rift/trade_shop/landing_pad) "anv" = ( @@ -4586,16 +4584,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/obj/machinery/light{ - dir = 8; - light_range = 12 - }, /obj/item/storage/toolbox/mechanical, /obj/item/tank/phoron, /obj/machinery/air_alarm{ dir = 4; pixel_x = -24 }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/cockpit) "anx" = ( @@ -6625,9 +6622,6 @@ /obj/machinery/computer/shuttle_control/explore/civvie, /turf/simulated/floor/tiled/old_tile/green, /area/shuttle/civvie/cockpit) -"asQ" = ( -/turf/simulated/floor/plating, -/area/maintenance/commandmaint) "asR" = ( /obj/machinery/porta_turret/ai_defense, /obj/machinery/camera/network/command, @@ -7849,10 +7843,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/ai) -"awb" = ( -/obj/random/trash_pile, -/turf/simulated/floor/plating, -/area/maintenance/commandmaint) "awd" = ( /obj/effect/floor_decal/spline/plain{ dir = 8 @@ -8908,9 +8898,6 @@ }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/hop) -"ayK" = ( -/turf/simulated/floor/plating, -/area/maintenance/commandmaint) "ayL" = ( /obj/effect/floor_decal/techfloor, /obj/structure/cable/green{ @@ -10016,10 +10003,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ai_upload) -"aCk" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) "aCl" = ( /obj/structure/bed/double/padded, /obj/item/bedsheet/captaindouble, @@ -10727,9 +10710,6 @@ }, /turf/simulated/floor/carpet/purcarpet, /area/exploration/meeting) -"aEx" = ( -/turf/simulated/floor/plating, -/area/maintenance/commandmaint) "aEy" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 @@ -11578,9 +11558,6 @@ /obj/machinery/telecomms/relay/preset/telecomms, /turf/simulated/floor/tiled/techfloor/grid/lythios43c, /area/shuttle/civvie/cockpit) -"aGO" = ( -/turf/simulated/floor/outdoors/safeice/lythios43c/indoors, -/area/rift/surfacebase/outside/outside3) "aGP" = ( /obj/structure/shuttle/engine/heater, /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -11939,8 +11916,7 @@ /obj/machinery/honey_extractor, /obj/structure/flora/ausbushes/leafybush, /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /turf/simulated/floor/grass, /area/hydroponics) @@ -12167,8 +12143,8 @@ "aIr" = ( /obj/machinery/power/smes/buildable{ RCon_tag = "Substation - Exploration and Research Shuttles"; - output_attempt = 0; - inputting = 1 + inputting = 1; + output_attempt = 0 }, /obj/structure/cable/green{ icon_state = "0-2" @@ -12425,8 +12401,7 @@ pixel_x = -32 }, /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/cockpit) @@ -12981,9 +12956,6 @@ /obj/machinery/vending/cigarette, /turf/simulated/floor/plating, /area/maintenance/station/exploration) -"aKt" = ( -/turf/simulated/floor/plating, -/area/maintenance/station/exploration) "aKu" = ( /obj/structure/closet/secure_closet/freezer/meat, /turf/simulated/floor/tiled/freezer/cold, @@ -13032,13 +13004,6 @@ /obj/effect/floor_decal/industrial/outline, /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) -"aKC" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) "aKD" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 4 @@ -13278,9 +13243,6 @@ /obj/item/radio/beacon/anchored, /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/cockpit) -"aLl" = ( -/turf/simulated/floor/plating, -/area/maintenance/commandmaint) "aLm" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -13423,10 +13385,6 @@ /obj/effect/floor_decal/industrial/outline, /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) -"aLO" = ( -/obj/item/reagent_containers/food/drinks/cans/space_mountain_wind, -/turf/simulated/floor/plating, -/area/maintenance/commandmaint) "aLQ" = ( /obj/structure/table/wooden_reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -13743,8 +13701,7 @@ dir = 4 }, /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) @@ -14583,8 +14540,7 @@ pixel_x = -24 }, /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/general) @@ -16146,10 +16102,6 @@ /obj/structure/table/reinforced, /turf/simulated/floor/tiled/dark, /area/bridge) -"aTs" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) "aTt" = ( /obj/structure/railing, /obj/machinery/light/flamp, @@ -16168,10 +16120,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/exploration) -"aTv" = ( -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/bar/lower) "aTw" = ( /obj/machinery/disperser/front{ dir = 4 @@ -19753,13 +19701,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rift/turbolift/maint) -"eAl" = ( -/obj/structure/catwalk, -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/turf/simulated/floor/plating, -/area/maintenance/bar/lower) "eDm" = ( /turf/simulated/wall/r_wall/prepainted, /area/crew_quarters/locker/laundry_arrival) @@ -20094,9 +20035,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/hallway/secondary/docking_hallway) -"ffg" = ( -/turf/simulated/floor/plating, -/area/maintenance/commandmaint) "fgP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -20411,7 +20349,6 @@ /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) "fTJ" = ( -/obj/machinery/door/firedoor/glass, /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, /obj/machinery/door/blast/shutters{ density = 0; @@ -20488,9 +20425,9 @@ dir = 4 }, /obj/machinery/button/remote/blast_door{ + dir = 4; id = "pilot_prep"; name = "Window Shutter Controll"; - dir = 4; pixel_x = -25 }, /obj/effect/floor_decal/spline/fancy{ @@ -20639,12 +20576,6 @@ /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/maintenance/bar) -"gvt" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/violet, -/obj/effect/paint_stripe/violet, -/turf/simulated/floor/plating, -/area/shuttle/excursion/cockpit) "gzQ" = ( /obj/machinery/light{ dir = 8 @@ -21060,10 +20991,10 @@ dir = 4 }, /obj/machinery/button/remote/blast_door{ + dir = 4; id = "Pilot_office_Shutter"; name = "Window Shutter Controll"; - pixel_x = -24; - dir = 4 + pixel_x = -24 }, /obj/effect/floor_decal/spline/fancy{ dir = 8 @@ -21742,21 +21673,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/general) -"jrU" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/blast/shutters{ - density = 0; - dir = 8; - icon_state = "shutter0"; - id = "bridge"; - layer = 3.1; - name = "Bridge Lockdown Shutters"; - opacity = 0 - }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/commandblue, -/turf/simulated/floor/plating, -/area/bridge) "jsa" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -22194,20 +22110,6 @@ /obj/effect/paint/palebottlegreen, /turf/simulated/floor/plating, /area/hydroponics) -"kdh" = ( -/obj/machinery/door/firedoor/glass, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, -/obj/machinery/door/blast/shutters{ - density = 0; - icon_state = "shutter0"; - id = "bridge"; - layer = 3.1; - name = "Bridge Lockdown Shutters"; - opacity = 0 - }, -/obj/effect/paint/commandblue, -/turf/simulated/floor/plating, -/area/bridge) "kih" = ( /obj/machinery/door/firedoor/glass{ dir = 8 @@ -23257,10 +23159,6 @@ "mOy" = ( /turf/simulated/floor/tiled, /area/rnd/telescience_lab) -"mPf" = ( -/obj/item/trash/cheesie, -/turf/simulated/floor/plating, -/area/maintenance/commandmaint) "mPB" = ( /obj/structure/catwalk, /obj/structure/cable/green{ @@ -23981,7 +23879,6 @@ /turf/simulated/floor/tiled/steel, /area/exploration/excursion_dock) "oJN" = ( -/obj/machinery/door/firedoor/glass, /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, /obj/effect/paint/commandblue, /turf/simulated/floor/plating, @@ -24093,10 +23990,6 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) -"oXj" = ( -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/commandmaint) "oXU" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 4 @@ -24260,8 +24153,6 @@ /turf/simulated/floor/tiled/monotile, /area/exploration/pilot_prep) "pul" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, /obj/machinery/door/blast/shutters{ density = 0; @@ -24278,21 +24169,6 @@ }, /turf/simulated/floor/plating, /area/bridge/bunker) -"pwb" = ( -/obj/machinery/door/firedoor/glass, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, -/obj/machinery/door/blast/shutters{ - density = 0; - dir = 4; - icon_state = "shutter0"; - id = "bridge"; - layer = 3.1; - name = "Bridge Lockdown Shutters"; - opacity = 0 - }, -/obj/effect/paint/commandblue, -/turf/simulated/floor/plating, -/area/bridge) "pxd" = ( /obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, /obj/effect/paint/purplegray, @@ -24480,10 +24356,6 @@ /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/shuttle/civvie/general) -"qaO" = ( -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/bar/lower) "qcL" = ( /obj/landmark/spawnpoint/job/pilot, /obj/item/stool/padded, @@ -24574,10 +24446,6 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway2) -"qlA" = ( -/obj/item/trash/cheesie, -/turf/simulated/floor/plating, -/area/maintenance/commandmaint) "qmp" = ( /turf/simulated/wall/prepainted/civilian, /area/crew_quarters/freezer) @@ -24786,7 +24654,7 @@ /turf/simulated/floor/grass, /area/hydroponics) "qKp" = ( -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, /obj/machinery/door/blast/shutters{ density = 0; dir = 4; @@ -24796,7 +24664,6 @@ name = "Bridge Lockdown Shutters"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, /obj/effect/paint/commandblue, /turf/simulated/floor/plating, /area/bridge) @@ -25360,13 +25227,6 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) -"szx" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) "sEW" = ( /obj/machinery/light/spot{ dir = 4; @@ -26019,11 +25879,9 @@ /turf/simulated/floor/tiled/steel, /area/exploration/courser_dock) "uyj" = ( -/obj/machinery/door/firedoor/glass, /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, /obj/machinery/door/blast/shutters{ density = 0; - dir = 2; icon_state = "shutter0"; id = "bridge"; layer = 3.1; @@ -26031,7 +25889,7 @@ opacity = 0 }, /obj/effect/paint/commandblue, -/turf/simulated/wall/r_wall/prepainted/command, +/turf/simulated/floor/plating, /area/bridge) "uAA" = ( /obj/structure/closet/firecloset/full, @@ -26179,9 +26037,9 @@ /area/shuttle/excursion/general) "uTt" = ( /obj/machinery/door/airlock/exploration{ + locked = 1; name = "Exploration Airlock"; - req_one_access = list(19,43,67); - locked = 1 + req_one_access = list(19,43,67) }, /turf/simulated/floor/tiled/steel_grid, /area/exploration/excursion_dock) @@ -26889,8 +26747,6 @@ /turf/simulated/wall/r_wall/prepainted/command, /area/bridge/office) "wlz" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, /obj/machinery/door/blast/shutters{ density = 0; @@ -26914,7 +26770,6 @@ /turf/simulated/floor/carpet/blue, /area/crew_quarters/heads/hop) "wns" = ( -/obj/machinery/door/firedoor/glass, /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, /obj/effect/paint/commandblue, /turf/simulated/floor/plating, @@ -27064,6 +26919,12 @@ /obj/effect/paint_stripe/violet, /turf/simulated/wall/rshull, /area/shuttle/excursion/general) +"wGH" = ( +/obj/structure/ladder{ + pixel_y = 10 + }, +/turf/simulated/floor/plating, +/area/security/prison) "wIv" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -27117,7 +26978,6 @@ /turf/simulated/floor/tiled, /area/rnd/telescience_lab) "wTS" = ( -/obj/machinery/door/firedoor/glass, /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, /obj/effect/paint/commandblue, /turf/simulated/floor/plating, @@ -38841,7 +38701,7 @@ aZm aHQ azG rba -aCk +axO axB alX aLZ @@ -39035,7 +38895,7 @@ naw aHQ aNg aUj -aCk +axO aYN aiu aFu @@ -39229,11 +39089,11 @@ aZf aHQ aNg abH -aCk -aKC +axO +axB adj aLZ -aCk +axO qSL aJu aJu @@ -39617,7 +39477,7 @@ wec aNU aMs aUj -aCk +axO amJ aWd ghf @@ -39812,7 +39672,7 @@ exk exk exk ake -aCk +axO arL eGU aAZ @@ -40006,9 +39866,9 @@ qnV age exk aBM -aCk +axO aYm -szx +eGU axZ qSL aKu @@ -40200,7 +40060,7 @@ auW ajf exk azR -aTs +axO aTa eGU aoP @@ -40394,13 +40254,13 @@ nKj rMY exk aFF -aCk +axO lXN bSo aYs mCR -eAl -aTv +aiR +aGy arr cnu arp @@ -40594,7 +40454,7 @@ auq cIq cIq sny -aTv +aGy atT aks avH @@ -40788,7 +40648,7 @@ apc aJB cIq aAn -aTv +aGy aUi cnu akT @@ -40981,8 +40841,8 @@ apx aJQ fpt cIq -aTv -aTv +aGy +aGy aUi cnu alc @@ -41369,8 +41229,8 @@ aoF aEK akC arW -aTv -aTv +aGy +aGy wce aMM acH @@ -41564,7 +41424,7 @@ aEK ahC cIq aWb -qaO +aGy cnu cnu cnu @@ -41758,7 +41618,7 @@ aEK agn cIq aBz -aTv +aGy cnu amc cnu @@ -41952,7 +41812,7 @@ aEK aBE cIq aJg -aTv +aGy cnu aYE auU @@ -42146,7 +42006,7 @@ aEK aqD cIq aCU -aTv +aGy afU aUi aUi @@ -42340,7 +42200,7 @@ aEK acJ cIq aUi -aTv +aGy cnu aad aUi @@ -42357,7 +42217,7 @@ aTm ocs oGm oGm -gvt +ocs oGm oGm afV @@ -42534,7 +42394,7 @@ arz akg cIq fIY -aTv +aGy cnu cnu afh @@ -42728,7 +42588,7 @@ alN aVf cIq aUi -aTv +aGy cnu aVh aUi @@ -42922,7 +42782,7 @@ aUp aJx cIq arS -aTv +aGy cnu aIt aZQ @@ -43310,7 +43170,7 @@ iRO qnC cnu arS -aTv +aGy aih nFC aIr @@ -44078,7 +43938,7 @@ cnu vOW iRO aUi -aTv +aGy aUi gtg cnu @@ -44088,8 +43948,8 @@ fRT njG wUC aGm -aTv -aTv +aGy +aGy tAt aiR axz @@ -44272,7 +44132,7 @@ cnu vOW abF bqH -aTv +aGy aUi arS cnu @@ -46593,7 +46453,7 @@ tAo tAo hMC tSU -jrU +cQV fFo hMC tAo @@ -46772,7 +46632,7 @@ akk atK aoa avu -aEx +aaA avu aoa aTi @@ -46964,7 +46824,7 @@ aqW lSR kIZ bID -oXj +aEo aEo aEo aEo @@ -46977,7 +46837,7 @@ arR acP adk aGI -kdh +uyj aee aFS aeE @@ -47753,7 +47613,7 @@ wOC wOC ajx aIF -kdh +uyj amZ aYB aHH @@ -47867,7 +47727,7 @@ afq afq afq afq -aGO +ajp afq afq afq @@ -48061,7 +47921,7 @@ afq afq afq afq -aGO +ajp afq afq afq @@ -48172,7 +48032,7 @@ aro avn mrz aif -aKt +ayE pxw agh gpa @@ -48255,7 +48115,7 @@ afq afq afq afq -aGO +ajp afq afq afq @@ -48366,7 +48226,7 @@ aWQ mrz mrz aif -aKt +ayE pxw agh gpa @@ -48447,9 +48307,9 @@ afq afq afq afq -aGO -aGO -aGO +ajp +ajp +ajp afq afq afq @@ -48532,7 +48392,7 @@ aIF qKs qKs tAo -pwb +qKp qKp qKp tAo @@ -48558,7 +48418,7 @@ mrz mrz mrz fhj -aKt +ayE aif cQT pxw @@ -48641,7 +48501,7 @@ afq afq afq afq -aGO +ajp afq afq afq @@ -48678,7 +48538,7 @@ acH afq afq afq -aGO +ajp afq afq afq @@ -48743,10 +48603,10 @@ ieJ ieJ ieJ ieJ -aKt +ayE mPB pxw -aKt +ayE aif aif asV @@ -48754,7 +48614,7 @@ aif aif aif aif -aKt +ayE pxw agh gpa @@ -48836,9 +48696,9 @@ afq afq afq abL -aGO -aGO -aGO +ajp +ajp +ajp afq afq afq @@ -48886,12 +48746,12 @@ afq afq afq afq -aGO +ajp afq afq -aGO -aGO -aGO +ajp +ajp +ajp afq afq afq @@ -48936,15 +48796,15 @@ aEj aEj aEj aEj -aKt -aKt +ayE +ayE mPB aMP aif aif ayE -aKt -aKt +ayE +ayE pxw ify pxw @@ -49032,7 +48892,7 @@ afq afq afq afq -aGO +ajp afq afq afq @@ -49056,7 +48916,7 @@ afq afq afq afq -aGO +ajp afq afq afq @@ -49066,7 +48926,7 @@ acH afq afq acH -aGO +ajp afq afq afq @@ -49080,12 +48940,12 @@ afq afq afq apL -aGO +ajp afq -aGO -aGO -aGO -aGO +ajp +ajp +ajp +ajp afq afq afq @@ -49130,19 +48990,19 @@ aLT aYP adf aEj -aKt +ayE aif ajV pxw pxw aif -aKt -aKt -aKt +ayE +ayE +ayE pxw -aKt -aKt -aKt +ayE +ayE +ayE pxw agh gpa @@ -49225,8 +49085,8 @@ afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq @@ -49249,8 +49109,8 @@ afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq @@ -49259,8 +49119,8 @@ afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq @@ -49274,16 +49134,16 @@ afq afq afq afq -aGO -aGO -aGO +ajp +ajp +ajp afq afq -aGO -aGO +ajp +ajp afq -aGO -aGO +ajp +ajp afq aqG aqG @@ -49324,18 +49184,18 @@ aBB aBB avX aEj -aKt +ayE aif aUH asC pxw aif -aKt -aKt -aKt +ayE +ayE +ayE pxw -aKt -aKt +ayE +ayE cQT pxw agh @@ -49417,9 +49277,9 @@ afq afq afq afq -aGO -aGO -aGO +ajp +ajp +ajp afq afq afq @@ -49441,12 +49301,12 @@ aDR jBo agB afq -aGO -aGO -aGO -aGO -aGO -aGO +ajp +ajp +ajp +ajp +ajp +ajp afq afq afq @@ -49454,28 +49314,28 @@ afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq afq afq afq -aGO -aGO -aGO -aGO +ajp +ajp +ajp +ajp afq afq afq -aGO +ajp afq afq afq afq -aGO -aGO +ajp +ajp aqG afq afq @@ -49518,18 +49378,18 @@ ahy aPW acx aEj -aKt +ayE aif aUH ajz pxw aif -aKt -aKt -aKt +ayE +ayE +ayE pxw rXm -aKt +ayE rXm pxw agh @@ -49611,7 +49471,7 @@ afq afq afq afq -aGO +ajp afq afq afq @@ -49635,41 +49495,41 @@ aQP akj agB agB -aGO -aGO -aGO -aGO -aGO -aGO -aGO +ajp +ajp +ajp +ajp +ajp +ajp +ajp afq afq afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq afq -aGO -aGO -aGO +ajp +ajp +ajp afq afq -aGO -aGO +ajp +ajp afq afq -aGO -aGO -aGO +ajp +ajp +ajp afq afq -aGO -aGO +ajp +ajp afq afq afq @@ -49682,7 +49542,7 @@ bWN bWN jHN aaA -aEx +aaA aEo hgO aiO @@ -49712,7 +49572,7 @@ ahr aNO ahc aEj -aKt +ayE aif ajX aKr @@ -49720,7 +49580,7 @@ pxw aif awK jmj -aKt +ayE pxw pxw pxw @@ -49829,13 +49689,13 @@ aQP akj agB agB -aGO -aGO +ajp +ajp afq afq -aGO -aGO -aGO +ajp +ajp +ajp afq afq afq @@ -49843,23 +49703,23 @@ afq afq afq afq -aGO +ajp afq -aGO -aGO -aGO -aGO +ajp +ajp +ajp +ajp afq afq afq afq afq -aGO +ajp afq afq afq -aGO -aGO +ajp +ajp afq afq afq @@ -49906,7 +49766,7 @@ aEj aVz aVz aEj -aKt +ayE aif pxw pxw @@ -49916,9 +49776,9 @@ pxw pxw pxw pxw -aKt -aKt -aKt +ayE +ayE +ayE pxw agh gpa @@ -49998,8 +49858,8 @@ afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq @@ -50022,37 +49882,37 @@ jBo jBo jBo agB -aGO -aGO +ajp +ajp afq afq afq afq -aGO -aGO -aGO -aGO +ajp +ajp +ajp +ajp afq afq afq afq afq -aGO -aGO -aGO +ajp +ajp +ajp afq afq afq afq afq -aGO +ajp afq -aGO -aGO +ajp +ajp afq afq afq -aGO +ajp afq afq afq @@ -50069,7 +49929,7 @@ afq asf aEY aaA -aEx +aaA aKT dsO hgO @@ -50106,13 +49966,13 @@ aQM aRb aZG aif -aKt -aKt -aKt +ayE +ayE +ayE jSm -aKt -aKt -aKt +ayE +ayE +ayE pxw agh gpa @@ -50191,8 +50051,8 @@ afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq @@ -50223,33 +50083,33 @@ afq afq afq afq -aGO -aGO -aGO +ajp +ajp +ajp afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq afq afq afq -aGO -aGO +ajp +ajp aXH -aGO -aGO -aGO -aGO +ajp +ajp +ajp +ajp afq -aGO -aGO -aGO -aGO +ajp +ajp +ajp +ajp afq afq afq @@ -50302,11 +50162,11 @@ aif aif aif aif -aKt +ayE pxw -aKt -aKt -aKt +ayE +ayE +ayE pxw agh gpa @@ -50385,7 +50245,7 @@ afq afq afq afq -aGO +ajp afq afq afq @@ -50417,34 +50277,34 @@ afq afq afq afq -aGO +ajp afq -aGO +ajp aXH afq afq -aGO -aGO +ajp +ajp afq afq afq afq afq -aGO -aGO -aGO -aGO +ajp +ajp +ajp +ajp afq afq afq afq -aGO +ajp afq afq -aGO +ajp afq -aGO -aGO +ajp +ajp afq afq afq @@ -50485,22 +50345,22 @@ aHt aBA hQo ayq -aKt -aKt +ayE +ayE aMP -aKt -aKt -aKt +ayE +ayE +ayE ayE jmj loG sMy aif -aKt +ayE pxw -aKt -aKt -aKt +ayE +ayE +ayE pxw agh gpa @@ -50579,7 +50439,7 @@ afq afq afq afq -aGO +ajp afq afq afq @@ -50588,8 +50448,8 @@ afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq @@ -50614,28 +50474,28 @@ afq afq afq afq -aGO -aGO -aGO -aGO +ajp +ajp +ajp +ajp afq afq afq afq afq apL -aGO -aGO +ajp +ajp afq afq afq afq afq afq -aGO +ajp afq -aGO -aGO +ajp +ajp afq afq afq @@ -50645,7 +50505,7 @@ afq afq afq aqG -aGO +ajp afq afq afq @@ -50772,21 +50632,21 @@ afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq afq afq -aGO -aGO -aGO -aGO -aGO -aGO -aGO -aGO +ajp +ajp +ajp +ajp +ajp +ajp +ajp +ajp afq afq afq @@ -50808,8 +50668,8 @@ afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq @@ -50817,8 +50677,8 @@ afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq @@ -50826,9 +50686,9 @@ afq afq afq afq -aGO -aGO -aGO +ajp +ajp +ajp afq afq afq @@ -50838,14 +50698,14 @@ afq afq afq afq -aGO +ajp aqG afq afq +afq +afq bWN -bWN -bWN -aaA +avu aaA aAN aaA @@ -50876,8 +50736,8 @@ owP owP agh pxw -aKt -aKt +ayE +ayE pxw afq afq @@ -50965,114 +50825,114 @@ afq afq afq afq -aGO -aGO -aGO -afq -afq -afq -afq -afq -aGO -afq -afq -afq -afq -afq -afq -aGO -afq -afq -afq -afq -afq -afq -afq -afq -afq -afq -afq -afq -afq -afq -afq -afq -afq -afq -afq -afq -afq -aGO -aGO -afq -afq -afq -afq -afq -afq -afq -afq -aGO -aGO -afq -afq -afq -apL -afq -afq -afq -afq -afq -afq -afq -afq -afq -afq -afq -afq -afq -afq -afq -aGO -afq +ajp +ajp +ajp afq -bWN -aaA -acp -aEx -uPI -aAN -aaA -avu -dDI -eIs -xgH -lcP -fGK -gGW -axv -aWx -ama -aub -azb -aNy -aGf -awt -aav -aak -nlb -owP -owP -xHc -aQS -aFG -owP -owP -agh -pxw -aKt -aKt -pxw +afq +afq +afq +afq +ajp +afq +afq +afq +afq +afq +afq +ajp +afq +afq +afq +afq +afq +afq +afq +afq +afq +afq +afq +afq +afq +afq +afq +afq +afq +afq +afq +afq +afq +ajp +ajp +afq +afq +afq +afq +afq +afq +afq +afq +ajp +ajp +afq +afq +afq +apL +afq +afq +afq +afq +afq +afq +afq +afq +afq +afq +afq +afq +afq +afq +afq +ajp +afq +afq +bWN +bWN +bWN +aaA +wGH +aAN +aaA +avu +dDI +eIs +xgH +lcP +fGK +gGW +axv +aWx +ama +aub +azb +aNy +aGf +awt +aav +aak +nlb +owP +owP +xHc +aQS +aFG +owP +owP +agh +pxw +ayE +ayE +pxw afq afq afq @@ -51159,23 +51019,23 @@ afq afq afq afq -aGO +ajp aXd -aGO -aGO +ajp +ajp afq afq -aGO -aGO -aGO +ajp +ajp +ajp afq afq afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq @@ -51194,33 +51054,33 @@ afq afq afq afq -aGO -aGO -aGO +ajp +ajp +ajp afq afq afq afq afq -aGO +ajp afq afq afq -aGO -aGO -aGO +ajp +ajp +ajp afq afq -aGO -aGO +ajp +ajp afq afq afq afq afq -aGO -aGO -aGO +ajp +ajp +ajp afq afq afq @@ -51231,8 +51091,8 @@ afq afq bWN bWN -ayK -bWN +aaA +acp aaA aaA aAN @@ -51264,8 +51124,8 @@ aCK owP agh pxw -aKt -aKt +ayE +ayE pxw afq afq @@ -51353,13 +51213,13 @@ afq afq afq afq -aGO -aGO -aGO -aGO -aGO -aGO -aGO +ajp +ajp +ajp +ajp +ajp +ajp +ajp afq afq afq @@ -51368,7 +51228,7 @@ afq afq afq afq -aGO +ajp afq afq afq @@ -51387,35 +51247,35 @@ afq afq afq afq -aGO -aGO -aGO +ajp +ajp +ajp afq afq afq afq afq -aGO -aGO -aGO +ajp +ajp +ajp afq -aGO -aGO -aGO +ajp +ajp +ajp afq afq afq -aGO +ajp afq afq afq afq -aGO -aGO -aGO -aGO -aGO -aGO +ajp +ajp +ajp +ajp +ajp +ajp afq afq afq @@ -51459,7 +51319,7 @@ owP agh pxw uHs -aKt +ayE pxw afq afq @@ -51547,11 +51407,11 @@ afq afq afq afq -aGO -aGO -aGO +ajp +ajp +ajp aXh -aGO +ajp afq afq afq @@ -51562,9 +51422,9 @@ afq afq afq afq -aGO -aGO -aGO +ajp +ajp +ajp afq afq afq @@ -51582,35 +51442,35 @@ afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq apL -aGO -aGO +ajp +ajp afq -aGO +ajp aXH -aGO -aGO +ajp +ajp afq afq afq afq -aGO +ajp afq afq afq -aGO -aGO +ajp +ajp afq -aGO +ajp afq afq -aGO -aGO +ajp +ajp afq afq afq @@ -51619,7 +51479,7 @@ afq afq bWN auP -aLl +aaA bWN bWN aaA @@ -51652,8 +51512,8 @@ aLN owP agh pxw -aKt -aKt +ayE +ayE pxw afq afq @@ -51742,10 +51602,10 @@ afq afq afq asH -aGO -aGO -aGO -aGO +ajp +ajp +ajp +ajp afq afq afq @@ -51757,8 +51617,8 @@ afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq @@ -51776,8 +51636,8 @@ afq afq afq apL -aGO -aGO +ajp +ajp afq afq afq @@ -51785,36 +51645,36 @@ afq afq afq afq -aGO +ajp afq -aGO -aGO +ajp +ajp afq afq afq afq -aGO +ajp afq afq -aGO -aGO +ajp +ajp afq afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq -aGO +ajp afq afq bWN -awb -aLO -ayK +avu +awA +aaA acp aaA aAN @@ -51846,8 +51706,8 @@ aFD owP agh pxw -aKt -aKt +ayE +ayE pxw afq afq @@ -51936,10 +51796,10 @@ afq afq afq abL -aGO +ajp aXd -aGO -aGO +ajp +ajp afq afq afq @@ -51951,8 +51811,8 @@ afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq @@ -51971,43 +51831,43 @@ afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq afq afq -aGO -aGO +ajp +ajp afq afq -aGO +ajp afq afq -aGO -aGO -aGO +ajp +ajp +ajp afq afq -aGO -aGO +ajp +ajp afq afq afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq -aGO +ajp afq bWN awA -ffg +aaA lKG bWN aaA @@ -52040,7 +51900,7 @@ owP owP agh pxw -aKt +ayE cQT pxw afq @@ -52131,8 +51991,8 @@ afq afq afq abL -aGO -aGO +ajp +ajp afq afq afq @@ -52144,8 +52004,8 @@ afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq @@ -52165,27 +52025,27 @@ afq afq afq afq -aGO -aGO -aGO -aGO -aGO +ajp +ajp +ajp +ajp +ajp afq afq -aGO -aGO +ajp +ajp afq afq -aGO -aGO -aGO -aGO +ajp +ajp +ajp +ajp afq -aGO +ajp afq afq -aGO -aGO +ajp +ajp afq afq afq @@ -52193,12 +52053,12 @@ apL afq afq afq -aGO -aGO +ajp +ajp afq afq -aGO -aGO +ajp +ajp bWN dxW axU @@ -52210,7 +52070,7 @@ aaA bWN alg aaA -ayK +aaA bWN aXk ryP @@ -52234,8 +52094,8 @@ owP agh agh pxw -aKt -aKt +ayE +ayE pxw afq afq @@ -52326,7 +52186,7 @@ afq afq afq afq -aGO +ajp afq afq afq @@ -52339,8 +52199,8 @@ afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq @@ -52363,47 +52223,47 @@ afq afq afq afq -aGO -aGO -aGO -aGO +ajp +ajp +ajp +ajp afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq afq afq afq -aGO +ajp afq afq afq -aGO +ajp afq afq afq afq -aGO -aGO -aGO -aGO +ajp +ajp +ajp +ajp afq bWN cxI iPo -mPf +axU bWN pNP aAN aaA bWN alg -asQ +aaA aaA bWN aXk @@ -52428,8 +52288,8 @@ agh agh pxw pxw -aKt -aKt +ayE +ayE pxw afq afq @@ -52520,7 +52380,7 @@ afq afq afq afq -aGO +ajp afq afq afq @@ -52534,7 +52394,7 @@ afq afq afq afq -aGO +ajp afq afq afq @@ -52559,37 +52419,37 @@ afq afq afq afq -aGO +ajp afq afq afq afq afq afq -aGO +ajp afq afq afq afq afq afq -aGO -aGO +ajp +ajp afq -aGO -aGO -aGO +ajp +ajp +ajp afq afq afq -aGO +ajp afq afq afq afq bWN mbP -qlA +axU fPD bWN aaA @@ -52622,8 +52482,8 @@ pxw pxw pxw ajW -aKt -aKt +ayE +ayE pxw afq afq @@ -52714,7 +52574,7 @@ afq afq afq afq -aGO +ajp afq afq afq @@ -52727,8 +52587,8 @@ afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq @@ -52753,30 +52613,30 @@ afq afq afq apL -aGO +ajp afq afq afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq afq afq afq -aGO -aGO -aGO +ajp +ajp +ajp afq -aGO -aGO +ajp +ajp afq afq -aGO +ajp bWN bWN bWN @@ -52790,7 +52650,7 @@ aaA aAN aaA bWN -aEx +aaA aaA uPI bWN @@ -52811,13 +52671,13 @@ pxw pxw pxw pxw -aKt -aKt -aKt -aKt -aKt -aKt -aKt +ayE +ayE +ayE +ayE +ayE +ayE +ayE pxw afq afq @@ -52908,7 +52768,7 @@ afq afq afq afq -aGO +ajp afq afq afq @@ -52921,8 +52781,8 @@ afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq @@ -52953,8 +52813,8 @@ afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq @@ -52962,13 +52822,13 @@ afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq -aGO -aGO +ajp +ajp afq afq bWN @@ -53002,16 +52862,16 @@ ryP agh pxw aAL -aKt +ayE arU wMt -aKt -aKt -aKt +ayE +ayE +ayE jmj -aKt -aKt -aKt +ayE +ayE +ayE pxw afq afq @@ -53101,8 +52961,8 @@ afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq @@ -53116,7 +52976,7 @@ afq afq afq afq -aGO +ajp afq afq afq @@ -53148,22 +53008,22 @@ afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq -aGO +ajp aXH -aGO -aGO +ajp +ajp afq afq afq afq afq -aGO -aGO +ajp +ajp afq bWN tFR @@ -53294,8 +53154,8 @@ afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq @@ -53310,8 +53170,8 @@ afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq @@ -53328,7 +53188,7 @@ afq afq afq asH -aGO +ajp asH anO afq @@ -53338,27 +53198,27 @@ afq afq afq asH -aGO +ajp afq afq afq afq -aGO -aGO +ajp +ajp afq -aGO -aGO +ajp +ajp afq -aGO -aGO +ajp +ajp afq afq afq afq afq afq -aGO -aGO +ajp +ajp bWN aaA aaA @@ -53487,26 +53347,26 @@ afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq afq afq afq -aGO -aGO -aGO -aGO +ajp +ajp +ajp +ajp afq afq afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq @@ -53531,28 +53391,28 @@ afq afq afq aXd -aGO -aGO -aGO -aGO +ajp +ajp +ajp +ajp afq afq afq -aGO -aGO -aGO -aGO +ajp +ajp +ajp +ajp afq afq -aGO -aGO +ajp +ajp afq afq afq afq afq afq -aGO +ajp bWN avS aaA @@ -53584,7 +53444,7 @@ eod eod eod agh -aKt +ayE agh cYF afq @@ -53680,34 +53540,34 @@ afq afq afq afq -aGO -aGO -aGO +ajp +ajp +ajp afq afq afq afq -aGO -aGO -aGO +ajp +ajp +ajp afq afq afq -aGO -aGO -aGO +ajp +ajp +ajp afq -aGO -aGO -aGO -aGO -aGO -aGO -aGO -aGO -aGO -aGO -aGO +ajp +ajp +ajp +ajp +ajp +ajp +ajp +ajp +ajp +ajp +ajp afq afq afq @@ -53716,37 +53576,37 @@ afq afq aWs avc -aGO +ajp asH -aGO -aGO +ajp +ajp auw afq afq afq aWs -aGO +ajp aXh -aGO +ajp ajp afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq -aGO -aGO +ajp +ajp afq afq afq afq afq afq -aGO +ajp bWN aaA aaA @@ -53874,14 +53734,14 @@ afq afq afq afq -aGO +ajp afq afq afq afq afq afq -aGO +ajp afq afq afq @@ -53889,9 +53749,9 @@ afq afq afq afq -aGO -aGO -aGO +ajp +ajp +ajp afq afq afq @@ -53901,7 +53761,7 @@ afq afq afq afq -aGO +ajp afq afq afq @@ -53911,36 +53771,36 @@ afq asH aya axA -aGO +ajp axR asH -aGO +ajp afq afq afq afq -aGO -aGO -aGO +ajp +ajp +ajp aXd afq afq afq -aGO +ajp afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq -aGO -aGO +ajp +ajp afq afq -aGO +ajp bWN bWN bWN @@ -53972,7 +53832,7 @@ aTG eod eod eod -aKt +ayE agh cYF afq @@ -54068,15 +53928,15 @@ afq afq afq afq -aGO +ajp afq afq afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq @@ -54095,29 +53955,29 @@ afq afq afq afq -aGO -aGO -aGO +ajp +ajp +ajp afq afq afq afq afq ayd -aGO -aGO +ajp +ajp auw -aGO -aGO -aGO +ajp +ajp +ajp afq afq afq -aGO -aGO -aGO -aGO -aGO +ajp +ajp +ajp +ajp +ajp afq afq afq @@ -54125,12 +53985,12 @@ afq afq afq afq -aGO -aGO +ajp +ajp afq afq -aGO -aGO +ajp +ajp afq afq afq @@ -54262,15 +54122,15 @@ afq afq afq afq -aGO -aGO -aGO +ajp +ajp +ajp afq afq afq afq afq -aGO +ajp afq afq afq @@ -54291,8 +54151,8 @@ afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq @@ -54300,17 +54160,17 @@ afq axR anO auw -aGO -aGO -aGO -aGO +ajp +ajp +ajp +ajp afq afq aXh -aGO +ajp aXd -aGO -aGO +ajp +ajp afq afq afq @@ -54320,10 +54180,10 @@ afq afq afq afq -aGO -aGO -aGO -aGO +ajp +ajp +ajp +ajp afq afq afq @@ -54455,108 +54315,108 @@ afq afq afq afq -aGO +ajp aXh -aGO -asH -afq -afq -afq -afq -afq -aGO -afq -afq -afq -afq -afq -afq -afq -afq -afq -afq -afq -afq -afq -afq -afq -afq -afq -afq -afq -afq -afq -aGO -afq -afq -afq -afq -afq -aGO -aAs +ajp asH -aWs -afq -aGO -aGO -aGO -aGO -aGO -aGO -aGO -afq -afq -afq -afq -afq -afq -afq -afq -afq -afq -afq -aGO -aGO -afq -afq -afq -afq -afq afq afq afq -bWN -aBL -bWN -aVA -aVA -hNS -aja -aEo -acG -aEo -alx -hNS -aBL -bWN -iKl -aCI -eod -aCa -aAi -aAi -aSo -aNN -neL -aNN -aAi -aAi -aAi -aVl -eod -eod -iKl -cYF +afq +afq +ajp +afq +afq +afq +afq +afq +afq +afq +afq +afq +afq +afq +afq +afq +afq +afq +afq +afq +afq +afq +afq +afq +ajp +afq +afq +afq +afq +afq +ajp +aAs +asH +aWs +afq +ajp +ajp +ajp +ajp +ajp +ajp +ajp +afq +afq +afq +afq +afq +afq +afq +afq +afq +afq +afq +ajp +ajp +afq +afq +afq +afq +afq +afq +afq +afq +bWN +aBL +bWN +aVA +aVA +hNS +aja +aEo +acG +aEo +alx +hNS +aBL +bWN +iKl +aCI +eod +aCa +aAi +aAi +aSo +aNN +neL +aNN +aAi +aAi +aAi +aVl +eod +eod +iKl +cYF afq afq afq @@ -54649,17 +54509,17 @@ afq afq afq afq -aGO -aGO +ajp +ajp auw -aGO -aGO +ajp +ajp afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq @@ -54670,17 +54530,17 @@ afq afq afq afq -aGO -aGO +ajp +ajp asH -aGO +ajp afq afq afq afq afq afq -aGO +ajp afq afq afq @@ -54692,12 +54552,12 @@ afq afq afq afq -aGO -aGO -aGO -aGO -aGO -aGO +ajp +ajp +ajp +ajp +ajp +ajp afq afq afq @@ -54710,10 +54570,10 @@ afq afq afq afq -aGO +ajp afq afq -aGO +ajp afq afq afq @@ -54844,16 +54704,16 @@ afq afq afq aXh -aGO -aGO +ajp +ajp axR -aGO +ajp afq afq afq afq afq -aGO +ajp afq afq afq @@ -54864,7 +54724,7 @@ afq afq afq afq -aGO +ajp aXd axA afq @@ -54872,9 +54732,9 @@ afq afq afq afq -aGO -aGO -aGO +ajp +ajp +ajp afq afq afq @@ -54887,11 +54747,11 @@ afq afq afq afq -aGO +ajp aXd -aGO -aGO -aGO +ajp +ajp +ajp afq afq afq @@ -54903,8 +54763,8 @@ afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq @@ -55037,17 +54897,17 @@ afq afq afq afq -aGO -aGO -aGO +ajp +ajp +ajp aXd afq afq afq afq -aGO -aGO -aGO +ajp +ajp +ajp afq afq afq @@ -55060,13 +54920,13 @@ afq afq asH axR -aGO -aGO -aGO +ajp +ajp +ajp afq afq -aGO -aGO +ajp +ajp afq aAs afq @@ -55081,12 +54941,12 @@ afq afq afq afq -aGO -aGO -aGO -aGO -aGO -aGO +ajp +ajp +ajp +ajp +ajp +ajp asH afq afq @@ -55097,13 +54957,13 @@ afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq -aGO -aGO +ajp +ajp afq bWN aBL @@ -55232,14 +55092,14 @@ afq afq afq abL -aGO -aGO -aGO +ajp +ajp +ajp afq afq afq afq -aGO +ajp afq afq afq @@ -55254,32 +55114,32 @@ afq afq afq aXh -aGO +ajp afq -aGO -aGO -aGO -aGO +ajp +ajp +ajp +ajp afq afq -aGO -aGO -aGO -aGO -aGO +ajp +ajp +ajp +ajp +ajp afq afq afq -aGO +ajp afq afq afq -aGO -aGO -aGO -aGO -aGO -aGO +ajp +ajp +ajp +ajp +ajp +ajp aXh afq afq @@ -55291,12 +55151,12 @@ afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq -aGO +ajp agB afq bWN @@ -55426,14 +55286,14 @@ afq afq afq afq -aGO +ajp asH -aGO +ajp afq afq afq afq -aGO +ajp afq afq afq @@ -55457,23 +55317,23 @@ afq afq afq afq -aGO -aGO -aGO -aGO -aGO -aGO -aGO +ajp +ajp +ajp +ajp +ajp +ajp +ajp aya -aGO +ajp afq -aGO +ajp aXd -aGO -aGO -aGO +ajp +ajp +ajp aXd -aGO +ajp afq afq afq @@ -55485,13 +55345,13 @@ afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq agB -aGO +ajp agB acr aBL @@ -55622,16 +55482,16 @@ afq afq afq afq -aGO -aGO +ajp +ajp afq -aGO -aGO -aGO -aGO -aGO -aGO -aGO +ajp +ajp +ajp +ajp +ajp +ajp +ajp afq afq afq @@ -55657,17 +55517,17 @@ afq afq afq afq -aGO -aGO -aGO -aGO -aGO -aGO +ajp +ajp +ajp +ajp +ajp +ajp aXh -aGO -aGO -aGO -aGO +ajp +ajp +ajp +ajp afq afq afq @@ -55679,9 +55539,9 @@ afq afq afq afq -aGO -aGO -aGO +ajp +ajp +ajp afq afq afq @@ -55818,15 +55678,15 @@ afq afq afq abL -aGO +ajp aAs afq afq afq -aGO +ajp afq -aGO -aGO +ajp +ajp afq afq afq @@ -55851,17 +55711,17 @@ afq afq afq afq -aGO +ajp afq afq aXd -aGO -aGO +ajp +ajp aXd aXd -aGO -aGO -aGO +ajp +ajp +ajp afq afq afq @@ -55874,8 +55734,8 @@ afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq @@ -56013,15 +55873,15 @@ afq afq afq afq -aGO +ajp afq afq afq -aGO +ajp afq afq -aGO -aGO +ajp +ajp afq afq afq @@ -56047,17 +55907,17 @@ afq afq afq afq -aGO -aGO -aGO -aGO -aGO -aGO -aGO -aGO -aGO -aGO -aGO +ajp +ajp +ajp +ajp +ajp +ajp +ajp +ajp +ajp +ajp +ajp afq asH afq @@ -56068,9 +55928,9 @@ afq afq afq afq -aGO -aGO -aGO +ajp +ajp +ajp afq afq afq @@ -56207,16 +56067,16 @@ afq afq afq afq -aGO +ajp afq afq afq -aGO +ajp afq afq afq -aGO -aGO +ajp +ajp afq afq afq @@ -56226,8 +56086,8 @@ afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq @@ -56241,20 +56101,20 @@ afq afq afq afq -aGO +ajp afq -aGO -aGO -aGO -aGO -aGO -aGO -aGO +ajp +ajp +ajp +ajp +ajp +ajp +ajp afq -aGO +ajp asH axR -aGO +ajp afq afq afq @@ -56263,8 +56123,8 @@ afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq @@ -56401,27 +56261,27 @@ afq afq afq afq -aGO +ajp afq afq afq -aGO -aGO +ajp +ajp afq afq afq -aGO -aGO +ajp +ajp afq afq afq afq afq afq -aGO -aGO -aGO -aGO +ajp +ajp +ajp +ajp asH afq afq @@ -56431,24 +56291,24 @@ afq afq afq ajp -aGO -aGO +ajp +ajp afq -aGO +ajp axR afq afq afq -aGO -aGO +ajp +ajp aXd -aGO +ajp afq afq axA auw -aGO -aGO +ajp +ajp auw afq afq @@ -56457,8 +56317,8 @@ afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq @@ -56594,30 +56454,30 @@ afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq afq -aGO +ajp afq afq afq afq -aGO +ajp afq afq afq afq afq afq -aGO -aGO +ajp +ajp aXh -aGO +ajp axA -aGO +ajp afq afq afq @@ -56626,25 +56486,25 @@ afq afq auw aAs -aGO +ajp auw -aGO +ajp afq afq ajp afq afq -aGO +ajp afq afq afq asH axR -aGO +ajp afq afq asH -aGO +ajp anO afq afq @@ -56652,7 +56512,7 @@ afq afq afq afq -aGO +ajp afq afq afq @@ -56788,18 +56648,18 @@ afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq afq -aGO +ajp asH afq afq afq -aGO +ajp afq afq afq @@ -56807,39 +56667,39 @@ afq afq afq asH -aGO -aGO -aGO +ajp +ajp +ajp aXd -aGO +ajp afq afq afq afq afq afq -aGO -aGO -aGO -aGO -aGO +ajp +ajp +ajp +ajp +ajp afq afq -aGO -aGO +ajp +ajp afq -aGO +ajp afq afq afq afq -aGO +ajp afq afq afq afq axR -aGO +ajp auw asH afq @@ -56982,18 +56842,18 @@ afq afq afq afq -aGO +ajp afq afq afq afq afq auw -aGO -aGO +ajp +ajp afq afq -aGO +ajp afq afq afq @@ -57001,11 +56861,11 @@ afq afq afq abL -aGO +ajp auw -aGO -aGO -aGO +ajp +ajp +ajp afq afq afq @@ -57014,15 +56874,15 @@ afq aWs axA auw -aGO -aGO +ajp +ajp afq afq -aGO +ajp afq -aGO -aGO -aGO +ajp +ajp +ajp afq afq afq @@ -57176,7 +57036,7 @@ afq afq afq afq -aGO +ajp afq afq afq @@ -57184,7 +57044,7 @@ afq afq axR aXd -aGO +ajp afq afq auw @@ -57196,18 +57056,18 @@ afq afq afq aXd -aGO -aGO +ajp +ajp asH -aGO +ajp afq afq afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq @@ -57370,18 +57230,18 @@ afq afq afq afq -aGO -aGO -aGO +ajp +ajp +ajp afq afq afq abL -aGO +ajp axA afq afq -aGO +ajp afq afq afq @@ -57389,11 +57249,11 @@ afq afq afq afq -aGO -aGO +ajp +ajp axR -aGO -aGO +ajp +ajp afq afq afq @@ -57401,7 +57261,7 @@ afq afq afq axR -aGO +ajp afq afq afq @@ -57562,20 +57422,20 @@ afq afq afq afq -aGO -aGO -aGO +ajp +ajp +ajp afq -aGO -aGO +ajp +ajp afq afq afq aXh -aGO +ajp afq afq -aGO +ajp afq afq afq @@ -57583,9 +57443,9 @@ afq afq afq afq -aGO -aGO -aGO +ajp +ajp +ajp afq afq afq @@ -57594,9 +57454,9 @@ afq afq afq afq -aGO -aGO -aGO +ajp +ajp +ajp afq afq afq @@ -57615,7 +57475,7 @@ afq afq afq asH -aGO +ajp afq afq afq @@ -57756,29 +57616,29 @@ afq afq afq afq -aGO +ajp afq afq afq afq afq -aGO +ajp afq afq afq afq afq afq -aGO -aGO -aGO +ajp +ajp +ajp afq afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq @@ -57790,9 +57650,9 @@ afq afq afq afq -aGO -aGO -aGO +ajp +ajp +ajp afq afq afq @@ -57808,7 +57668,7 @@ afq afq afq aWs -aGO +ajp axR asH afq @@ -57950,28 +57810,28 @@ afq afq afq afq -aGO +ajp afq afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq afq afq -aGO +ajp afq afq afq @@ -57986,25 +57846,25 @@ afq afq afq afq -aGO -aGO -aGO -aGO -aGO -aGO -aGO +ajp +ajp +ajp +ajp +ajp +ajp +ajp afq anO auw aXH -aGO -afq -aGO -aGO -aGO -aGO -aGO -aGO +ajp +afq +ajp +ajp +ajp +ajp +ajp +ajp anO afq afq @@ -58144,14 +58004,14 @@ afq afq afq afq -aGO +ajp afq afq afq afq afq afq -aGO +ajp afq afq afq @@ -58159,13 +58019,13 @@ afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq afq -aGO +ajp afq afq afq @@ -58184,23 +58044,23 @@ afq afq auw axR -aGO -aGO +ajp +ajp auw -aGO -aGO +ajp +ajp afq afq -aGO -aGO -aGO +ajp +ajp +ajp anO afq -aGO -aGO +ajp +ajp aAs -aGO -aGO +ajp +ajp afq afq afq @@ -58337,15 +58197,15 @@ afq afq afq afq -aGO -aGO +ajp +ajp afq afq -aGO -aGO +ajp +ajp afq afq -aGO +ajp afq afq afq @@ -58353,18 +58213,18 @@ afq afq afq afq -aGO -aGO -aGO +ajp +ajp +ajp afq afq afq -aGO +ajp afq afq -aGO -aGO -aGO +ajp +ajp +ajp afq afq afq @@ -58374,13 +58234,13 @@ afq afq afq afq -aGO -aGO -aGO -aGO -aGO +ajp +ajp +ajp +ajp +ajp afq -aGO +ajp aVp amA afq @@ -58391,8 +58251,8 @@ afq afq afq afq -aGO -aGO +ajp +ajp aya asH asH @@ -58531,15 +58391,15 @@ afq afq afq afq -aGO +ajp afq afq afq asH -aGO -aGO +ajp +ajp afq -aGO +ajp afq afq afq @@ -58549,17 +58409,17 @@ afq afq afq afq -aGO -aGO -aGO -aGO +ajp +ajp +ajp +ajp aAs -aGO -aGO -aGO +ajp +ajp +ajp afq -aGO -aGO +ajp +ajp afq afq afq @@ -58567,8 +58427,8 @@ afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq @@ -58587,8 +58447,8 @@ afq afq auw aUF -aGO -aGO +ajp +ajp auw afq afq @@ -58724,17 +58584,17 @@ afq afq afq afq -aGO -aGO -aGO +ajp +ajp +ajp afq aXh -aGO +ajp auw -aGO +ajp afq -aGO -aGO +ajp +ajp afq afq afq @@ -58747,21 +58607,21 @@ afq afq afq abL -aGO -aGO +ajp +ajp afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq @@ -58779,10 +58639,10 @@ afq afq afq asH -aGO +ajp axR -aGO -aGO +ajp +ajp aWs afq afq @@ -58918,17 +58778,17 @@ afq afq afq afq -aGO +ajp afq afq afq abL axA -aGO -aGO +ajp +ajp afq afq -aGO +ajp afq afq afq @@ -58948,13 +58808,13 @@ afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq afq -aGO +ajp afq afq afq @@ -58972,10 +58832,10 @@ afq asH anO axA -aGO -aGO -aGO -aGO +ajp +ajp +ajp +ajp asH anO afq @@ -59112,17 +58972,17 @@ afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq axR aXd -aGO +ajp afq afq -aGO +ajp afq afq afq @@ -59143,12 +59003,12 @@ afq afq afq afq -aGO -aGO -aGO -aGO -aGO -aGO +ajp +ajp +ajp +ajp +ajp +ajp afq afq afq @@ -59307,16 +59167,16 @@ afq afq afq afq -aGO +ajp afq afq afq -aGO -aGO +ajp +ajp asH afq afq -aGO +ajp afq afq afq @@ -59340,8 +59200,8 @@ afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq @@ -59362,7 +59222,7 @@ asH afq aMN aya -aGO +ajp asH afq afq @@ -59501,16 +59361,16 @@ afq afq afq afq -aGO -aGO +ajp +ajp afq afq -aGO -aGO +ajp +ajp afq afq afq -aGO +ajp afq afq afq @@ -59555,7 +59415,7 @@ afq afq afq asH -aGO +ajp aUb afq afq @@ -59696,15 +59556,15 @@ afq afq afq afq -aGO +ajp afq afq -aGO -aGO +ajp +ajp afq afq afq -aGO +ajp afq afq afq @@ -59891,14 +59751,14 @@ afq afq afq afq -aGO -aGO -aGO +ajp +ajp +ajp aAs -aGO -aGO -aGO -aGO +ajp +ajp +ajp +ajp afq afq afq @@ -60086,10 +59946,10 @@ afq afq afq afq -aGO -aGO -aGO -aGO +ajp +ajp +ajp +ajp afq afq afq @@ -60281,8 +60141,8 @@ afq afq afq afq -aGO -aGO +ajp +ajp afq afq afq diff --git a/maps/rift/levels/rift-09-west_caves.dmm b/maps/rift/levels/rift-09-west_caves.dmm index 8cfd8fa9083..c2f3a5d7f96 100644 --- a/maps/rift/levels/rift-09-west_caves.dmm +++ b/maps/rift/levels/rift-09-west_caves.dmm @@ -761,10 +761,6 @@ }, /turf/simulated/open/lythios43c/indoors, /area/rift/surfacebase/outside/west_caves) -"iC" = ( -/obj/spawner/window/reinforced/full, -/turf/simulated/mineral/icerock/lythios43c, -/area/rift/surfacebase/outside/west_caves/submap_seedzone) "iD" = ( /turf/simulated/mineral/floor/icerock/lythios43c/indoors/ignore_cavegen, /area/rift/facility/interior/medical) @@ -1154,12 +1150,6 @@ }, /turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors, /area/rift/facility/interior/workroom) -"nN" = ( -/obj/structure/loot_pile/surface/medicine_cabinet{ - pixel_y = -32 - }, -/turf/simulated/floor/tiled/monotile/lythios43c, -/area/rift/facility/interior/bathrooms) "nU" = ( /obj/structure/transit_tube/high_velocity{ icon_state = "N-S" @@ -1400,8 +1390,7 @@ /area/rift/facility/interior/workroom) "qF" = ( /obj/random/obstruction, -/obj/machinery/power/apc/alarms_hidden/north_mount{ - }, +/obj/machinery/power/apc/alarms_hidden/north_mount, /obj/effect/floor_decal/techfloor/orange{ dir = 1 }, @@ -1659,9 +1648,6 @@ }, /turf/simulated/floor/tiled/steel_dirty/lythios43c, /area/rift/surfacebase/outside/west_caves) -"tM" = ( -/turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors, -/area/rift/exterior/bunker/lower) "tP" = ( /turf/simulated/mineral/ignore_cavegen/lythios43c, /area/rift/surfacebase/outside/west_caves) @@ -2064,15 +2050,6 @@ }, /turf/simulated/floor/tiled/steel_dirty/lythios43c, /area/rift/surfacebase/outside/west_caves) -"xZ" = ( -/obj/structure/bed/chair/bay{ - dir = 4 - }, -/obj/effect/floor_decal/techfloor/orange{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor/grid/lythios43c/indoors, -/area/rift/facility/interior/workroom) "yv" = ( /turf/simulated/floor/tiled/techfloor/grid/lythios43c/indoors, /area/rift/exterior/mineshaft) @@ -2203,7 +2180,7 @@ "As" = ( /obj/machinery/power/apc/alarms_hidden/north_mount{ cell_type = null; - chargelevel = 0; + chargelevel = 0 }, /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -2389,13 +2366,6 @@ "Cm" = ( /turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors, /area/rift/facility/interior/underground1) -"Cq" = ( -/obj/structure/railing/grey{ - dir = 1 - }, -/obj/structure/catwalk/plank, -/turf/simulated/open/lythios43c, -/area/rift/surfacebase/outside/west_caves) "Cv" = ( /obj/machinery/suit_storage_unit/mining, /turf/simulated/floor/tiled/techmaint, @@ -2512,10 +2482,6 @@ }, /turf/simulated/open/lythios43c, /area/rift/surfacebase/outside/west_caves) -"Dz" = ( -/obj/structure/catwalk/plank, -/turf/simulated/open/lythios43c, -/area/rift/surfacebase/outside/west_caves) "DJ" = ( /obj/structure/salvageable/data, /obj/effect/floor_decal/techfloor/orange{ @@ -2866,9 +2832,6 @@ /obj/effect/floor_decal/industrial/warning/dust, /turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors, /area/outpost/mining_main/outpost) -"GI" = ( -/turf/simulated/open/lythios43c, -/area/rift/surfacebase/outside/west_caves) "GN" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -3165,9 +3128,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/steel_grid, /area/outpost/mining_main/outpost/storage) -"KS" = ( -/turf/simulated/floor/tiled/steel/lythios43c, -/area/rift/facility/interior/workroom) "KU" = ( /obj/structure/lattice, /turf/simulated/open/lythios43c, @@ -3409,12 +3369,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid/lythios43c/indoors, /area/rift/facility/interior/workroom) -"Ob" = ( -/obj/effect/floor_decal/techfloor/orange{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor/grid/lythios43c/indoors, -/area/rift/facility/interior/workroom) "Og" = ( /obj/structure/catwalk, /turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors, @@ -3422,10 +3376,6 @@ "Oh" = ( /turf/simulated/mineral/floor/icerock/lythios43c/indoors/ignore_cavegen, /area/rift/surfacebase/outside/west_caves/submap_seedzone) -"Ot" = ( -/obj/structure/catwalk, -/turf/simulated/open/lythios43c, -/area/rift/surfacebase/outside/west_caves) "Ou" = ( /obj/machinery/door/firedoor/glass, /obj/spawner/window/reinforced/full, @@ -3592,10 +3542,6 @@ "Qd" = ( /turf/simulated/floor/outdoors/rocks/lythios43c/indoors, /area/rift/surfacebase/outside/west_caves) -"Qe" = ( -/obj/structure/grille/broken, -/turf/simulated/floor/lythios43c/indoors, -/area/rift/facility/interior/command) "Qh" = ( /obj/machinery/light/small, /turf/simulated/mineral/floor/icerock/lythios43c/indoors/ignore_cavegen, @@ -3706,9 +3652,6 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/outpost/mining_main/outpost) -"Ra" = ( -/turf/simulated/open/lythios43c, -/area/rift/surfacebase/outside/west_caves) "Rd" = ( /obj/machinery/light/small{ dir = 8 @@ -3748,7 +3691,7 @@ "RG" = ( /obj/machinery/power/apc/alarms_hidden/north_mount{ cell_type = null; - chargelevel = 0; + chargelevel = 0 }, /obj/effect/floor_decal/borderfloor{ dir = 9 @@ -3806,9 +3749,6 @@ "Sv" = ( /turf/simulated/floor/tiled/steel_dirty/lythios43c, /area/rift/surfacebase/outside/west_caves) -"Sw" = ( -/turf/simulated/floor/lythios43c/indoors, -/area/rift/facility/interior/command) "SF" = ( /obj/structure/cable/white{ icon_state = "1-8" @@ -3840,9 +3780,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel_grid, /area/outpost/mining_main/outpost) -"SP" = ( -/turf/simulated/floor/tiled/monotile/lythios43c, -/area/rift/facility/interior/bathrooms) "SQ" = ( /obj/structure/toilet{ dir = 4 @@ -3963,10 +3900,6 @@ /obj/structure/stairs/spawner/south, /turf/simulated/floor/lythios43c, /area/rift/surfacebase/outside/west_caves) -"Uz" = ( -/obj/structure/railing, -/turf/simulated/open/lythios43c, -/area/rift/surfacebase/outside/west_caves) "UC" = ( /obj/effect/floor_decal/industrial/warning/dust, /turf/simulated/floor/tiled/steel/lythios43c, @@ -4137,9 +4070,6 @@ "VL" = ( /turf/simulated/floor, /area/rnd/outpost/maintenance) -"VS" = ( -/turf/simulated/wall/r_wall, -/area/rift/surfacebase/outside/west_caves) "VU" = ( /obj/machinery/power/geothermal_collector/fourway, /turf/simulated/floor/outdoors/lava/indoors/geothermal, @@ -4205,15 +4135,6 @@ /obj/item/suit_cooling_unit, /turf/simulated/floor/tiled/steel_grid, /area/outpost/mining_main/outpost/storage) -"WL" = ( -/obj/structure/toilet{ - pixel_y = 9 - }, -/obj/machinery/light/small{ - dir = 4 - }, -/turf/simulated/floor/tiled/monotile/lythios43c, -/area/rift/facility/interior/bathrooms) "WQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -4303,10 +4224,6 @@ }, /turf/simulated/floor/tiled/white, /area/outpost/mining_main/outpost/washrooms) -"XB" = ( -/obj/effect/overlay/snow/floor, -/turf/simulated/floor/lythios43c, -/area/rift/facility/interior/medical) "XC" = ( /obj/structure/barricade/cutout/fluke, /turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors, @@ -4323,9 +4240,6 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/outpost/mining_main/outpost/storage) -"XG" = ( -/turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors, -/area/rift/facility/interior/workroom) "XJ" = ( /turf/simulated/mineral/floor/ignore_cavegen/lythios43c, /area/rift/surfacebase/outside/west_caves/submap_seedzone) @@ -4536,9 +4450,6 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/rnd/outpost/atmos) -"ZM" = ( -/turf/simulated/floor/lythios43c/indoors, -/area/rift/surfacebase/outside/west_caves) "ZQ" = ( /obj/machinery/power/geothermal_collector/manifold{ dir = 4 @@ -7880,9 +7791,9 @@ Fx Fx vI vI -Sw -Sw -Sw +yE +yE +yE vI vI be @@ -8070,11 +7981,11 @@ MC Fx Vb zC -SP +gP lq vI -Sw -Sw +yE +yE BC yE BC @@ -8267,11 +8178,11 @@ Fx Ds Ds PZ -Sw -Sw yE -Sw -Sw +yE +yE +yE +yE vI ux be @@ -8456,16 +8367,16 @@ fP Cm vh Fx -WL +jd UN gP lf PZ -Sw -Sw -Sw +yE +yE +yE KI -Sw +yE PZ ux ux @@ -8655,11 +8566,11 @@ Fx Ds Ds PZ -Sw +yE BC -Sw -Sw -Sw +yE +yE +yE PZ ux ux @@ -8846,14 +8757,14 @@ rA Fx jd kR -SP -nN +gP +lq vI -Sw -Sw -Sw -Sw -Sw +yE +yE +yE +yE +yE vI ux ux @@ -9043,9 +8954,9 @@ Fx pN Fx vI -Qe DO -Sw +DO +yE DO DO vI @@ -9422,21 +9333,21 @@ be be mB NX -Ob -Ob -Ob qp -Ob -Ob -Ob -Ob -Ob -Ob +qp +qp +qp +qp +qp +qp +qp +qp +qp WY WY -xZ xu -Ob +xu +qp qp Ba FO @@ -9810,18 +9721,18 @@ be be mB SV -KS +jZ jj jZ jZ jj -KS +jZ jj jZ jZ jZ -KS -XG +jZ +jj Fk Fk Fk @@ -10208,8 +10119,8 @@ Te Te Te zW -XB -XB +fg +fg hv dc hv @@ -10399,8 +10310,8 @@ be be Te oT -XB -XB +fg +fg hv hv hv @@ -10408,7 +10319,7 @@ ie ie ie hv -XB +fg EO Te be @@ -10592,7 +10503,7 @@ be be iD zW -XB +fg hv hv dc @@ -10786,7 +10697,7 @@ be iD iD zW -XB +fg hv ie ie @@ -10797,7 +10708,7 @@ ie ie dc hv -XB +fg Te be be @@ -10991,7 +10902,7 @@ ie ie ie hv -XB +fg Te be be @@ -11174,7 +11085,7 @@ be iD aQ zW -XB +fg ie ie ie @@ -11185,7 +11096,7 @@ ie ie ie hv -XB +fg Te be be @@ -11368,7 +11279,7 @@ be iD aQ zW -XB +fg ie ie ie @@ -11378,7 +11289,7 @@ ie ie ie hv -XB +fg kz Te be @@ -11562,7 +11473,7 @@ be iD aQ aQ -XB +fg hv ie ie @@ -11572,7 +11483,7 @@ ie ie ie hv -XB +fg hn Te be @@ -11755,7 +11666,7 @@ be be iD iD -XB +fg hv hv dc @@ -11950,7 +11861,7 @@ be be iD dj -XB +fg hv hv ie @@ -11959,7 +11870,7 @@ ie ie ie hv -XB +fg dj Te Te @@ -11973,8 +11884,8 @@ JD JD JD US -ZM -ZM +pG +pG US JD JD @@ -12145,15 +12056,15 @@ be be Te qL -XB -XB +fg +fg hv hv dc ie hv hv -XB +fg Vj yN Te @@ -12342,10 +12253,10 @@ As ST kz UQ -XB fg -XB -XB +fg +fg +fg UQ dS GR @@ -12359,7 +12270,7 @@ JD JD JD gx -ZM +pG KD Je xA @@ -12424,15 +12335,15 @@ ge Wn Wn Wn -ZM -ZM -ZM -ZM -ZM -ZM -ZM -ZM -ZM +pG +pG +pG +pG +pG +pG +pG +pG +pG tP tP tP @@ -12553,10 +12464,10 @@ JD JD JD US -ZM pG -ZM -ZM +pG +pG +pG tT Je US @@ -12603,7 +12514,7 @@ ge tP tP tP -ZM +pG ge tP tP @@ -12618,15 +12529,15 @@ ge ge ge Wn -ZM +pG Kf Kf -ZM -ZM -ZM -ZM -ZM -ZM +pG +pG +pG +pG +pG +pG Wn tP tP @@ -12751,8 +12662,8 @@ gx tT tT gx -ZM -ZM +pG +pG gx JD JD @@ -12941,10 +12852,10 @@ JD JD JD US -ZM +pG xA -ZM -ZM +pG +pG pG Je US @@ -14544,8 +14455,8 @@ ge ge ge ge -Ra -Ra +uD +uD ge ge ge @@ -14558,9 +14469,9 @@ ge ge ge ge -Ra -Ra -Ra +uD +uD +uD ge ge ge @@ -14738,9 +14649,9 @@ ge ge ge ge -Ra -Ra -Ra +uD +uD +uD ge ge ge @@ -14752,10 +14663,10 @@ ge ge ge ge -Ra -Ra -Ra -Ra +uD +uD +uD +uD ge ge ge @@ -14932,25 +14843,25 @@ ge ge ge ge -Ra -Ra -Ra -Ra +uD +uD +uD +uD ge ge ge ge ge ge -Ra -Ra +uD +uD ge ge ge ge ge -Ra -Ra +uD +uD ge ge ge @@ -15127,9 +15038,9 @@ ge ge ge ge -Ra -Ra -Ra +uD +uD +uD ge ge ge @@ -15322,9 +15233,9 @@ ge ge ge ge -Ra -Ra -Ra +uD +uD +uD ge ge ge @@ -15516,16 +15427,16 @@ ge ge ge ge -Ra -Ra -Ra +uD +uD +uD ge ge Wn Wn Wn -Ra -Ra +uD +uD ge ge ge @@ -15711,15 +15622,15 @@ ge ge ge ge -Ra -Ra -Ra +uD +uD +uD Wn Wn tP Wn Wn -Ra +uD ge ge ge @@ -15905,7 +15816,7 @@ ge ge ge ge -Ra +uD Wn Wn Wn @@ -15913,7 +15824,7 @@ tP tP Wn Wn -Ra +uD ge ge ge @@ -16098,7 +16009,7 @@ Wn ge ge ge -Ra +uD Wn Wn tP @@ -16292,7 +16203,7 @@ Wn Wn ge ge -Ra +uD Wn tP tP @@ -16686,7 +16597,7 @@ Wn Wn Wn Wn -Ra +uD ge ge ge @@ -16869,13 +16780,13 @@ Wn Wn Wn Wn -Ra -Ra +uD +uD Wn Wn Wn -Ra -Ra +uD +uD Wn Wn Wn @@ -17064,13 +16975,13 @@ Wn Wn Wn ge -Ra -Ra -Ra -Ra -Ra -Ra -Ra +uD +uD +uD +uD +uD +uD +uD ge ge ge @@ -17256,15 +17167,15 @@ Wn Wn ge ge -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra +uD +uD +uD +uD +uD +uD +uD +uD +uD ge ge ge @@ -17452,13 +17363,13 @@ ge ge ge ge -Ra -Ra -Ra -Ra -Ra -Ra -Ra +uD +uD +uD +uD +uD +uD +uD ge ge ge @@ -17514,7 +17425,7 @@ lx lx lx lx -tM +lx qR JD JD @@ -17644,14 +17555,14 @@ ge ge ge ge -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra +uD +uD +uD +uD +uD +uD +uD +uD ge ge ge @@ -17702,7 +17613,7 @@ qR lx lx uS -tM +lx lx lx XC @@ -17838,14 +17749,14 @@ ge ge ge ge -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra +uD +uD +uD +uD +uD +uD +uD +uD ge ge ge @@ -17893,7 +17804,7 @@ Sn Sn JD qR -tM +lx lx lx lx @@ -18034,11 +17945,11 @@ ge ge ge ge -Ra -Ra -Ra -Ra -Ra +uD +uD +uD +uD +uD ge ge ge @@ -18093,7 +18004,7 @@ lx lx lx lx -tM +lx lx lx lx @@ -18229,9 +18140,9 @@ ge ge ge ge -Ra -Ra -Ra +uD +uD +uD ge ge ge @@ -18423,9 +18334,9 @@ ge ge ge ge -Ra -Ra -Ra +uD +uD +uD ge ge ge @@ -18615,11 +18526,11 @@ ge ge ge ge -Ra -Ra -Ra -Ra -Ra +uD +uD +uD +uD +uD ge ge ge @@ -18808,11 +18719,11 @@ ge ge ge ge -Ra -Ra -Ra -Ra -Ra +uD +uD +uD +uD +uD ge ge ge @@ -18871,7 +18782,7 @@ lx lx qR qR -tM +lx lx qR JD @@ -19002,10 +18913,10 @@ Wn ge ge ge -Ra -Ra -Ra -Ra +uD +uD +uD +uD ge ge ge @@ -19058,14 +18969,14 @@ Sn JD qR Yu -tM lx lx lx lx lx lx -tM +lx +lx uS qR JD @@ -19196,9 +19107,9 @@ Wn Wn ge ge -Ra -Ra -Ra +uD +uD +uD ge ge ge @@ -19255,7 +19166,7 @@ lx lx XC lx -tM +lx lx lx uS @@ -19389,10 +19300,10 @@ Wn Wn Wn ge -Ra -Ra -Ra -Ra +uD +uD +uD +uD ge ge ge @@ -19582,10 +19493,10 @@ tP Wn Wn Wn -Ra -Ra -Ra -Ra +uD +uD +uD +uD ge ge ge @@ -19778,7 +19689,7 @@ Wn Wn Wn Wn -Ra +uD ge ge ge @@ -19966,8 +19877,8 @@ Wn ge ge ge -Ra -Ra +uD +uD Wn Wn Wn @@ -20157,12 +20068,12 @@ tP tP Wn Wn -Ra -Ra -Ra -Ra +uD +uD +uD +uD ge -Ra +uD Wn Wn Wn @@ -25005,7 +24916,7 @@ Sn Sn Sn Sn -iC +Sn Sn Sn Sn @@ -35314,7 +35225,7 @@ WX ux nY ux -ZM +pG DZ Dc Pl @@ -35510,8 +35421,8 @@ ux ux CK ad -ZM -ZM +pG +pG yA Ly Zb @@ -35893,14 +35804,14 @@ Yg ri ga WX -ZM +pG wS Fa Pl EB Dc -ZM -ZM +pG +pG wS CH ux @@ -36238,12 +36149,12 @@ vv vv vv vv -Ra -Ra -Ra -Ra -Ra -Ra +uD +uD +uD +uD +uD +uD wH wH mJ @@ -36429,15 +36340,15 @@ vv vv vv vv -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra +uD +uD +uD +uD +uD +uD +uD +uD +uD wH wH mJ @@ -36478,7 +36389,7 @@ qU qU ga WX -ZM +pG Mt ux ux @@ -36620,18 +36531,18 @@ vv vv vv vv -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD wH wH mJ @@ -36672,7 +36583,7 @@ qU qU ga WX -ZM +pG Mt ux ux @@ -36807,25 +36718,25 @@ vv vv vv vv -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD wH wH mJ @@ -36991,35 +36902,35 @@ vv vv vv vv -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD AL AL Vp @@ -37176,43 +37087,43 @@ vv vv vv vv -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD tW xU Dh @@ -37368,45 +37279,45 @@ vv vv vv vv -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD tW Zy Sv @@ -37541,66 +37452,66 @@ vv vv vv vv -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD tW Zy Sv @@ -37731,70 +37642,70 @@ vv "} (172,1,1) = {" gk -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD tW Zy Sv @@ -37925,70 +37836,70 @@ vv "} (173,1,1) = {" gk -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD tW Zy Sv @@ -38119,70 +38030,70 @@ vv "} (174,1,1) = {" gk -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD tW Zy Sv @@ -38266,14 +38177,14 @@ be be be be -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra +uD +uD +uD +uD +uD +uD +uD +uD be be be @@ -38313,70 +38224,70 @@ vv "} (175,1,1) = {" gk -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD tW Zy vz @@ -38420,12 +38331,12 @@ wO WX Rj Mt -Ra -Ra -Ra -Ra -Ra -Ra +uD +uD +uD +uD +uD +uD ux be be @@ -38457,20 +38368,20 @@ be be be be -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD be be be @@ -38497,80 +38408,80 @@ Og Og Ql US -Ra -Ra -Ra -Ra -Ra -Ra +uD +uD +uD +uD +uD +uD gk "} (176,1,1) = {" gk -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD tW Zy vz @@ -38598,29 +38509,29 @@ OF OF OF OF -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD tW WX wS qf -Ra -Ra -Ra -Ra -Ra -Ra -Ra +uD +uD +uD +uD +uD +uD +uD be be be @@ -38648,26 +38559,26 @@ be be be be -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD be be be @@ -38691,80 +38602,80 @@ Og Og qK US -Ra -Ra -Ra -Ra -Ra -Ra +uD +uD +uD +uD +uD +uD gk "} (177,1,1) = {" gk -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD tW Zy Sv @@ -38781,51 +38692,45 @@ Sv Sv gj XD -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD tW kx YW tr -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -be -be -be -be -be -be +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD be be be @@ -38839,126 +38744,132 @@ be be be be -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra be be be be be be -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Qs -kx -kx -rT -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -gk -"} -(178,1,1) = {" -gk -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +be +be +be +be +be +be +uD +uD +uD +uD +uD +uD +uD +Qs +kx +kx +rT +uD +uD +uD +uD +uD +uD +uD +uD +gk +"} +(178,1,1) = {" +gk +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD tW Zy Sv @@ -38975,184 +38886,184 @@ Sv Sv gj XD -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD tW kx wS -ZM -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -be -be -be -be -be -be -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra +pG +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +be +be +be +be +be +be +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD Qs kx kx rT -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra +uD +uD +uD +uD +uD +uD +uD +uD gk "} (179,1,1) = {" gk -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD tW Xw YV @@ -39169,185 +39080,185 @@ YV YV bm XD -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD tW Sp wS TG -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD Qs kx kx rT -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra +uD +uD +uD +uD +uD +uD +uD +uD gk "} (180,1,1) = {" gk -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD OF OF OF @@ -39362,2444 +39273,2444 @@ OF OF OF OF -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -tW -kx -wS -tr -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Qs -kx -kx -rT -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -gk -"} -(181,1,1) = {" -gk -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -tW -kx -YW -ZM -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -fj -ru -ru -Vr -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -gk -"} -(182,1,1) = {" -gk -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD tW kx wS tr -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -uP -Dz -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -gk -"} -(183,1,1) = {" -gk -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -tW -Sp -wS -TG -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -uP -Dz -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -gk +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +Qs +kx +kx +rT +uD +uD +uD +uD +uD +uD +uD +uD +gk +"} +(181,1,1) = {" +gk +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +tW +kx +YW +pG +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +fj +ru +ru +Vr +uD +uD +uD +uD +uD +uD +uD +uD +gk +"} +(182,1,1) = {" +gk +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +tW +kx +wS +tr +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uP +pA +uD +uD +uD +uD +uD +uD +uD +uD +uD +gk +"} +(183,1,1) = {" +gk +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +tW +Sp +wS +TG +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uP +pA +uD +uD +uD +uD +uD +uD +uD +uD +uD +gk "} (184,1,1) = {" gk -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD tW kx wS tr -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD uP -Dz -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra +pA +uD +uD +uD +uD +uD +uD +uD +uD +uD gk "} (185,1,1) = {" gk -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD tW kx YW -ZM -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra +pG +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD uP -Dz -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra +pA +uD +uD +uD +uD +uD +uD +uD +uD +uD gk "} (186,1,1) = {" gk -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD tW kx wS -ZM -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra +pG +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD uP -Dz -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra +pA +uD +uD +uD +uD +uD +uD +uD +uD +uD gk "} (187,1,1) = {" gk -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD tW Sp wS TG -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD uP -Dz -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra +pA +uD +uD +uD +uD +uD +uD +uD +uD +uD gk "} (188,1,1) = {" gk -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD tW kx wS -ZM -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra +pG +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD uP -Dz -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra +pA +uD +uD +uD +uD +uD +uD +uD +uD +uD gk "} (189,1,1) = {" gk -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD tW kx YW tr -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD uP -Dz -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra +pA +uD +uD +uD +uD +uD +uD +uD +uD +uD gk "} (190,1,1) = {" gk -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD tW kx wS tr -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD uP -Dz -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra +pA +uD +uD +uD +uD +uD +uD +uD +uD +uD gk "} (191,1,1) = {" gk -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD tW Sp wS qf -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD uP -Dz -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra -Ra +pA +uD +uD +uD +uD +uD +uD +uD +uD +uD gk "} (192,1,1) = {" gk -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -Uz -Ot -VS +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +tW +kx +wS PE -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -GI -Cq +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uD +uP pA -GI -GI -GI -GI -GI -GI -GI -GI +uD +uD +uD +uD +uD +uD +uD +uD uD gk "} diff --git a/maps/rift/levels/rift-10-west_plains.dmm b/maps/rift/levels/rift-10-west_plains.dmm index 093fe75fc25..02c0b954d93 100644 --- a/maps/rift/levels/rift-10-west_plains.dmm +++ b/maps/rift/levels/rift-10-west_plains.dmm @@ -266,7 +266,7 @@ /turf/simulated/wall, /area/rnd/outpost/storage) "bz" = ( -/obj/structure/simple_door, +/obj/structure/simple_door/wood, /turf/simulated/floor/tiled/steel_dirty, /area/rift/exterior/checkpoint/south) "bA" = ( @@ -1098,7 +1098,7 @@ "fj" = ( /obj/machinery/power/apc/alarms_hidden/north_mount{ cell_type = null; - chargelevel = 0; + chargelevel = 0 }, /obj/effect/floor_decal/borderfloor{ dir = 5 @@ -1991,10 +1991,6 @@ }, /turf/simulated/floor/plating, /area/rift/exterior/nuketown/interior) -"iX" = ( -/obj/effect/overlay/snow/floor, -/turf/simulated/floor/lythios43c, -/area/rift/facility/interior/surface) "iY" = ( /obj/machinery/atmospherics/component/unary/vent_pump{ dir = 4 @@ -2032,9 +2028,6 @@ }, /turf/simulated/floor, /area/rnd/outpost/atmos) -"ji" = ( -/turf/simulated/floor/tiled/steel_grid/lythios43c, -/area/rift/surfacebase/outside/west) "jm" = ( /turf/simulated/wall, /area/rift/facility/interior/elevator) @@ -2755,13 +2748,6 @@ }, /turf/simulated/floor/tiled/steel_dirty/lythios43c, /area/construction/solars) -"mJ" = ( -/obj/structure/cable/heavyduty{ - icon_state = "4-8" - }, -/obj/structure/railing, -/turf/simulated/floor/lythios43c, -/area/rift/surfacebase/outside/west) "mL" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/machinery/light{ @@ -3571,10 +3557,6 @@ /obj/effect/overlay/snow/floor, /turf/simulated/floor/lythios43c/indoors, /area/rift/facility/interior/surface) -"qN" = ( -/obj/structure/closet/crate/radiation, -/turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors, -/area/rift/facility/exterior/shuttle) "qO" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -3748,13 +3730,6 @@ }, /turf/simulated/floor, /area/construction/solarscontrol) -"rB" = ( -/obj/structure/bed/chair/shuttle{ - dir = 1 - }, -/obj/effect/overlay/snow/floor, -/turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors, -/area/rift/facility/exterior/shuttle) "rE" = ( /obj/structure/extinguisher_cabinet{ dir = 1; @@ -4242,10 +4217,6 @@ "tG" = ( /turf/simulated/floor/tiled/techfloor/grid/lythios43c/indoors, /area/rift/facility/exterior) -"tH" = ( -/obj/effect/overlay/snow/floor, -/turf/simulated/floor/tiled/steel_dirty/lythios43c, -/area/rift/facility/interior/surface) "tI" = ( /turf/simulated/open/lythios43c, /area/rift/facility/interior/surface) @@ -4543,7 +4514,7 @@ "uU" = ( /obj/machinery/power/apc/alarms_hidden/north_mount{ cell_type = null; - chargelevel = 0; + chargelevel = 0 }, /turf/simulated/floor/outdoors/snow/lythios43c, /area/rift/facility/interior/surface) @@ -4787,7 +4758,7 @@ /turf/simulated/floor/tiled/dark, /area/rnd/outpost/anomaly_lab/analysis) "vY" = ( -/obj/structure/simple_door/iron, +/obj/structure/simple_door/wood, /turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors, /area/rift/exterior/checkpoint/south) "vZ" = ( @@ -4935,15 +4906,6 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor, /area/rnd/outpost/atmos) -"wL" = ( -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 10 - }, -/turf/simulated/floor/tiled/steel_grid/lythios43c, -/area/rift/surfacebase/outside/west) "wP" = ( /obj/machinery/door/blast/shutters{ dir = 8; @@ -6195,12 +6157,6 @@ /obj/machinery/portable_atmospherics/canister/empty, /turf/simulated/floor, /area/rnd/outpost/storage) -"CX" = ( -/obj/effect/overlay/snow/floor/edges, -/obj/effect/overlay/snow/floor, -/obj/machinery/light/small, -/turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors, -/area/rift/facility/exterior/shuttle) "CY" = ( /obj/effect/map_effect/radiation_emitter/strong, /turf/simulated/floor/outdoors/snow/lythios43c, @@ -6419,7 +6375,7 @@ "DU" = ( /obj/machinery/power/apc/alarms_hidden/north_mount{ cell_type = null; - chargelevel = 0; + chargelevel = 0 }, /turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors, /area/rift/facility/exterior/shuttle) @@ -6507,10 +6463,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost/testing_lab) -"EF" = ( -/obj/effect/floor_decal/rust, -/turf/simulated/floor/plating, -/area/rift/exterior/nuketown/interior) "EG" = ( /obj/structure/catwalk, /turf/simulated/floor/lythios43c/indoors, @@ -6851,9 +6803,6 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/outpost/mixing) -"Gr" = ( -/turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors, -/area/rift/facility/exterior/shuttle) "Gs" = ( /obj/machinery/vending/coffee{ dir = 8 @@ -7908,10 +7857,6 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/outpost/heating) -"Lb" = ( -/obj/structure/railing, -/turf/simulated/open/lythios43c, -/area/rift/surfacebase/outside/west) "Lf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -7932,10 +7877,6 @@ }, /turf/simulated/floor/tiled, /area/outpost/mining_main/outpost/airlock/one) -"Lv" = ( -/obj/effect/overlay/snow/floor, -/turf/simulated/floor/lythios43c/indoors, -/area/rift/facility/interior/surface) "Lx" = ( /obj/random/trash_pile, /turf/simulated/floor/tiled/steel_dirty/lythios43c, @@ -8272,8 +8213,8 @@ /area/rnd/outpost/anomaly_lab) "Na" = ( /obj/machinery/door/firedoor{ - req_one_access = list(18,47); - dir = 4 + dir = 4; + req_one_access = list(18,47) }, /turf/simulated/floor/tiled, /area/rnd/outpost) @@ -8702,16 +8643,6 @@ /obj/structure/barricade/cutout, /turf/simulated/floor/outdoors/snow/lythios43c, /area/rift/exterior/nuketown) -"Pg" = ( -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 6 - }, -/obj/structure/railing, -/turf/simulated/floor/tiled/steel_grid/lythios43c, -/area/rift/surfacebase/outside/west) "Pi" = ( /obj/structure/window/wooden{ dir = 1 @@ -10417,10 +10348,6 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/outpost/heating) -"Xw" = ( -/obj/effect/overlay/snow/floor, -/turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors, -/area/rift/facility/interior/surface) "Xy" = ( /obj/structure/fence/door, /turf/simulated/floor/outdoors/snow/lythios43c, @@ -14698,7 +14625,7 @@ ip TF ns vE -iX +dx dx dx bk @@ -14709,11 +14636,11 @@ Rs Yn yj lF -rB +rf da cn mF -Gr +vW bS bS cn @@ -14908,7 +14835,7 @@ LN vh ul vW -Gr +vW fU cn as @@ -15098,12 +15025,12 @@ rw yj FR rf -CX +da cn DU vW XE -qN +bS cn as mY @@ -15861,11 +15788,11 @@ Rs Rs Rs VU -iX +dx dx dx sl -Lv +Dg sr sr sr @@ -18008,7 +17935,7 @@ bk dx ns tT -Xw +lo ti sr sr @@ -18393,9 +18320,9 @@ tI tI bk dx -Xw +lo kc -Xw +lo fc kc sr @@ -18456,7 +18383,7 @@ zz zz RU zz -EF +zz zz lH wu @@ -18577,7 +18504,7 @@ Rs Rs Rs ns -tH +ll bk bk tI @@ -18586,7 +18513,7 @@ tI tI yA bk -Xw +lo lo gY lo @@ -18839,13 +18766,13 @@ gA gA wu mS -EF zz zz zz zz zz -EF +zz +zz iV wu ed @@ -41358,7 +41285,7 @@ sv sv sv sv -wL +qZ bw Hz sv @@ -41552,7 +41479,7 @@ sv sv sv sv -wL +qZ bw Hz sv @@ -41746,7 +41673,7 @@ sv sv sv sv -wL +qZ bw Hz sv @@ -41940,7 +41867,7 @@ sv sv sv sv -wL +qZ bw Hz sv @@ -42134,7 +42061,7 @@ sv sv sv bL -wL +qZ bw Hz bL @@ -42328,7 +42255,7 @@ sv sv sv sv -wL +qZ bw Hz sv @@ -42522,7 +42449,7 @@ sv sv sv sv -wL +qZ bw Hz sv @@ -42716,7 +42643,7 @@ sv sv sv sv -wL +qZ bw Hz sv @@ -42910,7 +42837,7 @@ sv sv sv sv -wL +qZ bw Hz sv @@ -43104,7 +43031,7 @@ sv sv sv sv -wL +qZ bw Hz sv @@ -43298,7 +43225,7 @@ sv sv sv bL -wL +qZ bw Hz bL @@ -43492,7 +43419,7 @@ sv sv sv sv -wL +qZ bw Hz sv @@ -44074,7 +44001,7 @@ sv sv sv sv -wL +qZ bw Hz sv @@ -44268,7 +44195,7 @@ sv sv sv bL -wL +qZ bw Hz bL @@ -44462,7 +44389,7 @@ sv sv sv sv -wL +qZ bw Hz sv @@ -44635,7 +44562,7 @@ we we we we -Lb +zL Yp Yp Qf @@ -44656,9 +44583,9 @@ sv sv sv or -wL +qZ bw -Pg +ES or sv or @@ -44850,9 +44777,9 @@ dC dC dC wm -wL +qZ bw -Pg +ES bL dC or @@ -45044,12 +44971,12 @@ we we we or -wL +qZ bw -Pg +ES or we -Lb +zL je we we @@ -45237,13 +45164,13 @@ we we we we -Lb -wL +zL +qZ bw -Pg +ES we we -Lb +zL je we we @@ -45431,13 +45358,13 @@ we we we we -Lb -wL +zL +qZ bw -Pg +ES we we -Lb +zL je we we @@ -45625,13 +45552,13 @@ we we we we -Lb -wL +zL +qZ bw -Pg +ES we we -Lb +zL je we we @@ -45819,13 +45746,13 @@ we we we we -Lb -wL +zL +qZ bw -Pg +ES we we -Lb +zL je we we @@ -46014,12 +45941,12 @@ we we we wm -wL +qZ bw -Pg +ES bL we -Lb +zL je we we @@ -46207,13 +46134,13 @@ we we we we -Lb -wL +zL +qZ bw -Pg +ES we we -Lb +zL je we we @@ -46401,13 +46328,13 @@ we we we we -Lb -wL +zL +qZ bw -Pg +ES we we -Lb +zL je we we @@ -46595,13 +46522,13 @@ we we we we -Lb -wL +zL +qZ bw -Pg +ES we we -Lb +zL je we we @@ -46789,13 +46716,13 @@ we we we we -Lb -wL +zL +qZ bw -Pg +ES we we -Lb +zL je we we @@ -46983,13 +46910,13 @@ we we we we -Lb -wL +zL +qZ bw -Pg +ES we we -Lb +zL je we we @@ -47178,12 +47105,12 @@ we we we wm -wL +qZ bw -Pg +ES bL we -Lb +zL je we we @@ -47371,13 +47298,13 @@ we we we we -Lb -wL +zL +qZ bw -Pg +ES we we -Lb +zL je we we @@ -47565,13 +47492,13 @@ we we we we -Lb -wL +zL +qZ bw -Pg +ES we we -Lb +zL je we we @@ -47759,13 +47686,13 @@ we we we we -Lb -wL +zL +qZ bw -Pg +ES we we -Lb +zL je we we @@ -47953,13 +47880,13 @@ we we we we -Lb -wL +zL +qZ bw -Pg +ES we we -Lb +zL je we we @@ -48149,12 +48076,12 @@ we we zL qZ -ji +bw ES we we zL -mJ +je we we we diff --git a/maps/rift/levels/rift-11-orbital.dmm b/maps/rift/levels/rift-11-orbital.dmm index 6bd02a441bf..b54053a03ba 100644 --- a/maps/rift/levels/rift-11-orbital.dmm +++ b/maps/rift/levels/rift-11-orbital.dmm @@ -306,15 +306,11 @@ /area/holodeck/source_courtroom) "bf" = ( /obj/machinery/door/window/holowindoor{ - name = "Red Team"; - dir = 4 + dir = 4; + name = "Red Team" }, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_emptycourt) -"bh" = ( -/turf/space/basic, -/turf/space/basic, -/area/space) "bi" = ( /obj/structure/window/reinforced{ dir = 8 @@ -366,9 +362,6 @@ /obj/structure/holostool, /turf/simulated/floor/holofloor/desert, /area/holodeck/source_picnicarea) -"bp" = ( -/turf/simulated/floor/holofloor/desert, -/area/holodeck/source_picnicarea) "bq" = ( /obj/structure/flora/ausbushes/brflowers, /obj/effect/floor_decal/spline/fancy/wood{ @@ -765,8 +758,8 @@ "cB" = ( /obj/machinery/door/window/holowindoor{ base_state = "right"; - icon_state = "right"; - dir = 4 + dir = 4; + icon_state = "right" }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_courtroom) @@ -785,9 +778,9 @@ "cE" = ( /obj/machinery/door/window/holowindoor{ base_state = "right"; + dir = 4; icon_state = "right"; - name = "Green Team"; - dir = 4 + name = "Green Team" }, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_emptycourt) @@ -1254,8 +1247,8 @@ /area/holodeck/source_meetinghall) "eg" = ( /obj/machinery/door/window/holowindoor{ - name = "Red Team"; - dir = 4 + dir = 4; + name = "Red Team" }, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_basketball) @@ -1270,8 +1263,8 @@ /area/holodeck/source_beach) "ej" = ( /obj/machinery/door/window/holowindoor{ - name = "Red Team"; - dir = 4 + dir = 4; + name = "Red Team" }, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_thunderdomecourt) @@ -1878,9 +1871,9 @@ "fX" = ( /obj/machinery/door/window/holowindoor{ base_state = "right"; + dir = 4; icon_state = "right"; - name = "Green Team"; - dir = 4 + name = "Green Team" }, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_basketball) @@ -1898,9 +1891,9 @@ "ga" = ( /obj/machinery/door/window/holowindoor{ base_state = "right"; + dir = 4; icon_state = "right"; - name = "Green Team"; - dir = 4 + name = "Green Team" }, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_thunderdomecourt) @@ -5522,6 +5515,12 @@ }, /turf/simulated/floor/tiled/white, /area/centcom/simulated/medical) +"qL" = ( +/obj/effect/floor_decal/industrial/halfstair{ + dir = 1 + }, +/turf/simulated/floor/reinforced, +/area/centcom/command) "qM" = ( /obj/machinery/atmospherics/component/unary/cryo_cell, /obj/effect/floor_decal/borderfloorwhite{ @@ -6606,6 +6605,7 @@ /obj/machinery/light{ dir = 4 }, +/obj/effect/floor_decal/industrial/halfstair, /turf/simulated/floor/reinforced, /area/centcom/command) "xX" = ( @@ -7972,6 +7972,15 @@ /obj/machinery/vending/tool, /turf/unsimulated/floor/dark, /area/centcom/specops) +"EI" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/halfstair{ + dir = 1 + }, +/turf/simulated/floor/reinforced, +/area/centcom/command) "EP" = ( /obj/structure/window/reinforced{ dir = 1 @@ -8885,6 +8894,10 @@ /obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor/plating, /area/shuttle/specops/engine) +"Ps" = ( +/obj/effect/floor_decal/industrial/halfstair, +/turf/simulated/floor/reinforced, +/area/centcom/command) "Pw" = ( /obj/structure/table/bone, /turf/simulated/floor/tiled/dark, @@ -9318,10 +9331,6 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/specops/general) -"Ui" = ( -/obj/structure/fake_stairs/south/bottom, -/turf/simulated/floor/tiled/dark, -/area/centcom/command) "Uj" = ( /obj/structure/table/rack, /obj/item/clothing/under/color/red, @@ -9512,10 +9521,6 @@ /obj/structure/bed/chair/bay/shuttle, /turf/simulated/floor/tiled/dark, /area/shuttle/specops/general) -"VH" = ( -/obj/structure/fake_stairs/north/bottom, -/turf/simulated/floor/tiled/dark, -/area/centcom/command) "Wj" = ( /obj/structure/bed/chair/bay/shuttle{ dir = 4 @@ -32137,13 +32142,13 @@ Bv Bv yw TY -TY -Ui +qL +XJ Un Un Un -VH -TY +XJ +Ps TY yw Bv @@ -32331,12 +32336,12 @@ Bv Bv yw TY -xW -Ui +EI +XJ +XJ XJ XJ XJ -VH xW TY yw @@ -32749,11 +32754,11 @@ Bv Bv Bv Bv -bh -bh -bh -bh -bh +Bv +Bv +Bv +Bv +Bv Bv Bv Bv @@ -34418,8 +34423,8 @@ am aG aH aX -bp -bp +bn +bn cp aH aG @@ -34612,8 +34617,8 @@ an aH aG aY -bp -bp +bn +bn cq aG aH @@ -34806,8 +34811,8 @@ am aG aW bm -bp -bp +bn +bn cr cz aG @@ -35000,8 +35005,8 @@ an aH aX bn -bp -bp +bn +bn bn cp aH @@ -35581,10 +35586,10 @@ af an aG aY -bp -bp -bp -bp +bn +bn +bn +bn cq aG an From 9d9c33fda7ff4f190ef4e9b27a63976babe188a0 Mon Sep 17 00:00:00 2001 From: Letter N <24603524+LetterN@users.noreply.github.com> Date: Thu, 21 Mar 2024 08:03:06 +0800 Subject: [PATCH 06/10] fix centcom names in map strings (#6344) ## About The Pull Request title, also adds the merge conflict map helper ## Why It's Good For The Game so you know what broke while mapping Co-authored-by: LordME <58342752+TheLordME@users.noreply.github.com> --- citadel.dme | 1 + code/modules/mapping/merge_conflicts.dm | 18 ++++++++++++++++++ icons/effects/mapping_helpers.dmi | Bin 0 -> 26231 bytes maps/rift/levels/rift-11-orbital.dmm | 2 +- maps/templates/admin/dhael_centcom.dmm | 2 +- .../shuttles/overmaps/generic/cruiser.dmm | 2 +- maps/tether/levels/misc.dmm | 2 +- maps/triumph/levels/flagship.dmm | 2 +- tools/mapmerge2/__init__.py | 1 + tools/mapmerge2/merge_driver.py | 10 +++++++--- 10 files changed, 32 insertions(+), 8 deletions(-) create mode 100644 code/modules/mapping/merge_conflicts.dm create mode 100644 icons/effects/mapping_helpers.dmi create mode 100644 tools/mapmerge2/__init__.py diff --git a/citadel.dme b/citadel.dme index 99d21ed069d..5c2ea9d1f9f 100644 --- a/citadel.dme +++ b/citadel.dme @@ -3139,6 +3139,7 @@ #include "code\modules\mapping\map.dm" #include "code\modules\mapping\map_level.dm" #include "code\modules\mapping\map_template.dm" +#include "code\modules\mapping\merge_conflicts.dm" #include "code\modules\mapping\minimaps.dm" #include "code\modules\mapping\shuttle.dm" #include "code\modules\mapping\submap.dm" diff --git a/code/modules/mapping/merge_conflicts.dm b/code/modules/mapping/merge_conflicts.dm new file mode 100644 index 00000000000..ce3cd1fcc60 --- /dev/null +++ b/code/modules/mapping/merge_conflicts.dm @@ -0,0 +1,18 @@ +// Used by mapmerge2 to denote the existence of a merge conflict (or when it has to complete a "best intent" merge where it dumps the movable contents of an old key and a new key on the same tile). +// We define it explicitly here to ensure that it shows up on the highest possible plane (while giving off a verbose icon) to aide mappers in resolving these conflicts. +// DO NOT USE THIS IN NORMAL MAPPING!!! Linters WILL fail. + +/obj/merge_conflict_marker + name = "Merge Conflict Marker - DO NOT USE" + icon = 'icons/effects/mapping_helpers.dmi' + icon_state = "merge_conflict_marker" + desc = "If you are seeing this in-game: someone REALLY, REALLY, REALLY fucked up. They physically mapped in a fucking Merge Conflict Marker. What the shit." + plane = ABOVE_PLANE + +///We REALLY do not want un-addressed merge conflicts in maps for an inexhaustible list of reasons. This should help ensure that this will not be missed in case linters fail to catch it for any reason what-so-ever. +/obj/merge_conflict_marker/Initialize(mapload) + . = ..() + var/msg = "HEY, LISTEN!!! Merge Conflict Marker detected at [AREACOORD(src)]! Please manually address all potential merge conflicts!!!" + log_mapping(msg) + to_chat(world, SPAN_BOLDANNOUNCE("[msg]")) + warning(msg) diff --git a/icons/effects/mapping_helpers.dmi b/icons/effects/mapping_helpers.dmi new file mode 100644 index 0000000000000000000000000000000000000000..351bb5f00c4aa267d2325891754135e0d6ce89c1 GIT binary patch literal 26231 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 Date: Wed, 20 Mar 2024 19:03:48 -0500 Subject: [PATCH 07/10] Debrisfield Hotfix (#6351) ## Fixes Tiny Carrier Comments out a Proc that was causing consistent Runtime with the 'Tiny Carrier' POI. Hopefully this greatly reduces debris field runtimes. Can you believe that when I put up the debris field PR I didn't get this runtime at all since the ship didn't spawn in CI tests? ## Changelog :cl: fix: broken procs commented out /:cl: --- code/modules/maps/overmap/space/debrisfield.dm | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/code/modules/maps/overmap/space/debrisfield.dm b/code/modules/maps/overmap/space/debrisfield.dm index fc0806d6daf..0cc48e00999 100644 --- a/code/modules/maps/overmap/space/debrisfield.dm +++ b/code/modules/maps/overmap/space/debrisfield.dm @@ -170,19 +170,23 @@ . = ..() /obj/overmap/entity/visitable/ship/landable/tinycarrier - scanner_name = "TBD" - scanner_desc = "TBD" + scanner_name = "SDF Birdcage" + scanner_desc = {"\[i\]Registration\[/i\]: SDV Birdcage +\[i\]Class\[/i\]: Light Escort Carrier +\[i\]Transponder\[/i\]: Transmitting (MIL), Weak Signal +\[b\]Notice\[/b\]: Registration Expired"} vessel_mass = 12000 vessel_size = SHIP_SIZE_SMALL shuttle = "Debris Carrier" fore_dir = WEST +/* /obj/overmap/entity/visitable/ship/landable/tinycarrier/Initialize(mapload) . = ..() var/datum/lore/organization/O = SSlegacy_lore.organizations[/datum/lore/organization/other/sysdef] var/newname = "SDV [pick(O.ship_names)]" - scanner_name = newname - scanner_desc = {"\[i\]Registration\[/i\]: [newname] + scanner_name = "SDF Birdcage + scanner_desc = {"\[i\]Registration\[/i\]: SDV Birdcage \[i\]Class\[/i\]: Light Escort Carrier \[i\]Transponder\[/i\]: Transmitting (MIL), Weak Signal \[b\]Notice\[/b\]: Registration Expired"} @@ -200,12 +204,12 @@ A.apc.name = "[A.name] APC" for(var/obj/machinery/air_alarm/AA in A) AA.name = "[A.name] Air Alarm" +*/ /obj/machinery/computer/shuttle_control/explore/tinycarrier shuttle_tag = "Debris Carrier" req_one_access = list() - /obj/mecha/combat/fighter/baron/loaded/busted /* starting_components = list( From 696f1d599576268eb14ffd63a826bf606ae607f2 Mon Sep 17 00:00:00 2001 From: lolman360 <22850904+lolman360@users.noreply.github.com> Date: Sat, 23 Mar 2024 15:31:28 +1100 Subject: [PATCH 08/10] one star jumpsuit and hat (#6355) we have the coat so i want these also :cl: add: os js and hat /:cl: --- code/modules/clothing/head/misc.dm | 7 +++++++ code/modules/clothing/under/misc.dm | 7 +++++++ code/modules/loadout/loadout_head.dm | 5 +++++ code/modules/loadout/loadout_uniform.dm | 4 ++++ icons/clothing/head/onestar.dmi | Bin 0 -> 830 bytes icons/clothing/uniform/misc/onestar.dmi | Bin 0 -> 1271 bytes 6 files changed, 23 insertions(+) create mode 100644 icons/clothing/head/onestar.dmi create mode 100644 icons/clothing/uniform/misc/onestar.dmi diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index d973fc72707..33f98bf01aa 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -734,3 +734,10 @@ desc = "A simple wedge cap with red accents, highly popular within Tri-Star Compact space." icon_state = "eulrhat" body_cover_flags = 0 + +/obj/item/clothing/head/onestar + name = "one star hat" + desc = "It's a maroon-ish hat with an odd logo.." + icon = 'icons/clothing/head/onestar.dmi' + icon_state = "os_cap" + worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL diff --git a/code/modules/clothing/under/misc.dm b/code/modules/clothing/under/misc.dm index adbda32c1a2..7fad7786c70 100644 --- a/code/modules/clothing/under/misc.dm +++ b/code/modules/clothing/under/misc.dm @@ -23,3 +23,10 @@ name = "special ops fatigues" desc = "These worn fatigues match the pattern known to be used by JSDF Marine Corps special forces." icon_state = "russobluecamo" + +/obj/item/clothing/under/onestar + name = "one star jumpsuit" + desc = "A jumpsuit in One Star colours." + icon = 'icons/clothing/uniform/misc/onestar.dmi' + icon_state = "os_jumpsuit" + worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL diff --git a/code/modules/loadout/loadout_head.dm b/code/modules/loadout/loadout_head.dm index 2f89a4d06cc..2c3b4d60c1e 100644 --- a/code/modules/loadout/loadout_head.dm +++ b/code/modules/loadout/loadout_head.dm @@ -262,6 +262,11 @@ var/obj/item/clothing/head/beret/orion/orion = orion_style orions[initial(orion.name)] = orion tweaks += new/datum/loadout_tweak/path(tim_sort(orions, GLOBAL_PROC_REF(cmp_text_asc))) + +/datum/loadout_entry/head/onestar + name = "One Star Cap" + path = /obj/item/clothing/head/onestar + /datum/loadout_entry/head/surgery name = "Surgical Cap Selection" description = "Choose from a number of rings of different Caps." diff --git a/code/modules/loadout/loadout_uniform.dm b/code/modules/loadout/loadout_uniform.dm index 8a4f61e64de..997bdb8d79f 100644 --- a/code/modules/loadout/loadout_uniform.dm +++ b/code/modules/loadout/loadout_uniform.dm @@ -310,6 +310,10 @@ brandjumpsuit_selection[initial(brandjumpsuit_type.name)] = brandjumpsuit_type tweaks += new/datum/loadout_tweak/path(tim_sort(brandjumpsuit_selection, GLOBAL_PROC_REF(cmp_text_asc))) +/datum/loadout_entry/uniform/onestar + name = "One Star Jumpsuit" + path = /obj/item/clothing/under/onestar + /datum/loadout_entry/uniform/yogapants name = "Yoga Pants" path = /obj/item/clothing/under/pants/yogapants diff --git a/icons/clothing/head/onestar.dmi b/icons/clothing/head/onestar.dmi new file mode 100644 index 0000000000000000000000000000000000000000..7fdafb6becfbb892f3b6a0a6e0dfa830911e4bc5 GIT binary patch literal 830 zcmeAS@N?(olHy`uVBq!ia0vp^2|(6bQ88&6cY_7z`n%(|qPC9CsItH#<^WfEUrZOf5 z*~#j9%on~MV_;xv@pN$vshIP2wxRc72Z=U)B|fFQE>}EbSj5?5Sw8YxSXu6Tsnpb5 zR#dQxuW84NYbz%&wqNk*)q|i3O&m=fJ46EyF8szFXVHJ-naRo1N53})bhhrU@z7YtG(YooY;}o=hyyxR&wzx z-Ha8_m$QeimP`M|VRU=@&)naQ{gXGaINGTS6g_mhcJMscdbfsS*AtFEys8r8qQSt! z+OUwp;N0X7H^1e*NlN~iu--s8d7erg@6^zFagDQLO2k~GiW?`nM=jt`sbcvnQghIc z^T|{(4K7>O67GGyb7w2=eW=2tc2Q=5yQ9!2A6{|B=Yk6T5+|KbEtI!3`~F^jWyw4H z2^lOiPOfkLmMu}^7b_P<&rDEDc*Y|SG#CB|QUaz9TU zJindo(BqdI1#6Fg-(t{pMEl|5zeO8%26x_j`*!!-#{aT@D>)`k2zCFb9m5WCzX(Gc z(}4g62`&a_#ss*hb}K#VG7f4nJfFJN`Ouw-iQ8A6{~5+nB(#7zA^*Ht_OWMrojM&{ z4s**MZR_-wuf3)8c#HL}+kWg56%tr_eA*p)k4wK{33t5nL3HO}bt7)U8YbC- VpX!@E5V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+ z(=$pSoZ^zil2jm5DZe;At2DQuxHPjwiHkEOv#1y-YRJWzR+N~V3SnbY8=shygHUgR zqF!0S)z1a&7yvN#E6B9Em$m=^1UN}VK~#90?VB-Z6hRb*=Om@1N({!zMhq$>plz&- zV6CF5Vj-y{gXQb=r)vXYWIUktkVtIxy$&5STxab=eR3j5P)XU4@LA2udlrS?sPH!eY;p#Y2w zC^ay9E}>@*4g~<`5d_{_T|)LraQ-Yr=ShUTlv)7l^`ZVx!hUW6CMNHtX{D=9&~aQh zJ9B%_KMiMz0+qvrq~d`{NX)CXwz$-$AP z-ba6NoX?U%*e82M>|2ciF!-*%oPLJ#FuvcQ7!+-LZUN@!9@R#*X(*)~i9y#D@~92% zGLXNY32C2azm0vP4DcCT6Qnbc?4#rqwO{IKsE*$A@!*BIcc@n(KJ3R|#DuAo090qQ zo`ge<0qtH#dmjU&X_e|yCCG&jwYWG}mP(bNy+{;5n6CX^0@jBj~n8G!tOZ}8E#4=ynhfPxS7^_N9gh~*_~ zc{pE@%(Jr!SpOo1#y(totGfGLx?>K?&duRdvQ8AhdJsmh`~2r`(=qf+pJfR5)_XsE z@UC19siE6!&s50mLVUcz!l>2y? Date: Sat, 23 Mar 2024 15:31:45 +1100 Subject: [PATCH 09/10] max name length 52 >> 64 (#6356) my new character name is too long and its too good to change :/ --- code/__DEFINES/misc.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index de854648586..f5c83ecf306 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -94,7 +94,8 @@ Will print: "/mob/living/carbon/human/death" (you can optionally embed it in a s #define MAX_BOOK_MESSAGE_LEN 24576 #define MAX_RECORD_LENGTH 24576 #define MAX_LNAME_LEN 64 -#define MAX_NAME_LEN 52 +#define MAX_NAME_LEN 64 + /// 512GQ file #define MAX_TEXTFILE_LENGTH 128000 // Event defines. From f825c9af6bfc10f751806017e80eadec9695608b Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sat, 23 Mar 2024 03:47:03 -0700 Subject: [PATCH 10/10] adds persistent sheet silos to mining (#6353) 65% multiplier - 10 per sheet constant loss requested by @TheObserver-sys and signed off by me mining rework will make this more balanced but vorestation has it; i think it's fine to throw mining/science a bone. --------- Co-authored-by: silicons Co-authored-by: BlueWildrose <57083662+BlueWildrose@users.noreply.github.com> --- citadel.dme | 2 + code/__DEFINES/controllers/persistence.dm | 5 + code/__DEFINES/is_helpers.dm | 13 + code/__DEFINES/materials/flags.dm | 4 + .../persistence/modules/level_objects.dm | 16 +- .../persistence/modules/spatial_metadata.dm | 2 +- code/datums/datum.dm | 11 + code/game/atoms/atom.dm | 28 +- code/game/atoms/movable/movable.dm | 50 ++- code/game/objects/objs.dm | 12 +- .../verbs/debug/reestablish_db_connection.dm | 4 + code/modules/mining/machine_processing.dm | 4 +- code/modules/mining/machine_stacking.dm | 4 +- code/modules/mining/machine_unloading.dm | 2 +- code/modules/mining/machinery/sheet_silo.dm | 129 ++++++ .../mining/machinery/sheet_silo_loader.dm | 26 ++ .../ore_redemption_machine/survey_vendor.dm | 2 +- code/modules/mob/characteristics/holder.dm | 4 +- .../file_system/computer_file.dm | 9 +- .../programs/generic/file_browser.dm | 3 +- code/modules/species/species.dm | 3 +- icons/modules/mining/machinery/sheet_silo.dmi | Bin 0 -> 1114 bytes .../mining/machinery/sheet_silo_loader.dmi | Bin 0 -> 398 bytes icons/obj/machines/mining_machines.dmi | Bin 7598 -> 9397 bytes icons/obj/machines/mining_machines_vr.dmi | Bin 19295 -> 0 bytes maps/minitest/levels/minitest.dmm | 19 +- maps/rift/levels/rift-02-underground2.dmm | 6 + maps/rift/levels/rift-08-west_deep.dmm | 279 +++++-------- maps/tether/levels/station2.dmm | 369 +++++++----------- maps/triumph/levels/deck2.dmm | 64 ++- .../tgui/interfaces/machines/SheetSilo.tsx | 65 +++ 31 files changed, 643 insertions(+), 492 deletions(-) create mode 100644 code/modules/mining/machinery/sheet_silo.dm create mode 100644 code/modules/mining/machinery/sheet_silo_loader.dm create mode 100644 icons/modules/mining/machinery/sheet_silo.dmi create mode 100644 icons/modules/mining/machinery/sheet_silo_loader.dmi delete mode 100644 icons/obj/machines/mining_machines_vr.dmi create mode 100644 tgui/packages/tgui/interfaces/machines/SheetSilo.tsx diff --git a/citadel.dme b/citadel.dme index 5c2ea9d1f9f..97f80de0530 100644 --- a/citadel.dme +++ b/citadel.dme @@ -3340,6 +3340,8 @@ #include "code\modules\mining\vertibore.dm" #include "code\modules\mining\drilling\drill.dm" #include "code\modules\mining\drilling\scanner.dm" +#include "code\modules\mining\machinery\sheet_silo.dm" +#include "code\modules\mining\machinery\sheet_silo_loader.dm" #include "code\modules\mining\ore_redemption_machine\construction.dm" #include "code\modules\mining\ore_redemption_machine\engineering_points_vendor.dm" #include "code\modules\mining\ore_redemption_machine\equipment_vendor.dm" diff --git a/code/__DEFINES/controllers/persistence.dm b/code/__DEFINES/controllers/persistence.dm index 75e64804703..4f234acbb3d 100644 --- a/code/__DEFINES/controllers/persistence.dm +++ b/code/__DEFINES/controllers/persistence.dm @@ -9,6 +9,9 @@ #define OBJ_HAS_PERSISTENCE_ENABLED(OBJ) (OBJ.persist_static_id || OBJ.persist_dynamic_id) /// check if an /obj is eligible at all for mass persistence #define OBJ_MASS_PERSIST_SANITY_CHECK(OBJ) (OBJ_HAS_PERSIST_ENABLED(OBJ) && !(OBJ.obj_persist_status & (OBJ_PERSIST_STATUS_NO_THANK_YOU))) +/// sentinel id; set this if you want something to persist but generate its own dynamic id +/// instead of setting one manually +#define PERSISTENCE_DYNAMIC_ID_AUTOSET "!autoset" //* /obj - obj_persist_status *// @@ -22,6 +25,8 @@ #define OBJ_PERSIST_STATUS_FIRST_GENERATION (1<<2) /// do not persist #define OBJ_PERSIST_STATUS_NO_THANK_YOU (1<<3) +/// do not show persistent status on examine +#define OBJ_PERSIST_STATUS_NO_EXAMINE (1<<4) //* /obj - obj_persist_dynamic_status *// diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm index 7447ca482ee..469155b777b 100644 --- a/code/__DEFINES/is_helpers.dm +++ b/code/__DEFINES/is_helpers.dm @@ -2,6 +2,19 @@ #define in_range(source, user) (get_dist(source, user) <= 1 && (get_step(source, 0)?:z) == (get_step(user, 0)?:z)) +//* Datatypes *// + +/** + * used to filter nans and non-numbers from player input + */ +#if DM_VERSION < 515 +#define is_safe_number(N) (isnum(N) && (N == N)) +#else +#define is_safe_number(N) (isnum(N) && !isnan(N)) +#endif + +//* Typepaths *// + #define isatom(A) (isloc(A)) #define isdatum(D) (istype(D, /datum)) diff --git a/code/__DEFINES/materials/flags.dm b/code/__DEFINES/materials/flags.dm index 4bfd28a8d66..a22e4c3388f 100644 --- a/code/__DEFINES/materials/flags.dm +++ b/code/__DEFINES/materials/flags.dm @@ -7,10 +7,14 @@ #define MATERIAL_FLAG_VULNERABLE_MOB_ARMOR (1<<0) /// utterly immune to melting, thermite or otherwise #define MATERIAL_FLAG_UNMELTABLE (1<<1) +/// too dangerous to persist +/// this is a somewhat awful flag so we'll keep it until we need to get rid of it +#define MATERIAL_FLAG_CONSIDERED_OVERPOWERED (1<<2) DEFINE_BITFIELD(material_flags, list( BITFIELD(MATERIAL_FLAG_VULNERABLE_MOB_ARMOR), BITFIELD(MATERIAL_FLAG_UNMELTABLE), + BITFIELD(MATERIAL_FLAG_CONSIDERED_OVERPOWERED), )) //* /datum/material material_constraints diff --git a/code/controllers/subsystem/persistence/modules/level_objects.dm b/code/controllers/subsystem/persistence/modules/level_objects.dm index 84f6bee8a56..43072527d78 100644 --- a/code/controllers/subsystem/persistence/modules/level_objects.dm +++ b/code/controllers/subsystem/persistence/modules/level_objects.dm @@ -27,19 +27,19 @@ "generation" = generation, "object_id" = entity.obj_persist_static_id, "level_id" = entity.obj_persist_static_bound_id || level_id, - "data" = entity.serialize(), + "data" = safe_json_encode(entity.serialize()), ), ) if(OBJ_PERSIST_STATIC_MODE_MAP) query = SSdbcore.NewQuery( - "INSERT INTO [format_table_name("persistence_static_mapl_objects")] (generation, object_id, map_id, data) \ + "INSERT INTO [format_table_name("persistence_static_map_objects")] (generation, object_id, map_id, data) \ VALUES (:generation, :object_id, :map_id, :data) ON DUPLICATE KEY UPDATE \ data = VALUES(data)", list( "generation" = generation, "object_id" = entity.obj_persist_static_id, "map_id" = entity.obj_persist_static_bound_id || map_id, - "data" = entity.serialize(), + "data" = safe_json_encode(entity.serialize()), ), ) if(OBJ_PERSIST_STATIC_MODE_GLOBAL) @@ -50,7 +50,7 @@ list( "generation" = generation, "object_id" = entity.obj_persist_static_id, - "data" = entity.serialize(), + "data" = safe_json_encode(entity.serialize()), ), ) else @@ -77,7 +77,7 @@ for(var/obj/entity as anything in entities) var/datum/db_query/query - if(entity.obj_persist_dynamic_id) + if(entity.obj_persist_dynamic_id != PERSISTENCE_DYNAMIC_ID_AUTOSET) query = SSdbcore.NewQuery( "INSERT INTO [format_table_name("persistence_dynamic_objects")] (id, generation, status, data, prototype_id, level_id, x, y) \ VALUES (:status, :data, :prototype, :level, :x, :y) ON DUPLICATE KEY UPDATE \ @@ -87,7 +87,7 @@ "id" = entity.obj_persist_dynamic_id, "generation" = generation, "status" = entity.obj_persist_dynamic_status, - "data" = entity.serialize(), + "data" = safe_json_encode(entity.serialize()), "prototype" = "[entity.type]", "level" = level_id, "x" = entity.x, @@ -101,7 +101,7 @@ VALUES (:status, :data, :prototype, :level, :x, :y)", list( "status" = entity.obj_persist_dynamic_status, - "data" = entity.serialize(), + "data" = safe_json_encode(entity.serialize()), "prototype" = "[entity.type]", "level" = level_id, "x" = entity.x, @@ -197,7 +197,7 @@ for(var/obj/entity as anything in entities) var/datum/db_query/query var/bind_id - switch(entity.obj_persist_dynamic_status) + switch(entity.obj_persist_static_mode) if(OBJ_PERSIST_STATIC_MODE_GLOBAL) query = SSdbcore.NewQuery( "SELECT data FROM [format_table_name("persistence_static_global_objects")] \ diff --git a/code/controllers/subsystem/persistence/modules/spatial_metadata.dm b/code/controllers/subsystem/persistence/modules/spatial_metadata.dm index dce020f3d31..6f6355ff490 100644 --- a/code/controllers/subsystem/persistence/modules/spatial_metadata.dm +++ b/code/controllers/subsystem/persistence/modules/spatial_metadata.dm @@ -100,7 +100,7 @@ src.generation = generation src.hours_since_saved = 0 src.rounds_since_saved = 0 - src.round_id_saved = GLOB.round_id + src.round_id_saved = GLOB.round_number SSdbcore.RunQuery( "INSERT INTO [format_table_name("persistence_level_metadata")] (saved, saved_round_id, level_id, data, generation) \ diff --git a/code/datums/datum.dm b/code/datums/datum.dm index ecbdbba3da6..e8548a27acc 100644 --- a/code/datums/datum.dm +++ b/code/datums/datum.dm @@ -161,6 +161,17 @@ SEND_SIGNAL(source, COMSIG_CD_RESET(index), S_TIMER_COOLDOWN_TIMELEFT(source, index)) TIMER_COOLDOWN_END(source, index) +//* Duplication *// + +/** + * makes a clone of this datum + * + * @params + * * include_contents - include semantic contents; ergo 'what we are hosting' vs 'what we are' + */ +/datum/proc/clone(include_contents) + return new type + //* Serialization *// /** diff --git a/code/game/atoms/atom.dm b/code/game/atoms/atom.dm index b40bab69778..8b2ce9012b3 100644 --- a/code/game/atoms/atom.dm +++ b/code/game/atoms/atom.dm @@ -45,7 +45,8 @@ //? Context /// open context menus by mob - var/list/context_menus + /// * this variable is not visible and should not be edited in the map editor. + var/tmp/list/context_menus //? Economy // todo: move all this to obj level, you aren't going to sell a fucking turf. @@ -143,16 +144,24 @@ //? Materials /// combined material trait flags /// this list is at /atom level but are only used/implemented on /obj generically; anything else, e.g. walls, should implement manually for efficiency. - var/material_trait_flags = NONE + /// * this variable is a cache variable and is generated from the materials on an entity. + /// * this variable is not visible and should not be edited in the map editor. + var/tmp/material_trait_flags = NONE /// material traits on us, associated to metadata /// this list is at /atom level but are only used/implemented on /obj generically; anything else, e.g. walls, should implement manually for efficiency. - var/list/datum/material_trait/material_traits + /// * this variable is a cache variable and is generated from the materials on an entity. + /// * this variable is not visible and should not be edited in the map editor. + var/tmp/list/datum/material_trait/material_traits /// material trait metadata when [material_traits] is a single trait. null otherwise. - var/material_traits_data + /// * this variable is a cache variable and is generated from the materials on an entity. + /// * this variable is not visible and should not be edited in the map editor. + var/tmp/material_traits_data /// 'stacks' of ticking /// this synchronizes the system so removing one ticking material trait doesn't fully de-tick the entity //! DO NOT FUCK WITH THIS UNLESS YOU KNOW WHAT YOU ARE DOING - var/material_ticking_counter = 0 + /// * this variable is a cache variable and is generated from the materials on an entity. + /// * this variable is not visible and should not be edited in the map editor. + var/tmp/material_ticking_counter = 0 /// material trait relative strength /// applies to all traits globally as opposed to just one material parts, /// because this is at /atom level. @@ -170,13 +179,16 @@ /// sorted priority list of datums for handling shieldcalls with /// we use this instead of signals so we can enforce priorities /// this is horrifying. - var/list/datum/shieldcall/shieldcalls + /// * this variable is not visible and should not be edited in the map editor. + var/tmp/list/datum/shieldcall/shieldcalls //? Overlays /// vis overlays managed by SSvis_overlays to automaticaly turn them like other overlays. - var/list/managed_vis_overlays + /// * this variable is not visible and should not be edited in the map editor. + var/tmp/list/managed_vis_overlays /// overlays managed by [update_overlays][/atom/proc/update_overlays] to prevent removing overlays that weren't added by the same proc. Single items are stored on their own, not in a list. - var/list/managed_overlays + /// * this variable is not visible and should not be edited in the map editor. + var/tmp/list/managed_overlays //? Layers /// Base layer - defaults to layer. diff --git a/code/game/atoms/movable/movable.dm b/code/game/atoms/movable/movable.dm index a489d59d2e6..120758bc161 100644 --- a/code/game/atoms/movable/movable.dm +++ b/code/game/atoms/movable/movable.dm @@ -28,26 +28,36 @@ //? Movement /// Whatever we're pulling. - var/atom/movable/pulling + /// * this variable is not visible and should not be edited in the map editor. + var/tmp/atom/movable/pulling /// Who's currently pulling us - var/atom/movable/pulledby + /// * this variable is not visible and should not be edited in the map editor. + var/tmp/atom/movable/pulledby /// If false makes [CanPass][/atom/proc/CanPass] call [CanPassThrough][/atom/movable/proc/CanPassThrough] on this type instead of using default behaviour - var/generic_canpass = TRUE + /// * this variable is not visible and should not be edited in the map editor. + var/tmp/generic_canpass = TRUE /// Pass flags. var/pass_flags = NONE /// movement calls we're in - var/in_move = 0 + /// * this variable is not visible and should not be edited in the map editor. + var/tmp/in_move = 0 /// a direction, or null - var/moving_diagonally = NOT_IN_DIAG_STEP + /// * this variable is not visible and should not be edited in the map editor. + var/tmp/moving_diagonally = NOT_IN_DIAG_STEP /// attempt to resume grab after moving instead of before. This is what atom/movable is pulling us during move-from-pulling. - var/atom/movable/moving_from_pull + /// * this variable is not visible and should not be edited in the map editor. + var/tmp/atom/movable/moving_from_pull /// Direction of our last move. - var/last_move_dir = NONE + /// * this variable is not visible and should not be edited in the map editor. + var/tmp/last_move_dir = NONE /// Our default glide_size. Null to use global default. var/default_glide_size /// Movement types, see [code/__DEFINES/flags/movement.dm] /// Do *not* manually edit this variable in most cases. Use the helpers in [code/game/atoms/atoms_movement.dm]. - var/movement_type = MOVEMENT_GROUND + /// todo: is there a better way to do this? what if we want to force something to be a movement type on map editor? + /// * this variable is a cache variable generated from movement type traits. + /// * this variable is not visible and should not be edited in the map editor. + var/tmp/movement_type = MOVEMENT_GROUND //? Spacedrift /// Which direction we're drifting @@ -63,7 +73,8 @@ //? Perspectives /// our default perspective - if none, a temporary one will be generated when a mob requires it - var/datum/perspective/self_perspective + /// * this variable is not visible and should not be edited in the map editor. + var/tmp/datum/perspective/self_perspective //? Buckling /// do we support the buckling system - if not, none of the default interactions will work, but comsigs will still fire! @@ -77,7 +88,8 @@ /// direction to set buckled mobs to. null to not do that. var/buckle_dir /// buckled mobs, associated to their semantic mode if necessary - var/list/mob/buckled_mobs + /// * this variable is not visible and should not be edited in the map editor. + var/tmp/list/mob/buckled_mobs /// restrained default unbuckle time (NOT TIME TO UN-RESTRAIN, this is time to UNBUCKLE from us) var/buckle_restrained_resist_time = 2 MINUTES @@ -134,9 +146,11 @@ /// Either FALSE, [EMISSIVE_BLOCK_GENERIC], or [EMISSIVE_BLOCK_UNIQUE] var/blocks_emissive = FALSE /// Internal holder for emissive blocker object, do not use directly use; use blocks_emissive - var/atom/movable/emissive_blocker/em_block + /// * this variable is not visible and should not be edited in the map editor. + var/tmp/atom/movable/emissive_blocker/em_block /// Internal holder for emissives. Definitely don't directly use, this is absolutely an insane Citadel Moment(tm). - var/atom/movable/emissive_render/em_render + /// * this variable is not visible and should not be edited in the map editor. + var/tmp/atom/movable/emissive_render/em_render //? Icon Scale /// Used to scale icons up or down horizonally in update_transform(). @@ -433,6 +447,18 @@ /atom/movable/proc/is_avoiding_ground() return ((movement_type & MOVEMENT_TYPES) != MOVEMENT_GROUND) || throwing +//* Duplication *// + +/** + * makes a clone of this movable + * + * @params + * * location - where to clone us + * * include_contents - include semantic contents; ergo 'what we are hosting' vs 'what we are' + */ +/atom/movable/clone(atom/location, include_contents) + return ..(include_contents) + //? Perspectives /** * get perspective to use when shifting eye to us, diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 1b61869d85d..dec2d74f8d8 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -100,12 +100,16 @@ var/obj_persist_static_mode = OBJ_PERSIST_STATIC_MODE_MAP /// on static map/level bind mode, this is to determine which level/map we're bound to /// once bound, even if we go to another level, we are treated as this level. - var/obj_persist_static_bound_id + /// binding is done during load. + /// * this variable is not visible and should not be edited in the map editor. + var/tmp/obj_persist_static_bound_id /// if set, we are currently dynamically persisting. this is our ID and must be unique for a given map level. /// this id will not collide with static id. - var/obj_persist_dynamic_id + /// * this variable is not visible and should not be edited in the map editor. + var/tmp/obj_persist_dynamic_id /// dynamic persistence state flags - var/obj_persist_dynamic_status = NONE + /// * this variable is not visible and should not be edited in the map editor. + var/tmp/obj_persist_dynamic_status = NONE //? Sounds /// volume when breaking out using resist process @@ -644,6 +648,8 @@ if(isnull(mat)) // 'none' option continue . += "Its [key] is made out of [mat.display_name]" + if((obj_persist_dynamic_id || obj_persist_static_id) && !(obj_persist_status & OBJ_PERSIST_STATUS_NO_EXAMINE)) + . += SPAN_BOLDNOTICE("This entity is a persistent entity; it may be preserved into future rounds.") /obj/proc/examine_integrity(mob/user) . = list() diff --git a/code/modules/admin/verbs/debug/reestablish_db_connection.dm b/code/modules/admin/verbs/debug/reestablish_db_connection.dm index 33f0e9d8524..4b9fe03c5a6 100644 --- a/code/modules/admin/verbs/debug/reestablish_db_connection.dm +++ b/code/modules/admin/verbs/debug/reestablish_db_connection.dm @@ -31,3 +31,7 @@ message_admins("Reloading client database data...") for(var/client/C in GLOB.clients) C.player?.load() + message_admins("Asserting round ID set...") + if(!isnum(text2num(GLOB.round_id))) + SSdbcore.SetRoundID() + message_admins("Round ID was not set and has now been re-set. Things might be weird this round.") diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm index c155b354606..af02717eb6d 100644 --- a/code/modules/mining/machine_processing.dm +++ b/code/modules/mining/machine_processing.dm @@ -6,7 +6,7 @@ /obj/machinery/mineral/processing_unit_console name = "production machine console" - icon = 'icons/obj/machines/mining_machines_vr.dmi' + icon = 'icons/obj/machines/mining_machines.dmi' icon_state = "console" density = TRUE anchored = TRUE @@ -136,7 +136,7 @@ /obj/machinery/mineral/processing_unit name = "material processor" //This isn't actually a goddamn furnace, we're in space and it's processing platinum and flammable phoron... - icon = 'icons/obj/machines/mining_machines_vr.dmi' + icon = 'icons/obj/machines/mining_machines.dmi' icon_state = "furnace" density = TRUE anchored = TRUE diff --git a/code/modules/mining/machine_stacking.dm b/code/modules/mining/machine_stacking.dm index 4b85b8ff2b1..8f93efbe270 100644 --- a/code/modules/mining/machine_stacking.dm +++ b/code/modules/mining/machine_stacking.dm @@ -2,7 +2,7 @@ /obj/machinery/mineral/stacking_unit_console name = "stacking machine console" - icon = 'icons/obj/machines/mining_machines_vr.dmi' + icon = 'icons/obj/machines/mining_machines.dmi' icon_state = "console" density = 1 anchored = 1 @@ -72,7 +72,7 @@ /obj/machinery/mineral/stacking_machine name = "stacking machine" - icon = 'icons/obj/machines/mining_machines_vr.dmi' + icon = 'icons/obj/machines/mining_machines.dmi' icon_state = "stacker" density = 1 anchored = 1.0 diff --git a/code/modules/mining/machine_unloading.dm b/code/modules/mining/machine_unloading.dm index 59dea20d6b2..0f281c96052 100644 --- a/code/modules/mining/machine_unloading.dm +++ b/code/modules/mining/machine_unloading.dm @@ -2,7 +2,7 @@ /obj/machinery/mineral/unloading_machine name = "unloading machine" - icon = 'icons/obj/machines/mining_machines_vr.dmi' + icon = 'icons/obj/machines/mining_machines.dmi' icon_state = "unloader" density = 1 anchored = 1.0 diff --git a/code/modules/mining/machinery/sheet_silo.dm b/code/modules/mining/machinery/sheet_silo.dm new file mode 100644 index 00000000000..a8e964ac639 --- /dev/null +++ b/code/modules/mining/machinery/sheet_silo.dm @@ -0,0 +1,129 @@ +//* This file is explicitly licensed under the MIT license. *// +//* Copyright (c) 2024 silicons *// + +/** + * persistence allowed storage system + * + * notes: + * * bluespace ore silo/sheet delivery is explicitly not to be made. any prs attempting to do so will be closed. ~silicons + */ +/obj/machinery/sheet_silo + name = "materials silo" + desc = "A reinforced materials storage silo. Inserted sheets are protected via stasis field." + icon = 'icons/modules/mining/machinery/sheet_silo.dmi' + icon_state = "silo" + density = TRUE + anchored = TRUE + integrity_flags = INTEGRITY_INDESTRUCTIBLE + + /// material id to **sheets** + var/list/sheets_by_material = list() + /// how much to multiply all ores by + var/persistence_decay_factor = 0.35 + /// how much to subtract from all ores after factor + var/persistence_decay_constant = 10 + /// ignore overpowered ore filter + var/persistence_allow_overpowered = FALSE + +/obj/machinery/sheet_silo/decay_persisted(rounds_since_saved, hours_since_saved) + . = ..() + for(var/id in sheets_by_material) + // this isn't technically mathematically accurate but honestly + // i don't care + sheets_by_material[id] = max(0, round(sheets_by_material[id] * (persistence_decay_factor ** rounds_since_saved) - persistence_decay_constant * rounds_since_saved)) + if(!sheets_by_material[id]) + sheets_by_material -= id + +/obj/machinery/sheet_silo/attackby(obj/item/I, mob/living/user, list/params, clickchain_flags, damage_multiplier) + if(istype(I, /obj/item/stack/material)) + var/obj/item/stack/material/sheets = I + if(!user.transfer_item_to_loc(sheets, src)) + to_chat(user, SPAN_WARNING("You fail to insert [sheets] into [src].")) + return CLICKCHAIN_DO_NOT_PROPAGATE + var/inserted = take_sheets(sheets) + user.visible_message( + SPAN_NOTICE("[user] inserts [I] into [src]."), + SPAN_NOTICE("You insert [inserted] sheets of [I] into [src]."), + range = MESSAGE_RANGE_INVENTORY_SOFT, + ) + return CLICKCHAIN_DO_NOT_PROPAGATE | CLICKCHAIN_DID_SOMETHING + return ..() + +/obj/machinery/sheet_silo/proc/take_sheets(obj/item/stack/material/sheets) + if(sheets.uses_charge) + return 0 + var/mat_id = sheets.material.id + var/mat_amount = sheets.amount + . = mat_amount + sheets.use(mat_amount) + sheets_by_material[mat_id] += mat_amount + +/obj/machinery/sheet_silo/clone(atom/location, include_contents) + var/obj/machinery/sheet_silo/clone = ..() + clone.sheets_by_material = sheets_by_material.Copy() + return clone + +/obj/machinery/sheet_silo/serialize() + . = ..() + var/list/transformed_sheets = list() + for(var/id in sheets_by_material) + var/datum/material/mat = SSmaterials.resolve_material(id) + if(isnull(mat)) + continue + if(!persistence_allow_overpowered && (mat.material_flags & MATERIAL_FLAG_CONSIDERED_OVERPOWERED)) + continue + var/amount = sheets_by_material[id] + transformed_sheets[id] = amount + .["stored"] = transformed_sheets + +/obj/machinery/sheet_silo/deserialize(list/data) + . = ..() + sheets_by_material = data["stored"] + +/obj/machinery/sheet_silo/ui_assets(mob/user) + . = ..() + . += get_asset_datum(/datum/asset/spritesheet/materials) + +/obj/machinery/sheet_silo/ui_data(mob/user, datum/tgui/ui) + . = ..() + .["stored"] = sheets_by_material + +/obj/machinery/sheet_silo/ui_static_data(mob/user, datum/tgui/ui) + . = ..() + .["materialContext"] = SSmaterials.tgui_materials_context() + +/obj/machinery/sheet_silo/ui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "SheetSilo") + ui.open() + +/obj/machinery/sheet_silo/ui_act(action, list/params, datum/tgui/ui) + . = ..() + if(.) + return + switch(action) + if("eject") + var/amount = params["amount"] + var/id = params["id"] + if(!is_safe_number(amount)) + return TRUE + amount = clamp(amount, 0, sheets_by_material[id]) + if(!amount) + return TRUE + var/datum/material/dropping = SSmaterials.resolve_material(id) + if(isnull(dropping)) + return TRUE + // todo: ughh + var/obj/item/stack/material/casted = dropping.stack_type + amount = min(amount, initial(casted.max_amount)) + if(!amount) + return TRUE + sheets_by_material[id] -= amount + if(sheets_by_material[id] <= 0) + sheets_by_material -= id + var/obj/item/stack/material/dropped = dropping.place_sheet(get_turf(src), amount) + if(usr) + usr.put_in_hands(dropped) + usr.visible_message(SPAN_NOTICE("[usr] retrieves [amount] sheets of [dropping] from [src]."), range = MESSAGE_RANGE_INVENTORY_SOFT) + return TRUE diff --git a/code/modules/mining/machinery/sheet_silo_loader.dm b/code/modules/mining/machinery/sheet_silo_loader.dm new file mode 100644 index 00000000000..d5d21ca63f7 --- /dev/null +++ b/code/modules/mining/machinery/sheet_silo_loader.dm @@ -0,0 +1,26 @@ +//* This file is explicitly licensed under the MIT license. *// +//* Copyright (c) 2024 silicons *// + +/** + * auto-loads sheets into sheet silos + */ +/obj/machinery/sheet_silo_loader + name = "materials silo loader" + desc = "An autoloader for a materials silo." + icon = 'icons/modules/mining/machinery/sheet_silo_loader.dmi' + icon_state = "loader" + anchored = TRUE + integrity_flags = INTEGRITY_INDESTRUCTIBLE + +/obj/machinery/sheet_silo_loader/process(delta_time) + // todo: lazy-ticking + var/list/obj/item/stack/material/stacks = list() + for(var/obj/item/stack/material/matstack in loc) + stacks += matstack + if(!length(stacks)) + return + var/obj/machinery/sheet_silo/silo = locate() in get_step(src, dir) + if(isnull(silo)) + return + for(var/obj/item/stack/material/matstack as anything in stacks) + silo.take_sheets(matstack) diff --git a/code/modules/mining/ore_redemption_machine/survey_vendor.dm b/code/modules/mining/ore_redemption_machine/survey_vendor.dm index 1683c98b6bc..f6e2675dc7d 100644 --- a/code/modules/mining/ore_redemption_machine/survey_vendor.dm +++ b/code/modules/mining/ore_redemption_machine/survey_vendor.dm @@ -1,7 +1,7 @@ /obj/machinery/mineral/equipment_vendor/survey name = "exploration equipment vendor" desc = "An equipment vendor for explorers, points collected with a survey scanner can be spent here." - icon = 'icons/obj/machines/mining_machines_vr.dmi' + icon = 'icons/obj/machines/mining_machines.dmi' icon_state = "exploration" density = TRUE anchored = TRUE diff --git a/code/modules/mob/characteristics/holder.dm b/code/modules/mob/characteristics/holder.dm index 9ce0b73f00a..aa1dfca4d94 100644 --- a/code/modules/mob/characteristics/holder.dm +++ b/code/modules/mob/characteristics/holder.dm @@ -134,9 +134,9 @@ /** * clones */ -/datum/characteristics_holder/proc/clone() +/datum/characteristics_holder/clone(include_contents) RETURN_TYPE(/datum/characteristics_holder) - var/datum/characteristics_holder/cloning = new + var/datum/characteristics_holder/cloning = ..() cloning.skills = skills.Copy() cloning.stats = stats.Copy() cloning.talents = talents.Copy() diff --git a/code/modules/modular_computers/file_system/computer_file.dm b/code/modules/modular_computers/file_system/computer_file.dm index ef886b871ed..51c1206bf1a 100644 --- a/code/modules/modular_computers/file_system/computer_file.dm +++ b/code/modules/modular_computers/file_system/computer_file.dm @@ -26,15 +26,12 @@ var/global/file_uid = 0 return ..() // Returns independent copy of this file. -/datum/computer_file/proc/clone(var/rename = 0) - var/datum/computer_file/temp = new type +/datum/computer_file/clone(include_contents) + var/datum/computer_file/temp = ..() temp.unsendable = unsendable temp.undeletable = undeletable temp.size = size - if(rename) - temp.filename = filename + "(Copy)" - else - temp.filename = filename + temp.filename = filename temp.filetype = filetype return temp diff --git a/code/modules/modular_computers/file_system/programs/generic/file_browser.dm b/code/modules/modular_computers/file_system/programs/generic/file_browser.dm index 4d578217977..295f4aabf99 100644 --- a/code/modules/modular_computers/file_system/programs/generic/file_browser.dm +++ b/code/modules/modular_computers/file_system/programs/generic/file_browser.dm @@ -46,7 +46,8 @@ var/datum/computer_file/F = HDD.find_file_by_name(params["name"]) if(!F || !istype(F)) return - var/datum/computer_file/C = F.clone(1) + var/datum/computer_file/C = F.clone() + C.filename = F.filename + "(Copy)" HDD.store_file(C) return TRUE if("PRG_edit") diff --git a/code/modules/species/species.dm b/code/modules/species/species.dm index f49084ac816..483aa2255e5 100644 --- a/code/modules/species/species.dm +++ b/code/modules/species/species.dm @@ -875,9 +875,10 @@ GLOBAL_LIST_INIT(species_oxygen_tank_by_gas, list( /** * clones us into a new datum */ -/datum/species/proc/clone() +/datum/species/clone(include_contents) var/datum/species/created = new type created.copy_from(src) + return created /** * completely clones us from another species, updating the provided human in the process diff --git a/icons/modules/mining/machinery/sheet_silo.dmi b/icons/modules/mining/machinery/sheet_silo.dmi new file mode 100644 index 0000000000000000000000000000000000000000..e06d0fe2d328b926e9005b18de1de5329cfc92f1 GIT binary patch literal 1114 zcmV-g1f~0lP)QjB(N z9!qHzLSVn=|Ks%kz`(%3Q(8;_0004WQchCV=- z0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+(=$pSoZ^zi zl2jm5sW>wyUx|w|C9|j)$Tj5ROe;#vO@**g6vZbdmt>ZuVpnSh6iv-ZtON<`z#*5i zf~%hk*jWHy*ejSElg6U}00RO^L_t(&f$f=za@sHuhNTD@40WNPl2VFjLX*7z8+Iib zpORL1l}skXnq!9V_a0pH@0hW#68swP!#RHtLd+nfS3>3whSv%?R^;ME0Rk~rczEy4 z!1z^A6!V!?1QPW4VzFoxD3`ThKA+bulwCoHFKYqDCns2aOXEf$t^)TijuMdgRZt)a zCiAYKsuB}?U#?c`L=J+@4;NKYKm}2jg9HtC4FKm7Vx7jfT<$h53RgfWRSU`}mr2|T ze%jd0;ipmwq4tl11ix$;Ud=?MIPk;oLmD@NOI9oM0bpTyw}B`(g5w_> z8#BR7j1%~HcY-K4g46D3j+31L-owYi1U}wvAj+BE%9G{Qsc?T+{SPU?n+`F~&U$M* z_-i|G-{Z5Jpe)1OL=tD`Cw)BGI1U75slpsOOylg#wLaR|)=^$VsSF%OeAYs@q1xao z1BVWtwZ6cA2|zQVk(kdwDOq>u>c?06L8Ne~dT##n;^r zlKp>xAIST`8*x9t{6DroG<>T6Hwj|A-7hBje>mM7_x<1=9~zkdC#R45dvbon-{;C7 z^!J$x1pPfZKj!b>tH3f>1=QbXDiHSf84LLRJ-tBO-%|ti_c;p0t{>zm5WRkoqd?r> zXDAT8en1Y?-%|s-en2mP`FnB!%-@p>VE&$50J(lZFM#=bdI8MeQv>(+)WH3Hh6*h1 g@97op{yrH00bmR9ukoJ&_y7O^07*qoM6N<$g6%^MjsO4v literal 0 HcmV?d00001 diff --git a/icons/modules/mining/machinery/sheet_silo_loader.dmi b/icons/modules/mining/machinery/sheet_silo_loader.dmi new file mode 100644 index 0000000000000000000000000000000000000000..17d0f1fa360d1d9a2cf0d59b247aa112f07cde56 GIT binary patch literal 398 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 sNCzo_5V#6R6;wKjD58QirAb#I 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

InQ%wzZf;x{T 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

+ + {Object.entries(data.stored).sort( + ([k1, v1], [k2, v2]) => ( + (data.materialContext.materials[k1]?.name || "AAAAA").localeCompare( + (data.materialContext.materials[k2]?.name || "AAAAA") + ) + ) + ).map(([k, v]) => ( + + + + + {data.materialContext.materials[k]?.name || 'UNKNOWN'} - {v} + + + +
+ + + ); +};