diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 339d48c9fe39..c66b16031c63 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -167,20 +167,6 @@ Certain PRs, such as those which directly change number values (i.e. health, rec * We understand that having something you have worked on for quite some time being denied can be frustrating. Therefore, it is recommended that you check with a maintainer before beginning to code your PR if you have any doubts that it will be accepted. This will save everyone's time and energy. -## Good Boy Points - -Each GitHub account has a score known as Good Boy Points, or GBP. This is a system we use to ensure that the codebase stays maintained and that contributors fix bugs as well as add features. - -The GBP gain or loss for a PR depends on the type of changes the PR makes, represented by the tags assigned to the PR by the CM-SS13 github bot or maintainers. Generally speaking, fixing bugs, updating sprites, or improving maps increases your GBP score, while adding mechanics, or rebalancing things will cost you GBP. - -The GBP change of a PR is the sum of greatest positive and lowest negative values it has. For example, a PR that has tags worth +10, +4, -1, -7, will net 3 GBP (10 - 7). - -Negative GBP increases the likelihood of a maintainer closing your PR. With that chance being higher the lower your GBP is. Be sure to use the proper tags in the changelog to prevent unnecessary GBP loss. Maintainers reserve the right to change tags as they deem appropriate. - -There is no benefit to having a higher positive GBP score, since GBP only comes into consideration when it is negative. - -You can see each tag and their GBP values [Here](https://github.com/cmss13-devs/cmss13/blob/master/.github/gbp.toml). - ## Porting features/sprites/sounds/tools from other codebases If you are porting features/tools from other codebases, you must give them credit where it's due. Typically, crediting them in your pull request and the changelog is the recommended way of doing it. Take note of what license they use though, porting stuff from AGPLv3 and GPLv3 codebases are allowed. diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 8f8ccbe07f60..cb1790053744 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -26,8 +26,8 @@ Put screenshots and videos here with an empty line between the screenshots and t # Changelog - - + + :cl: add: Added something diff --git a/.github/alternate_byond_versions.txt b/.github/alternate_byond_versions.txt index f25861c46714..005803964cca 100644 --- a/.github/alternate_byond_versions.txt +++ b/.github/alternate_byond_versions.txt @@ -6,4 +6,4 @@ # Example: # 500.1337: runtimestation -515.1603: lv624 +515.1610: lv624 diff --git a/.github/gbp.toml b/.github/gbp.toml deleted file mode 100644 index 85dd702803e2..000000000000 --- a/.github/gbp.toml +++ /dev/null @@ -1,23 +0,0 @@ -no_balance_label = "GBP: No Update" -reset_label = "GBP: Reset" - -[points] -"Accessibility" = 3 -"Admin" = 2 -"Atomic" = 2 -"Balance" = -5 -"Code Improvement" = 2 -"Fix" = 3 -"Grammar and Formatting" = 1 -"Hard Deletes" = 12 -"Logging" = 1 -"Feature" = -5 -"Performance" = 12 -"Priority: CRITICAL" = 20 -"Priority: High" = 15 -"Quality of Life" = 1 -"Refactor" = 6 -"Roadmap" = 15 -"Sound" = 3 -"Sprites" = 3 -"UI" = 3 diff --git a/.github/workflows/gbp.yml b/.github/workflows/gbp.yml deleted file mode 100644 index 9c92e5f379dc..000000000000 --- a/.github/workflows/gbp.yml +++ /dev/null @@ -1,42 +0,0 @@ -name: GBP -on: - pull_request_target: - types: [closed, opened] -jobs: - gbp: - runs-on: ubuntu-latest - steps: - - name: "Check for ACTION_ENABLER secret and pass true to output if it exists to be checked by later steps" - id: value_holder - env: - ENABLER_SECRET: ${{ secrets.ACTION_ENABLER }} - run: | - unset SECRET_EXISTS - if [ -n "$ENABLER_SECRET" ]; then SECRET_EXISTS=true ; fi - echo "::set-output name=ACTIONS_ENABLED::$SECRET_EXISTS" - - name: Checkout - if: steps.value_holder.outputs.ACTIONS_ENABLED - uses: actions/checkout@v3 - - name: Setup git - if: steps.value_holder.outputs.ACTIONS_ENABLED - run: | - git config --global user.name "gbp-action" - git config --global user.email "<>" - - name: Checkout alternate branch - if: steps.value_holder.outputs.ACTIONS_ENABLED - uses: actions/checkout@v3 - with: - ref: "gbp-balances" # The branch name - path: gbp-balances - # This is to ensure we keep the gbp.toml from master - # without having to update our separate branch. - - name: Copy configuration - if: steps.value_holder.outputs.ACTIONS_ENABLED - run: cp ./.github/gbp.toml ./gbp-balances/.github/gbp.toml - - name: GBP action - if: steps.value_holder.outputs.ACTIONS_ENABLED - uses: tgstation/gbp-action@master - with: - branch: "gbp-balances" - directory: ./gbp-balances - token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/gbp_collect.yml b/.github/workflows/gbp_collect.yml deleted file mode 100644 index dc2af17a12de..000000000000 --- a/.github/workflows/gbp_collect.yml +++ /dev/null @@ -1,44 +0,0 @@ -name: GBP Collection -# Every hour at the :20 minute mark. GitHub tells us to pick odd hours, instead of just using the start. -on: - schedule: - - cron: "20 * * * *" - workflow_dispatch: -jobs: - gbp_collection: - runs-on: ubuntu-latest - steps: - - name: "Check for ACTION_ENABLER secret and pass true to output if it exists to be checked by later steps" - id: value_holder - env: - ENABLER_SECRET: ${{ secrets.ACTION_ENABLER }} - run: | - unset SECRET_EXISTS - if [ -n "$ENABLER_SECRET" ]; then SECRET_EXISTS=true ; fi - echo "::set-output name=ACTIONS_ENABLED::$SECRET_EXISTS" - - name: Checkout - if: steps.value_holder.outputs.ACTIONS_ENABLED - uses: actions/checkout@v3 - - name: Setup git - if: steps.value_holder.outputs.ACTIONS_ENABLED - run: | - git config --global user.name "github-actions[bot]" - git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com" - - name: Checkout alternate branch - if: steps.value_holder.outputs.ACTIONS_ENABLED - uses: actions/checkout@v3 - with: - ref: "gbp-balances" # The branch name - path: gbp-balances - # This is to ensure we keep the gbp.toml from master - # without having to update our separate branch. - - name: Copy configuration - if: steps.value_holder.outputs.ACTIONS_ENABLED - run: cp ./.github/gbp.toml ./gbp-balances/.github/gbp.toml - - name: GBP action - if: steps.value_holder.outputs.ACTIONS_ENABLED - uses: tgstation/gbp-action@master - with: - collect: "true" - directory: ./gbp-balances - token: ${{ secrets.GITHUB_TOKEN }} diff --git a/code/__DEFINES/wj_emotes.dm b/code/__DEFINES/emote_panels.dm similarity index 70% rename from code/__DEFINES/wj_emotes.dm rename to code/__DEFINES/emote_panels.dm index f315c6eb2ba5..59959818da74 100644 --- a/code/__DEFINES/wj_emotes.dm +++ b/code/__DEFINES/emote_panels.dm @@ -6,3 +6,7 @@ #define JOE_EMOTE_CATEGORY_WARNING "Warning" #define JOE_EMOTE_CATEGORY_QUESTION "Question" #define JOE_EMOTE_CATEGORY_NOTICE "Notice" + +#define YAUTJA_EMOTE_CATEGORY_FAKESOUND "Fake Sound" +#define YAUTJA_EMOTE_CATEGORY_VOICE "Voice Synthesizer" +#define YAUTJA_EMOTE_CATEGORY_SPECIES "Yautja" diff --git a/code/__DEFINES/job.dm b/code/__DEFINES/job.dm index cede518e8db0..d598a8ff6f67 100644 --- a/code/__DEFINES/job.dm +++ b/code/__DEFINES/job.dm @@ -230,6 +230,17 @@ var/global/list/job_command_roles = JOB_COMMAND_ROLES_LIST #define CMB_GRUNT_LIST list(JOB_CMB, JOB_CMB_TL) +//-------- FORECON --------// + +#define JOB_FORECON_CO "Reconnaissance Commander" +#define JOB_FORECON_SL "Reconnaissance Squad Leader" +#define JOB_FORECON_SYN "Reconnaissance Synthetic" +#define JOB_FORECON_SNIPER "Reconnaissance Sniper" +#define JOB_FORECON_MARKSMAN "Reconnaissance Marksman" +#define JOB_FORECON_SUPPORT "Reconnaissance Support Technician" +#define JOB_FORECON_RIFLEMAN "Reconnaissance Rifleman" +#define JOB_FORECON_SMARTGUNNER "Reconnaissance Smartgunner" + //-------- UPP --------// #define JOB_UPP "UPP Private" #define JOB_UPP_CONSCRIPT "UPP Conscript" diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm index 673bb4fc6d81..c0886ab871f9 100644 --- a/code/__DEFINES/mobs.dm +++ b/code/__DEFINES/mobs.dm @@ -131,8 +131,9 @@ #define XENO_HIVE_MUTATED "xeno_hive_mutated" #define XENO_HIVE_FORSAKEN "xeno_hive_forsaken" #define XENO_HIVE_YAUTJA "xeno_hive_yautja" +#define XENO_HIVE_RENEGADE "xeno_hive_renegade" -#define ALL_XENO_HIVES list(XENO_HIVE_NORMAL, XENO_HIVE_CORRUPTED, XENO_HIVE_ALPHA, XENO_HIVE_BRAVO, XENO_HIVE_CHARLIE, XENO_HIVE_DELTA, XENO_HIVE_FERAL, XENO_HIVE_TAMED, XENO_HIVE_MUTATED, XENO_HIVE_FORSAKEN, XENO_HIVE_YAUTJA) +#define ALL_XENO_HIVES list(XENO_HIVE_NORMAL, XENO_HIVE_CORRUPTED, XENO_HIVE_ALPHA, XENO_HIVE_BRAVO, XENO_HIVE_CHARLIE, XENO_HIVE_DELTA, XENO_HIVE_FERAL, XENO_HIVE_TAMED, XENO_HIVE_MUTATED, XENO_HIVE_FORSAKEN, XENO_HIVE_YAUTJA, XENO_HIVE_RENEGADE) //================================================= diff --git a/code/__DEFINES/mode.dm b/code/__DEFINES/mode.dm index aa22c70d4213..2895b3211fd3 100644 --- a/code/__DEFINES/mode.dm +++ b/code/__DEFINES/mode.dm @@ -74,7 +74,7 @@ #define ROUNDSTATUS_FOG_DOWN 1 #define ROUNDSTATUS_PODDOORS_OPEN 2 -#define LATEJOIN_MARINES_PER_LATEJOIN_LARVA 3 +#define LATEJOIN_MARINES_PER_LATEJOIN_LARVA 2.5 //================================================= #define SHOW_ITEM_ANIMATIONS_NONE 0 //Do not show any item pickup animations diff --git a/code/__DEFINES/typecheck/xenos.dm b/code/__DEFINES/typecheck/xenos.dm index d313090e8305..34b70ac92f45 100644 --- a/code/__DEFINES/typecheck/xenos.dm +++ b/code/__DEFINES/typecheck/xenos.dm @@ -37,6 +37,10 @@ if(!hive) return FALSE + if(hivenumber == XENO_HIVE_RENEGADE) + var/datum/hive_status/corrupted/renegade/renegade_hive = hive + return renegade_hive.iff_protection_check(src, attempt_harm_mob) + return hive.is_ally(attempt_harm_mob) // need this to set the data for walls/eggs/huggers when they are initialized diff --git a/code/_globalvars/global_lists.dm b/code/_globalvars/global_lists.dm index 7e65cfecd8b0..36058a44fc37 100644 --- a/code/_globalvars/global_lists.dm +++ b/code/_globalvars/global_lists.dm @@ -177,7 +177,8 @@ GLOBAL_LIST_INIT_TYPED(hive_datum, /datum/hive_status, list( XENO_HIVE_TAMED = new /datum/hive_status/corrupted/tamed(), XENO_HIVE_MUTATED = new /datum/hive_status/mutated(), XENO_HIVE_FORSAKEN = new /datum/hive_status/forsaken(), - XENO_HIVE_YAUTJA = new /datum/hive_status/yautja() + XENO_HIVE_YAUTJA = new /datum/hive_status/yautja(), + XENO_HIVE_RENEGADE = new /datum/hive_status/corrupted/renegade(), )) GLOBAL_LIST_INIT(xeno_evolve_times, setup_xeno_evolve_times()) diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index ed6e3cda15f5..afecabd74be0 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -123,10 +123,14 @@ SUBSYSTEM_DEF(mapping) ++i // load the maps - for (var/P in parsed_maps) - var/datum/parsed_map/pm = P - if (!pm.load(1, 1, start_z + parsed_maps[P], no_changeturf = TRUE)) + for (var/datum/parsed_map/pm as anything in parsed_maps) + var/cur_z = start_z + parsed_maps[pm] + if (!pm.load(1, 1, cur_z, no_changeturf = TRUE)) errorList |= pm.original_path + if(istype(z_list[cur_z], /datum/space_level)) + var/datum/space_level/cur_level = z_list[cur_z] + cur_level.x_bounds = pm.bounds[MAP_MAXX] + cur_level.y_bounds = pm.bounds[MAP_MAXY] if(!silent) INIT_ANNOUNCE("Loaded [name] in [(REALTIMEOFDAY - start_time)/10]s!") return parsed_maps diff --git a/code/datums/emergency_calls/emergency_call.dm b/code/datums/emergency_calls/emergency_call.dm index 2a305dcc4342..3d43917b2bc7 100644 --- a/code/datums/emergency_calls/emergency_call.dm +++ b/code/datums/emergency_calls/emergency_call.dm @@ -9,6 +9,11 @@ var/list/datum/emergency_call/all_calls = list() //initialized at round start and stores the datums. var/datum/emergency_call/picked_calls[] = list() //Which distress calls are currently active +/datum/game_mode/proc/ares_online() + var/name = "ARES Online" + var/input = "ARES. Online. Good morning, marines." + shipwide_ai_announcement(input, name, 'sound/AI/ares_online.ogg') + //The distress call parent. Cannot be called itself due to "name" being a filtered target. /datum/emergency_call var/name = "name" diff --git a/code/datums/factions/uscm.dm b/code/datums/factions/uscm.dm index 1fb1df278ab0..4d13e7d285ca 100644 --- a/code/datums/factions/uscm.dm +++ b/code/datums/factions/uscm.dm @@ -2,15 +2,15 @@ name = "United States Colonial Marines" faction_tag = FACTION_MARINE -/datum/faction/uscm/modify_hud_holder(image/holder, mob/living/carbon/human/H) - var/datum/squad/squad = H.assigned_squad +/datum/faction/uscm/modify_hud_holder(image/holder, mob/living/carbon/human/current_human) + var/datum/squad/squad = current_human.assigned_squad if(istype(squad)) - var/squad_clr = squad_colors[H.assigned_squad.color] + var/squad_clr = current_human.assigned_squad.equipment_color var/marine_rk - var/obj/item/card/id/I = H.get_idcard() + var/obj/item/card/id/I = current_human.get_idcard() var/_role - if(H.job) - _role = H.job + if(current_human.job) + _role = current_human.job else if(I) _role = I.rank switch(GET_DEFAULT_ROLE(_role)) @@ -29,42 +29,42 @@ if(JOB_MARINE_RAIDER) marine_rk = "soc" if(JOB_MARINE_RAIDER_SL) marine_rk = "soctl" if(JOB_MARINE_RAIDER_CMD) marine_rk = "soccmd" - if(squad.squad_leader == H) + if(squad.squad_leader == current_human) switch(squad.squad_type) if("Squad") marine_rk = "leader_a" if("Team") marine_rk = "soctl_a" - H.langchat_styles = "langchat_bolded" // bold text for bold leaders + current_human.langchat_styles = "langchat_bolded" // bold text for bold leaders else - H.langchat_styles = initial(H.langchat_styles) + current_human.langchat_styles = initial(current_human.langchat_styles) - H.langchat_color = squad_colors_chat[H.assigned_squad.color] + current_human.langchat_color = current_human.assigned_squad.chat_color - if(!marine_rk) marine_rk = H.rank_fallback + if(!marine_rk) marine_rk = current_human.rank_fallback if(marine_rk) - var/image/IMG = image('icons/mob/hud/marine_hud.dmi', H, "hudsquad") + var/image/IMG = image('icons/mob/hud/marine_hud.dmi', current_human, "hudsquad") if(squad_clr) IMG.color = squad_clr else IMG.color = "#5A934A" holder.overlays += IMG - holder.overlays += image('icons/mob/hud/marine_hud.dmi', H, "hudsquad_[marine_rk]") - if(H.assigned_squad && H.assigned_fireteam) - var/image/IMG2 = image('icons/mob/hud/marine_hud.dmi', H, "hudsquad_[H.assigned_fireteam]") + holder.overlays += image('icons/mob/hud/marine_hud.dmi', current_human, "hudsquad_[marine_rk]") + if(current_human.assigned_squad && current_human.assigned_fireteam) + var/image/IMG2 = image('icons/mob/hud/marine_hud.dmi', current_human, "hudsquad_[current_human.assigned_fireteam]") IMG2.color = squad_clr holder.overlays += IMG2 - if(H.assigned_squad.fireteam_leaders[H.assigned_fireteam] == H) - var/image/IMG3 = image('icons/mob/hud/marine_hud.dmi', H, "hudsquad_ftl") + if(current_human.assigned_squad.fireteam_leaders[current_human.assigned_fireteam] == current_human) + var/image/IMG3 = image('icons/mob/hud/marine_hud.dmi', current_human, "hudsquad_ftl") IMG3.color = squad_clr holder.overlays += IMG3 else var/marine_rk var/border_rk var/icon_prefix = "hudsquad_" - var/obj/item/card/id/ID = H.get_idcard() + var/obj/item/card/id/ID = current_human.get_idcard() var/_role - if(H.mind) - _role = H.job + if(current_human.mind) + _role = current_human.job else if(ID) _role = ID.rank switch(_role) @@ -188,9 +188,9 @@ icon_prefix = "cmb_" if(marine_rk) - var/image/I = image('icons/mob/hud/marine_hud.dmi', H, "hudsquad") + var/image/I = image('icons/mob/hud/marine_hud.dmi', current_human, "hudsquad") I.color = "#5A934A" holder.overlays += I - holder.overlays += image('icons/mob/hud/marine_hud.dmi', H, "[icon_prefix][marine_rk]") + holder.overlays += image('icons/mob/hud/marine_hud.dmi', current_human, "[icon_prefix][marine_rk]") if(border_rk) - holder.overlays += image('icons/mob/hud/marine_hud.dmi', H, "hudmarineborder[border_rk]") + holder.overlays += image('icons/mob/hud/marine_hud.dmi', current_human, "hudmarineborder[border_rk]") diff --git a/code/datums/map_config.dm b/code/datums/map_config.dm index c37bf802f12b..1f3c265ead76 100644 --- a/code/datums/map_config.dm +++ b/code/datums/map_config.dm @@ -31,6 +31,7 @@ var/shuttles = list() var/announce_text = "" + var/infection_announce_text = "" var/squads_max_num = 4 @@ -339,6 +340,9 @@ if(json["announce_text"]) announce_text = json["announce_text"] + if(json["infection_announce_text"]) + infection_announce_text = json["infection_announce_text"] + if(json["weather_holder"]) weather_holder = text2path(json["weather_holder"]) if(!weather_holder) diff --git a/code/datums/recipe.dm b/code/datums/recipe.dm index ec0c90f427ca..47752fd59400 100644 --- a/code/datums/recipe.dm +++ b/code/datums/recipe.dm @@ -769,7 +769,7 @@ /datum/recipe/syntikabob items = list( /obj/item/stack/rods, - /obj/item/reagent_container/food/snacks/meat/syntiflesh, + /obj/item/reagent_container/food/snacks/meat/synthmeat, ) result = /obj/item/reagent_container/food/snacks/monkeykabob diff --git a/code/datums/skills.dm b/code/datums/skills.dm index f37ea3a5a64e..b70b2bb9b7b0 100644 --- a/code/datums/skills.dm +++ b/code/datums/skills.dm @@ -530,15 +530,15 @@ MILITARY SURVIVORS SKILL_JTAC = SKILL_JTAC_TRAINED, ) -/datum/skills/military/survivor/forecon_grenadier - name = "Reconnaissance Grenadier" +/datum/skills/military/survivor/forecon_sniper + name = "Reconnaissance Sniper" skills = list( SKILL_ENGINEER = SKILL_ENGINEER_ENGI, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_DEFAULT, SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, SKILL_CQC = SKILL_CQC_TRAINED, SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, - SKILL_SPEC_WEAPONS = SKILL_SPEC_GRENADIER, + SKILL_SPEC_WEAPONS = SKILL_SPEC_SNIPER, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR, SKILL_LEADERSHIP = SKILL_LEAD_NOVICE, diff --git a/code/datums/supply_packs/operations.dm b/code/datums/supply_packs/operations.dm index 610503d6c25d..6d5e5d14756c 100644 --- a/code/datums/supply_packs/operations.dm +++ b/code/datums/supply_packs/operations.dm @@ -94,7 +94,7 @@ group = "Operations" /datum/supply_packs/nuclearbomb - name = "Operational Nuke" + name = "Decrypted Operational Nuke" cost = 0 containertype = /obj/structure/machinery/nuclearbomb buyable = 0 @@ -102,7 +102,7 @@ iteration_needed = null /datum/supply_packs/technuclearbomb - name = "Intel Operational Nuke" + name = "Encrypted Operational Nuke" cost = 0 containertype = /obj/structure/machinery/nuclearbomb/tech buyable = 0 diff --git a/code/game/area/LV522_Chances_Claim.dm b/code/game/area/LV522_Chances_Claim.dm index 8a424148d3b5..3d15d49c3df7 100644 --- a/code/game/area/LV522_Chances_Claim.dm +++ b/code/game/area/LV522_Chances_Claim.dm @@ -456,3 +456,18 @@ name = "Atmospheric Processor - Filtration System" icon_state = "mechbay" ceiling = CEILING_UNDERGROUND_METAL_BLOCK_CAS + +/area/lv522/atmos/way_in_command_centre + name = "Atmospheric Processor - North Corpo Reactor Entrance" + icon_state = "blue" + ceiling = CEILING_UNDERGROUND_METAL_BLOCK_CAS + +/area/lv522/atmos/sewer + name = "Atmospheric Processor - Sewer" + icon_state = "red" + ceiling = CEILING_UNDERGROUND_METAL_BLOCK_CAS + +/area/lv522/atmos/reactor_garage + name = "Atmospheric Processor - Garage" + icon_state = "green" + ceiling = CEILING_UNDERGROUND_METAL_BLOCK_CAS diff --git a/code/game/gamemodes/cm_process.dm b/code/game/gamemodes/cm_process.dm index e4e0e32adff4..82f0902e2f8c 100644 --- a/code/game/gamemodes/cm_process.dm +++ b/code/game/gamemodes/cm_process.dm @@ -244,6 +244,34 @@ GLOBAL_VAR_INIT(next_admin_bioscan, 30 MINUTES) return num_marines +/datum/game_mode/proc/count_per_faction(list/z_levels = SSmapping.levels_by_any_trait(list(ZTRAIT_GROUND, ZTRAIT_RESERVED, ZTRAIT_MARINE_MAIN_SHIP))) + var/num_marines = 0 + var/num_WY = 0 + var/num_UPP = 0 + var/num_CLF = 0 + var/num_headcount = 0 + + for(var/mob/living/carbon/human/current_human as anything in GLOB.alive_human_list) + if(!(current_human.z && (current_human.z in z_levels) && !istype(current_human.loc, /turf/open/space))) + continue + if(current_human.faction in FACTION_LIST_WY || current_human.job == "Corporate Liaison") //The CL is assigned the USCM faction for gameplay purposes + num_WY++ + num_headcount++ + continue + if(current_human.faction == FACTION_UPP) + num_UPP++ + num_headcount++ + continue + if(current_human.faction == FACTION_CLF) + num_CLF++ + num_headcount++ + continue + if(current_human.faction == FACTION_MARINE) + num_marines++ + num_headcount++ + continue + num_headcount++ + return list("marine_headcount" = num_marines,"WY_headcount" = num_WY,"UPP_headcount" = num_UPP,"CLF_headcount" = num_CLF,"total_headcount" = num_headcount) /* #undef QUEEN_DEATH_COUNTDOWN diff --git a/code/game/gamemodes/colonialmarines/colonialmarines.dm b/code/game/gamemodes/colonialmarines/colonialmarines.dm index 65dc2666070d..067201277e38 100644 --- a/code/game/gamemodes/colonialmarines/colonialmarines.dm +++ b/code/game/gamemodes/colonialmarines/colonialmarines.dm @@ -118,8 +118,6 @@ if(SSmapping.configs[GROUND_MAP].environment_traits[ZTRAIT_BASIC_RT]) flags_round_type |= MODE_BASIC_RT - round_time_lobby = world.time - addtimer(CALLBACK(src, PROC_REF(ares_online)), 5 SECONDS) addtimer(CALLBACK(src, PROC_REF(map_announcement)), 20 SECONDS) @@ -143,11 +141,6 @@ var/monkey_to_spawn = pick(monkey_types) new monkey_to_spawn(T) -/datum/game_mode/colonialmarines/proc/ares_online() - var/name = "ARES Online" - var/input = "ARES. Online. Good morning, marines." - shipwide_ai_announcement(input, name, 'sound/AI/ares_online.ogg') - /datum/game_mode/colonialmarines/proc/map_announcement() if(SSmapping.configs[GROUND_MAP].announce_text) var/rendered_announce_text = replacetext(SSmapping.configs[GROUND_MAP].announce_text, "###SHIPNAME###", MAIN_SHIP_NAME) @@ -354,6 +347,8 @@ ////////////////////////////////////////////////////////////////////// //Announces the end of the game with all relevant information stated// ////////////////////////////////////////////////////////////////////// +#define MAJORITY 0.5 // What percent do we consider a 'majority?' + /datum/game_mode/colonialmarines/declare_completion() announce_ending() var/musical_track @@ -372,7 +367,20 @@ round_statistics.current_map.total_marine_victories++ round_statistics.current_map.total_marine_majors++ if(MODE_INFESTATION_X_MINOR) - musical_track = pick('sound/theme/neutral_melancholy1.ogg','sound/theme/neutral_melancholy2.ogg') + var/list/living_player_list = count_humans_and_xenos(EvacuationAuthority.get_affected_zlevels()) + if(living_player_list[1] && !living_player_list[2]) // If Xeno Minor but Xenos are dead and Humans are alive, see which faction is the last standing + var/headcount = count_per_faction() + var/living = headcount["total_headcount"] + if ((headcount["WY_headcount"] / living) > MAJORITY) + musical_track = pick('sound/theme/LastManStanding_WY.ogg') + else if ((headcount["UPP_headcount"] / living) > MAJORITY) + musical_track = pick('sound/theme/LastManStanding_UPP.ogg') + else if ((headcount["CLF_headcount"] / living) > MAJORITY) + musical_track = pick('sound/theme/LastManStanding_CLF.ogg') + else if ((headcount["marine_headcount"] / living) > MAJORITY) + musical_track = pick('sound/theme/neutral_melancholy2.ogg') //This is the theme song for Colonial Marines the game, fitting + else + musical_track = pick('sound/theme/neutral_melancholy1.ogg') end_icon = "xeno_minor" if(round_statistics && round_statistics.current_map) round_statistics.current_map.total_xeno_victories++ @@ -581,3 +589,4 @@ #undef HIJACK_EXPLOSION_COUNT #undef MARINE_MAJOR_ROUND_END_DELAY +#undef MAJORITY diff --git a/code/game/gamemodes/extended/infection.dm b/code/game/gamemodes/extended/infection.dm index d42f71798a50..04e0545361aa 100644 --- a/code/game/gamemodes/extended/infection.dm +++ b/code/game/gamemodes/extended/infection.dm @@ -25,17 +25,25 @@ initialize_post_marine_gear_list() for(var/mob/new_player/np in GLOB.new_player_list) np.new_player_panel_proc() - spawn(50) - marine_announcement("We've lost contact with the Weyland-Yutani's research facility, [name]. The [MAIN_SHIP_NAME] has been dispatched to assist.", "[MAIN_SHIP_NAME]") + + addtimer(CALLBACK(src, PROC_REF(ares_online)), 5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(map_announcement)), 20 SECONDS) return ..() +/datum/game_mode/infection/proc/map_announcement() + if(SSmapping.configs[GROUND_MAP].infection_announce_text) + var/rendered_announce_text = replacetext(SSmapping.configs[GROUND_MAP].infection_announce_text, "###SHIPNAME###", MAIN_SHIP_NAME) + marine_announcement(rendered_announce_text, "[MAIN_SHIP_NAME]") + else if(SSmapping.configs[GROUND_MAP].announce_text) //if we missed a infection text for above, or just don't need a special one, we just use default announcement + var/rendered_announce_text = replacetext(SSmapping.configs[GROUND_MAP].announce_text, "###SHIPNAME###", MAIN_SHIP_NAME) + marine_announcement(rendered_announce_text, "[MAIN_SHIP_NAME]") + /datum/game_mode/infection/proc/initialize_post_survivor_list() if(synth_survivor) transform_survivor(synth_survivor, TRUE) for(var/datum/mind/survivor in survivors) if(transform_survivor(survivor) == 1) survivors -= survivor - tell_survivor_story() /datum/game_mode/infection/can_start() initialize_starting_survivor_list() diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 8017056c682d..5b007d275c32 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -103,17 +103,18 @@ var/global/cas_tracking_id_increment = 0 //this var used to assign unique tracki for(var/mob/new_player/np in GLOB.new_player_list) np.new_player_panel_proc() + round_time_lobby = world.time log_game("Round started at [time2text(world.realtime)]") if(SSticker.mode) log_game("Game mode set to [SSticker.mode]") log_game("Server IP: [world.internet_address]:[world.port]") - return 1 + return TRUE ///process() ///Called by the gameticker /datum/game_mode/process() - return 0 + return FALSE /datum/game_mode/proc/check_finished() //to be called by ticker diff --git a/code/game/jobs/job/marine/marine.dm b/code/game/jobs/job/marine/marine.dm index a64701b8bfc7..e07c1edd3138 100644 --- a/code/game/jobs/job/marine/marine.dm +++ b/code/game/jobs/job/marine/marine.dm @@ -5,15 +5,15 @@ spawn_positions = 8 allow_additional = 1 -/datum/job/marine/generate_entry_message(mob/living/carbon/human/H) - if(H.assigned_squad) - entry_message_intro = "You are a [title]!
You have been assigned to: [lowertext(H.assigned_squad.name)] squad.[Check_WO() ? "" : " Make your way to the cafeteria for some post-cryosleep chow, and then get equipped in your squad's prep room." ]" +/datum/job/marine/generate_entry_message(mob/living/carbon/human/current_human) + if(current_human.assigned_squad) + entry_message_intro = "You are a [title]!
You have been assigned to: [lowertext(current_human.assigned_squad.name)] squad.[Check_WO() ? "" : " Make your way to the cafeteria for some post-cryosleep chow, and then get equipped in your squad's prep room." ]" return ..() -/datum/job/marine/generate_entry_conditions(mob/living/carbon/human/H) +/datum/job/marine/generate_entry_conditions(mob/living/carbon/human/current_human) ..() if(!Check_WO()) - H.nutrition = rand(NUTRITION_VERYLOW, NUTRITION_LOW) //Start hungry for the default marine. + current_human.nutrition = rand(NUTRITION_VERYLOW, NUTRITION_LOW) //Start hungry for the default marine. /datum/timelock/squad name = "Squad Roles" diff --git a/code/game/jobs/job/marine/squad_info.dm b/code/game/jobs/job/marine/squad_info.dm index 1dc4ad7181cd..7e7dfcc0229a 100644 --- a/code/game/jobs/job/marine/squad_info.dm +++ b/code/game/jobs/job/marine/squad_info.dm @@ -17,7 +17,7 @@ update_squad_leader() var/list/data = squad_info_data.Copy() data["squad"] = name - data["squad_color"] = squad_colors[color] + data["squad_color"] = equipment_color data["is_lead"] = get_leadership(user) data["objective"] = list( "primary" = primary_objective, diff --git a/code/game/jobs/job/marine/squads.dm b/code/game/jobs/job/marine/squads.dm index 9f4068e8450f..fb85be012d30 100644 --- a/code/game/jobs/job/marine/squads.dm +++ b/code/game/jobs/job/marine/squads.dm @@ -25,29 +25,51 @@ sub_leader = "Strike Leader" /datum/squad - var/name //Name of the squad + /// Name of the squad + var/name + /// Squads ID that is set on New() var/tracking_id = null //Used for the tracking subsystem - var/max_positions = -1 //Maximum number allowed in a squad. Defaults to infinite - var/color = 0 //Color for helmets, etc. - var/list/access = list() //Which special access do we grant them - var/omni_squad_vendor = FALSE /// Can use any squad vendor regardless of squad connection - var/max_engineers = 3 //maximum # of engineers allowed in squad - var/max_medics = 4 //Ditto, squad medics + /// Maximum number allowed in a squad. Defaults to infinite + var/max_positions = -1 + /// Color for the squad marines gear overlays + var/equipment_color = "#FFFFFF" + /// The alpha for the armor overlay used by equipment color + var/armor_alpha = 125 + /// Color for the squad marines langchat + var/chat_color = "#FFFFFF" + /// Which special access do we grant them + var/list/access = list() + /// Can use any squad vendor regardless of squad connection + var/omni_squad_vendor = FALSE + /// maximum # of engineers allowed in the squad + var/max_engineers = 3 + /// maximum # of squad medics allowed in the squad + var/max_medics = 4 + /// maximum # of specs allowed in the squad var/max_specialists = 1 + /// maximum # of fireteam leaders allowed in the suqad var/max_tl = 2 + /// maximum # of smartgunners allowed in the squad var/max_smartgun = 1 + /// maximum # of squad leaders allowed in the squad var/max_leaders = 1 - var/radio_freq = 1461 //Squad radio headset frequency. - - ///Variables for showing up in various places - var/usable = FALSE //Is it used in-game? - var/roundstart = TRUE /// Whether this squad can be picked at roundstart - var/locked = FALSE //Is it available for squad management? - var/active = FALSE //Is it visible in overwatch? - var/faction = FACTION_MARINE //What faction runs the squad? - - ///Squad Type Specifics + /// Squad headsets default radio frequency + var/radio_freq = 1461 + + /// Whether this squad can be used by marines + var/usable = FALSE + /// Whether this squad can be picked at roundstart + var/roundstart = TRUE + // Whether the squad is available for squad management + var/locked = FALSE + /// Whether it is visible in overwatch + var/active = FALSE + /// Which faction the squad is in + var/faction = FACTION_MARINE + + /// What will the assistant squad leader be called var/squad_type = "Squad" //Referenced for aSL details. Squad/Team/Cell etc. + /// Squad leaders icon var/lead_icon //Referenced for SL's 'L' icon. If nulled, won't override icon for aSLs. //vvv Do not set these in squad defines @@ -96,35 +118,40 @@ /datum/squad/marine/alpha name = SQUAD_MARINE_1 - color = 1 + equipment_color = "#e61919" + chat_color = "#e67d7d" access = list(ACCESS_MARINE_ALPHA) radio_freq = ALPHA_FREQ minimap_color = MINIMAP_SQUAD_ALPHA /datum/squad/marine/bravo name = SQUAD_MARINE_2 - color = 2 + equipment_color = "#ffc32d" + chat_color = "#ffe650" access = list(ACCESS_MARINE_BRAVO) radio_freq = BRAVO_FREQ minimap_color = MINIMAP_SQUAD_BRAVO /datum/squad/marine/charlie name = SQUAD_MARINE_3 - color = 3 + equipment_color = "#c864c8" + chat_color = "#ff96ff" access = list(ACCESS_MARINE_CHARLIE) radio_freq = CHARLIE_FREQ minimap_color = MINIMAP_SQUAD_CHARLIE /datum/squad/marine/delta name = SQUAD_MARINE_4 - color = 4 + equipment_color = "#4148c8" + chat_color = "#828cff" access = list(ACCESS_MARINE_DELTA) radio_freq = DELTA_FREQ minimap_color = MINIMAP_SQUAD_DELTA /datum/squad/marine/echo name = SQUAD_MARINE_5 - color = 5 + equipment_color = "#67d692" + chat_color = "#67d692" access = list(ACCESS_MARINE_ALPHA, ACCESS_MARINE_BRAVO, ACCESS_MARINE_CHARLIE, ACCESS_MARINE_DELTA) radio_freq = ECHO_FREQ omni_squad_vendor = TRUE @@ -136,7 +163,8 @@ /datum/squad/marine/cryo name = SQUAD_MARINE_CRYO - color = 6 + equipment_color = "#c47a50" + chat_color = "#c47a50" access = list(ACCESS_MARINE_ALPHA, ACCESS_MARINE_BRAVO, ACCESS_MARINE_CHARLIE, ACCESS_MARINE_DELTA) minimap_color = MINIMAP_SQUAD_FOXTROT @@ -149,7 +177,8 @@ /datum/squad/marine/sof name = SQUAD_SOF - color = 7 + equipment_color = "#400000" + chat_color = "#400000" radio_freq = SOF_FREQ squad_type = "Team" lead_icon = "soctl" @@ -168,23 +197,28 @@ /datum/squad/upp/one name = "UPPS1" - color = 1 + equipment_color = "#e61919" + chat_color = "#e67d7d" /datum/squad/upp/twp name = "UPPS2" - color = 2 + equipment_color = "#ffc32d" + chat_color = "#ffe650" /datum/squad/upp/three name = "UPPS3" - color = 3 + equipment_color = "#c864c8" + chat_color = "#ff96ff" /datum/squad/upp/four name = "UPPS4" - color = 4 + equipment_color = "#4148c8" + chat_color = "#828cff" /datum/squad/upp/kdo name = "UPPKdo" - color = 6 + equipment_color = "#c47a50" + chat_color = "#c47a50" squad_type = "Team" locked = TRUE //############################### @@ -197,11 +231,13 @@ /datum/squad/pmc/one name = "Team Upsilon" - color = 3 + equipment_color = "#c864c8" + chat_color = "#ff96ff" /datum/squad/pmc/two name = "Team Gamma" - color = 6 + equipment_color = "#c47a50" + chat_color = "#c47a50" /datum/squad/pmc/wo name = "Taskforce White" @@ -331,7 +367,7 @@ /// Displays a message to squad members directly on the game map /datum/squad/proc/send_maptext(text = "", title_text = "", only_leader = 0) - var/message_colour = squad_colors_chat[color] + var/message_colour = chat_color if(only_leader) if(squad_leader) var/mob/living/carbon/human/SL = squad_leader diff --git a/code/game/machinery/ARES/ARES.dm b/code/game/machinery/ARES/ARES.dm index f8a7351d123e..de4140ef1b81 100644 --- a/code/game/machinery/ARES/ARES.dm +++ b/code/game/machinery/ARES/ARES.dm @@ -137,7 +137,7 @@ /// The current deleted chat log of 1:1 conversations being read. var/list/deleted_1to1 = list() - /// Holds all (/datum/ares_record/announcement)s and (/datum/ares_record/security/security_alert)s + /// Holds all (/datum/ares_record/announcement)s var/list/records_announcement = list() /// Holds all (/datum/ares_record/bioscan)s var/list/records_bioscan = list() @@ -151,8 +151,8 @@ var/list/records_asrs = list() /// Holds all (/datum/ares_record/security)s and (/datum/ares_record/antiair)s var/list/records_security = list() - /// Is nuke request usable or not? (Nuke request is not currently coded to work.) - var/nuke_available = FALSE + /// Is nuke request usable or not? + var/nuke_available = TRUE COOLDOWN_DECLARE(ares_distress_cooldown) diff --git a/code/game/machinery/ARES/ARES_procs.dm b/code/game/machinery/ARES/ARES_procs.dm index 8b5f77fa6d84..c78a0131b7f1 100644 --- a/code/game/machinery/ARES/ARES_procs.dm +++ b/code/game/machinery/ARES/ARES_procs.dm @@ -223,7 +223,7 @@ GLOBAL_LIST_INIT(maintenance_categories, list( data["records_announcement"] = logged_announcements var/list/logged_alerts = list() - for(var/datum/ares_record/security/security_alert as anything in records_announcement) + for(var/datum/ares_record/security/security_alert as anything in records_security) if(!istype(security_alert)) continue var/list/current_alert = list() @@ -457,6 +457,10 @@ GLOBAL_LIST_INIT(maintenance_categories, list( new_title = "[record.title] at [record.time]" new_details = record.details records_announcement -= record + if(ARES_RECORD_SECURITY) + new_title = "[record.title] at [record.time]" + new_details = record.details + records_security -= record if(ARES_RECORD_BIOSCAN) new_title = "[record.title] at [record.time]" new_details = record.details @@ -576,15 +580,22 @@ GLOBAL_LIST_INIT(maintenance_categories, list( playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) return FALSE if(security_level == SEC_LEVEL_DELTA || SSticker.mode.is_in_endgame) - to_chat(usr, SPAN_WARNING("The mission has failed catastrophically, what do you want a nuke for!")) + to_chat(usr, SPAN_WARNING("The mission has failed catastrophically, what do you want a nuke for?!")) playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) return FALSE - + var/reason = tgui_input_text(usr, "Please enter reason nuclear ordnance is required.", "Reason for Nuclear Ordnance") + if(!reason) + return FALSE for(var/client/admin in GLOB.admins) if((R_ADMIN|R_MOD) & admin.admin_holder.rights) playsound_client(admin,'sound/effects/sos-morse-code.ogg',10) - message_admins("[key_name(usr)] has requested use of Nuclear Ordnance (via ARES)! [CC_MARK(usr)] (APPROVE) (DENY) [ADMIN_JMP_USER(usr)] [CC_REPLY(usr)]") - to_chat(usr, SPAN_NOTICE("A nuclear ordnance request has been sent to USCM High Command.")) + message_admins("[key_name(usr)] has requested use of Nuclear Ordnance (via ARES)! Reason: [reason] [CC_MARK(usr)] (APPROVE) (DENY) [ADMIN_JMP_USER(usr)] [CC_REPLY(usr)]") + to_chat(usr, SPAN_NOTICE("A nuclear ordnance request has been sent to USCM High Command for the following reason: [reason]")) + if(ares_can_log()) + link.log_ares_security("Nuclear Ordnance Request", "[last_login] has sent a request for nuclear ordnance for the following reason: [reason]") + if(ares_can_interface()) + ai_silent_announcement("[last_login] has sent a request for nuclear ordnance to USCM High Command.", ".V") + ai_silent_announcement("Reason given: [reason].", ".V") COOLDOWN_START(src, ares_nuclear_cooldown, COOLDOWN_COMM_DESTRUCT) return TRUE // ------ End ARES Interface UI ------ // diff --git a/code/game/machinery/nuclearbomb.dm b/code/game/machinery/nuclearbomb.dm index 6c0ec4cc0389..743f53e4f03b 100644 --- a/code/game/machinery/nuclearbomb.dm +++ b/code/game/machinery/nuclearbomb.dm @@ -12,7 +12,7 @@ var/bomb_set = FALSE var/timing = FALSE var/deployable = FALSE var/explosion_time = null - var/timeleft = 4800 + var/timeleft = 8 MINUTES var/safety = TRUE var/being_used = FALSE var/end_round = TRUE @@ -152,6 +152,7 @@ var/bomb_set = FALSE data["command_lockout"] = command_lockout data["allowed"] = allowed data["being_used"] = being_used + data["decryption_complete"] = TRUE //this is overriden by techweb nuke UI_data later, this just makes it default to true return data diff --git a/code/game/machinery/telecomms/presets.dm b/code/game/machinery/telecomms/presets.dm index a25293aebbd3..c56360953650 100644 --- a/code/game/machinery/telecomms/presets.dm +++ b/code/game/machinery/telecomms/presets.dm @@ -50,7 +50,7 @@ . = ..() if(z) - SSminimaps.add_marker(src, z, MINIMAP_FLAG_USCM, "supply") + SSminimaps.add_marker(src, z, MINIMAP_FLAG_ALL, "supply") // doesn't need power, instead uses health /obj/structure/machinery/telecomms/relay/preset/tower/inoperable(additional_flags) diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm index 3d39479167b0..05784ec3c161 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm @@ -24,7 +24,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_engi, list( list("Laser Designator", 15, /obj/item/device/binoculars/range/designator, null, VENDOR_ITEM_REGULAR), list("Sandbags x25", 10, /obj/item/stack/sandbags_empty/half, null, VENDOR_ITEM_RECOMMENDED), list("Super-Capacity Power Cell", 10, /obj/item/cell/super, null, VENDOR_ITEM_REGULAR), - list("Welding Goggles", 5, /obj/item/clothing/glasses/welding, null, VENDOR_ITEM_MANDATORY), + list("Welding Goggles", 5, /obj/item/clothing/glasses/welding, null, VENDOR_ITEM_REGULAR), list("ES-11 Mobile Fuel Canister", 4, /obj/item/tool/weldpack/minitank, null, VENDOR_ITEM_REGULAR), list("EXPLOSIVES", 0, null, null, null), diff --git a/code/game/objects/effects/landmarks/corpsespawner.dm b/code/game/objects/effects/landmarks/corpsespawner.dm index 8350e68d66a3..bcedcb85f47e 100644 --- a/code/game/objects/effects/landmarks/corpsespawner.dm +++ b/code/game/objects/effects/landmarks/corpsespawner.dm @@ -201,3 +201,9 @@ /obj/effect/landmark/corpsespawner/gladiator/burst name = "Burst Gladiator" equip_path = /datum/equipment_preset/corpse/gladiator/burst + +//FORECON + +/obj/effect/landmark/corpsespawner/forecon_spotter + name = "USCM Reconnaissance Spotter" + equip_path = /datum/equipment_preset/corpse/forecon_spotter diff --git a/code/game/objects/effects/landmarks/survivor_spawner.dm b/code/game/objects/effects/landmarks/survivor_spawner.dm index b7a2e11fb0aa..eba13a41c89d 100644 --- a/code/game/objects/effects/landmarks/survivor_spawner.dm +++ b/code/game/objects/effects/landmarks/survivor_spawner.dm @@ -132,8 +132,8 @@ equipment = /datum/equipment_preset/survivor/forecon/smartgunner spawn_priority = SPAWN_PRIORITY_MEDIUM -/obj/effect/landmark/survivor_spawner/lv522_forecon_grenadier - equipment = /datum/equipment_preset/survivor/forecon/grenadier +/obj/effect/landmark/survivor_spawner/lv522_forecon_sniper + equipment = /datum/equipment_preset/survivor/forecon/sniper spawn_priority = SPAWN_PRIORITY_MEDIUM /obj/effect/landmark/survivor_spawner/lv522_forecon_squad_leader diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm index 6a01dfdba9da..c6da7d354054 100644 --- a/code/game/objects/items/devices/megaphone.dm +++ b/code/game/objects/items/devices/megaphone.dm @@ -28,6 +28,11 @@ var/message = tgui_input_text(user, "Shout a message?", "Megaphone", multiline = TRUE) if(!message) return + // we know user is a human now, so adjust user for this check + var/mob/living/carbon/human/humanoid = user + if(humanoid.speech_problem_flag) + var/list/new_message = humanoid.handle_speech_problems(message) + message = new_message[1] message = capitalize(message) log_admin("[key_name(user)] used a megaphone to say: >[message]<") diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm index d45b4e8b8212..9fa85f03b9b1 100644 --- a/code/game/objects/items/devices/radio/encryptionkey.dm +++ b/code/game/objects/items/devices/radio/encryptionkey.dm @@ -215,6 +215,11 @@ icon_state = "binary_key" channels = list(RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_INTEL = TRUE, RADIO_CHANNEL_JTAC = TRUE, SQUAD_MARINE_1 = FALSE, SQUAD_MARINE_2 = FALSE, SQUAD_MARINE_3 = FALSE, SQUAD_MARINE_4 = FALSE, SQUAD_MARINE_5 = FALSE, SQUAD_MARINE_CRYO = FALSE) +/obj/item/device/encryptionkey/soc/forecon + name = "\improper SOF Radio Encryption Key" + icon_state = "binary_key" + channels = list(RADIO_CHANNEL_COLONY= TRUE) + //ERT, PMC /obj/item/device/encryptionkey/dutch diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index c3b1eee806c5..0bd0fae364e5 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -1002,6 +1002,17 @@ volume = RADIO_VOLUME_IMPORTANT ignore_z = TRUE +/obj/item/device/radio/headset/almayer/sof/survivor_forecon + name = "USCM SOF headset" + desc = "Issued exclusively to Marine Raiders and members of the USCM's Force Reconnaissance." + icon_state = "soc_headset" + frequency = SOF_FREQ + initial_keys = list(/obj/item/device/encryptionkey/soc/forecon) + volume = RADIO_VOLUME_QUIET + ignore_z = FALSE + has_hud = TRUE + hud_type = MOB_HUD_FACTION_USCM + /obj/item/device/radio/headset/almayer/mcom/vc name = "marine vehicle crew radio headset" desc = "Used by USCM vehicle crew, features a non-standard brace. Channels are as follows: :v - marine command, :n - engineering, :m - medbay, :u - requisitions" diff --git a/code/game/objects/items/reagent_containers/food.dm b/code/game/objects/items/reagent_containers/food.dm index 13dfcac84ff8..ded1b90b106f 100644 --- a/code/game/objects/items/reagent_containers/food.dm +++ b/code/game/objects/items/reagent_containers/food.dm @@ -2,6 +2,10 @@ /// Food. //////////////////////////////////////////////////////////////////////////////// /obj/item/reagent_container/food + item_icons = list( + WEAR_L_HAND = 'icons/mob/humans/onmob/items_lefthand_1.dmi', + WEAR_R_HAND = 'icons/mob/humans/onmob/items_righthand_1.dmi' + ) possible_transfer_amounts = null volume = 50 //Sets the default container amount for all food items. flags_atom = CAN_BE_SYRINGED diff --git a/code/game/objects/items/reagent_containers/food/fish_snacks.dm b/code/game/objects/items/reagent_containers/food/fish_snacks.dm index 9e9dcb1b8017..ba4a3c05fb0f 100644 --- a/code/game/objects/items/reagent_containers/food/fish_snacks.dm +++ b/code/game/objects/items/reagent_containers/food/fish_snacks.dm @@ -13,7 +13,7 @@ var/gut_icon_state = null var/gut_time = 3 var/initial_desc = "" - var/list/guttable_atoms = list(/obj/item/reagent_container/food/snacks/meat, /obj/item/reagent_container/food/snacks/meat/syntiflesh)//placeholders, for now + var/list/guttable_atoms = list(/obj/item/reagent_container/food/snacks/meat, /obj/item/reagent_container/food/snacks/meat/synthmeat)//placeholders, for now var/base_gut_meat = /obj/item/reagent_container/food/snacks/meat //slice_path = null// //slices_num diff --git a/code/game/objects/items/reagent_containers/food/snacks/meat.dm b/code/game/objects/items/reagent_containers/food/snacks/meat.dm index 0174af8520d2..f459d1b169ae 100644 --- a/code/game/objects/items/reagent_containers/food/snacks/meat.dm +++ b/code/game/objects/items/reagent_containers/food/snacks/meat.dm @@ -24,10 +24,20 @@ else ..() -/obj/item/reagent_container/food/snacks/meat/syntiflesh +/obj/item/reagent_container/food/snacks/meat/synthmeat name = "synthetic meat" desc = "A synthetic slab of flesh." +/obj/item/reagent_container/food/snacks/meat/synthmeat/synthflesh //meat made from synthetics. Slightly toxic + name = "synthetic flesh" + desc = "A slab of artificial, inorganic 'flesh' that resembles human meat. Probably came from a synth." + icon_state = "synthmeat" + filling_color = "#ffffff" + +/obj/item/reagent_container/food/snacks/meat/synthmeat/synthetic/Initialize() + . = ..() + reagents.add_reagent("pacid", 1.5) + /obj/item/reagent_container/food/snacks/meat/human name = "human meat" desc = "A slab of flesh for cannibals." diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 6e8b00fc48e8..290460da758f 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -3,6 +3,10 @@ desc = "Can hold various things." icon = 'icons/obj/items/clothing/belts.dmi' icon_state = "utilitybelt" + item_icons = list( + WEAR_L_HAND = 'icons/mob/humans/onmob/items_lefthand_1.dmi', + WEAR_R_HAND = 'icons/mob/humans/onmob/items_righthand_1.dmi' + ) item_state = "utility" flags_equip_slot = SLOT_WAIST attack_verb = list("whipped", "lashed", "disciplined") diff --git a/code/game/objects/items/tools/misc_tools.dm b/code/game/objects/items/tools/misc_tools.dm index 1bcebd9f1ea3..505006285881 100644 --- a/code/game/objects/items/tools/misc_tools.dm +++ b/code/game/objects/items/tools/misc_tools.dm @@ -276,13 +276,29 @@ pen_colour = "white" /obj/item/tool/pen/fountain - desc = "A luxurious fountain pen, embossed with gold accents. Its intricate mechanics allow the user to switch between various ink colors with a simple twist." + desc = "A lavish testament to the ingenuity of ARMAT's craftsmanship, this fountain pen is a paragon of design and functionality. Detailed with golden accents and intricate mechanics, the pen allows for a swift change between a myriad of ink colors with a simple twist. A product of precision engineering, each mechanism inside the pen is designed to provide a seamless, effortless transition from one color to the next, creating an instrument of luxurious versatility." + desc_lore = "More than just a tool for writing, ARMAT's fountain pen is a symbol of distinction and authority within the ranks of the United States Colonial Marine Corps (USCM). It is a legacy item, exclusively handed out to the top-tier command personnel, each pen a tribute to the recipient's leadership and dedication.\n \nARMAT, renowned for their weapons technology, took a different approach in crafting this piece. The fountain pen, though seemingly a departure from their usual field, is deeply ingrained with the company's engineering philosophy, embodying precision, functionality, and robustness.\n \nThe golden accents are not mere embellishments; they're an identifier, setting apart these pens and their owners from the rest. The gold is meticulously alloyed with a durable metallic substance, granting it resilience to daily wear and tear. Such resilience is symbolic of the tenacity and perseverance required of USCM command personnel.\n \nEach pen is equipped with an intricate color changing mechanism, allowing the user to switch between various ink colors. This feature, inspired by the advanced targeting systems of ARMAT's weaponry, uses miniaturized actuators and precision-ground components to smoothly transition the ink flow. A simple twist of the pen's body activates the change, rotating the internal ink cartridges into place with mechanical grace, ready for the user's command.\n \nThe ink colors are not chosen arbitrarily. Each represents a different echelon within the USCM, allowing the pen's owner to write in the hue that corresponds with their rank or the rank of the recipient of their written orders. This acts as a silent testament to the authority of their words, as if each stroke of the pen echoes through the halls of USCM authority.\n \nDespite its ornate appearance, the pen is as robust as any ARMAT weapon, reflecting the company's commitment to reliability and durability. The metal components are corrosion-resistant, ensuring the pen's longevity, even under the challenging conditions often faced by USCM high command.\n \nThe fusion of luxury and utility, the blend of gold and metal, is an embodiment of the hard-won elegance of command, of the fusion between power and grace. It's more than a writing instrument - it's an emblem of leadership, an accolade to the dedication and strength of those who bear it. ARMAT's fountain pen stands as a monument to the precision, integrity, and courage embodied by the USCM's highest-ranking officers." name = "fountain pen" icon_state = "fountain_pen" item_state = "fountain_pen" matter = list("metal" = 20, "gold" = 10) var/static/list/colour_list = list("red", "blue", "green", "yellow", "purple", "pink", "brown", "black", "orange") // Can add more colors as required var/current_colour_index = 1 + var/owner = "hard to read text" + +/obj/item/tool/pen/fountain/Initialize(mapload, mob/living/carbon/human/user) + . = ..() + var/turf/current_turf = get_turf(src) + var/mob/living/carbon/human/new_owner = locate() in current_turf + if(new_owner) + owner = new_owner.real_name + var/obj/structure/machinery/cryopod/new_owners_pod = locate() in current_turf + if(new_owners_pod) + owner = new_owners_pod.occupant?.real_name + +/obj/item/tool/pen/fountain/get_examine_text(mob/user) + . = ..() + . += "There's a laser engraving of [owner] on it." /obj/item/tool/pen/fountain/attack_self(mob/living/carbon/human/user) if(on) diff --git a/code/game/objects/structures/props.dm b/code/game/objects/structures/props.dm index 1a91650c620a..c71f9b227668 100644 --- a/code/game/objects/structures/props.dm +++ b/code/game/objects/structures/props.dm @@ -837,8 +837,8 @@ icon_state = "van" bound_height = 64 bound_width = 64 - unslashable = TRUE - unacidable = TRUE + unslashable = FALSE + unacidable = FALSE /obj/structure/prop/vehicles/crawler name = "colony crawler" @@ -1144,3 +1144,11 @@ /obj/structure/prop/wooden_cross/update_icon() if(tagged) overlays += mutable_appearance('icons/obj/structures/props/crosses.dmi', "cross_overlay") + + +/obj/structure/prop/invuln/rope + name = "rope" + desc = "A secure rope looks like someone might've been hiding out on those rocks." + icon = 'icons/obj/structures/props/almayer_props.dmi' + icon_state = "rope" + density = FALSE diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm index b760340004f5..350d6047b2a4 100644 --- a/code/game/supplyshuttle.dm +++ b/code/game/supplyshuttle.dm @@ -191,11 +191,11 @@ var/datum/controller/supply/supply_controller = new() var/list/data = list() var/list/squad_list = list() - for(var/datum/squad/S in RoleAuthority.squads) - if(S.active && S.faction == faction && S.color) + for(var/datum/squad/current_squad in RoleAuthority.squads) + if(current_squad.active && current_squad.faction == faction && current_squad.equipment_color) squad_list += list(list( - "squad_name" = S.name, - "squad_color" = squad_colors[S.color] + "squad_name" = current_squad.name, + "squad_color" = current_squad.equipment_color )) data["can_pick_squad"] = can_pick_squad diff --git a/code/game/world.dm b/code/game/world.dm index d6ddd1fa41f6..25cd609646da 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -39,7 +39,6 @@ var/list/reboot_sfx = file2list("config/reboot_sfx.txt") GLOB.changelog_hash = fexists(latest_changelog) ? md5(latest_changelog) : 0 //for telling if the changelog has changed recently initialize_tgs() - initialize_marine_armor() #ifdef UNIT_TESTS GLOB.test_log = "data/logs/tests.log" diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 6154bb4f8c32..20ff65ed144e 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -191,6 +191,7 @@ var/list/admin_verbs_debug = list( /client/proc/restart_controller, /client/proc/debug_controller, /client/proc/cmd_debug_toggle_should_check_for_win, + /client/proc/cmd_debug_mass_screenshot, /client/proc/enable_debug_verbs, /client/proc/toggledebuglogs, /client/proc/togglenichelogs, diff --git a/code/modules/admin/tabs/event_tab.dm b/code/modules/admin/tabs/event_tab.dm index 89d709cbdda3..b9eb4fd47ea1 100644 --- a/code/modules/admin/tabs/event_tab.dm +++ b/code/modules/admin/tabs/event_tab.dm @@ -402,6 +402,29 @@ give_jelly_award(last_hive_checked, as_admin=TRUE) +/client/proc/give_nuke() + if(!check_rights(R_ADMIN)) + return + var/nuketype = "Decrypted Operational Nuke" + var/encrypt = tgui_alert(src, "Do you want the nuke to be already decrypted?", "Nuke Type", list("Encrypted", "Decrypted"), 20 SECONDS) + if(encrypt == "Encrypted") + nuketype = "Encrypted Operational Nuke" + var/prompt = tgui_alert(src, "THIS CAN BE USED TO END THE ROUND. Are you sure you want to spawn a nuke? The nuke will be put onto the ASRS Lift.", "DEFCON 1", list("No", "Yes"), 30 SECONDS) + if(prompt != "Yes") + return + + var/datum/supply_order/new_order = new() + new_order.ordernum = supply_controller.ordernum + supply_controller.ordernum++ + new_order.object = supply_controller.supply_packs[nuketype] + new_order.orderedby = MAIN_AI_SYSTEM + new_order.approvedby = MAIN_AI_SYSTEM + supply_controller.shoppinglist += new_order + + marine_announcement("A nuclear device has been supplied and will be delivered to requisitions via ASRS.", "NUCLEAR ARSENAL ACQUIRED", 'sound/misc/notice2.ogg') + message_admins("[key_name_admin(usr)] admin-spawned a [encrypt] nuke.") + log_game("[key_name_admin(usr)] admin-spawned a [encrypt] nuke.") + /client/proc/turn_everyone_into_primitives() var/random_names = FALSE if (alert(src, "Do you want to give everyone random numbered names?", "Confirmation", "Yes", "No") == "Yes") @@ -684,6 +707,7 @@ Misc
Award a medal
Award a royal jelly
+ Spawn a nuke
Toggle PMC gun restrictions
Turn everyone into monkies

diff --git a/code/modules/admin/topic/topic.dm b/code/modules/admin/topic/topic.dm index 010802318fbe..a76be10e9c26 100644 --- a/code/modules/admin/topic/topic.dm +++ b/code/modules/admin/topic/topic.dm @@ -982,7 +982,7 @@ message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Observer.)", 1) else if(href_list["revive"]) - if(!check_rights(R_MOD)) + if(!check_rights(R_MOD)) return var/mob/living/L = locate(href_list["revive"]) @@ -1926,6 +1926,42 @@ log_game("[key_name_admin(usr)] has granted self-destruct, requested by [key_name_admin(ref_person)]") message_admins("[key_name_admin(usr)] has granted self-destruct, requested by [key_name_admin(ref_person)]", 1) + if(href_list["nukeapprove"]) + var/mob/ref_person = locate(href_list["nukeapprove"]) + if(!istype(ref_person)) + return FALSE + var/nuketype = "Encrypted Operational Nuke" + var/prompt = tgui_alert(usr, "Do you want the nuke to be Encrypted?", "Nuke Type", list("Encrypted", "Decrypted"), 20 SECONDS) + if(prompt == "Decrypted") + nuketype = "Decrypted Operational Nuke" + prompt = tgui_alert(usr, "Are you sure you want to authorize a [nuketype] to the marines? This will greatly affect the round!", "DEFCON 1", list("No", "Yes")) + if(prompt != "Yes") + return + + //make ASRS order for nuke + var/datum/supply_order/new_order = new() + new_order.ordernum = supply_controller.ordernum + supply_controller.ordernum++ + new_order.object = supply_controller.supply_packs[nuketype] + new_order.orderedby = ref_person + new_order.approvedby = "USCM High Command" + supply_controller.shoppinglist += new_order + + //Can no longer request a nuke + GLOB.ares_link.interface.nuke_available = FALSE + + marine_announcement("A nuclear device has been authorized by High Command and will be delivered to requisitions via ASRS.", "NUCLEAR ORDNANCE AUTHORIZED", 'sound/misc/notice2.ogg', logging = ARES_LOG_MAIN) + log_game("[key_name_admin(usr)] has authorized a [nuketype], requested by [key_name_admin(ref_person)]") + message_admins("[key_name_admin(usr)] has authorized a [nuketype], requested by [key_name_admin(ref_person)]") + + if(href_list["nukedeny"]) + var/mob/ref_person = locate(href_list["nukedeny"]) + if(!istype(ref_person)) + return FALSE + marine_announcement("Your request for nuclear ordnance deployment has been reviewed and denied by USCM High Command for operational security and colonial preservation reasons. Have a good day.", "NUCLEAR ORDNANCE DENIED", 'sound/misc/notice2.ogg', logging = ARES_LOG_MAIN) + log_game("[key_name_admin(usr)] has denied nuclear ordnance, requested by [key_name_admin(ref_person)]") + message_admins("[key_name_admin(usr)] has dnied nuclear ordnance, requested by [key_name_admin(ref_person)]") + if(href_list["sddeny"]) // CentComm-deny. The self-destruct is denied, without any further conditions var/mob/ref_person = locate(href_list["sddeny"]) marine_announcement("The self-destruct request has not received a response, ARES is now recalculating statistics.", "Self-Destruct System", logging = ARES_LOG_SECURITY) diff --git a/code/modules/admin/topic/topic_events.dm b/code/modules/admin/topic/topic_events.dm index 1055d5e47879..3240bf947938 100644 --- a/code/modules/admin/topic/topic_events.dm +++ b/code/modules/admin/topic/topic_events.dm @@ -22,6 +22,8 @@ owner.award_medal() if("jelly") owner.award_jelly() + if("nuke") + owner.give_nuke() if("pmcguns") owner.toggle_gun_restrictions() if("monkify") diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 8a017446858d..6be6b14e0247 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -92,7 +92,74 @@ else message_admins("[key_name(src)] disabled checking for round-end.") +/client/proc/cmd_debug_mass_screenshot() + set category = "Debug" + set name = "Mass Screenshot" + set background = TRUE + set waitfor = FALSE + + if(!check_rights(R_MOD)) + return + if(tgui_alert(usr, "Are you sure you want to mass screenshot this z-level? Ensure your visual settings are correct first (other ghost visibility, zoom level, etc.) and you have emptied your BYOND/screenshots folder.", "Mass Screenshot", list("Yes", "No")) != "Yes") + return + + var/sleep_duration = tgui_input_number(usr, "Enter a delay in deciseconds between screenshots to allow the client to render changes.", "Screenshot delay", 2, 10, 1, 0, TRUE) + if(!sleep_duration) + return + + if(!mob) + return + + if(!isobserver(mob)) + admin_ghost() + + mob.alpha = 0 + if(mob.hud_used) + mob.hud_used.show_hud(HUD_STYLE_NOHUD) + mob.animate_movement = NO_STEPS + + message_admins(WRAP_STAFF_LOG(usr, "started a mass screenshot operation.")) + + var/half_chunk_size = view + 1 + var/chunk_size = half_chunk_size * 2 - 1 + var/cur_x = half_chunk_size + var/cur_y = half_chunk_size + var/cur_z = mob.z + var/width + var/height + if(istype(SSmapping.z_list[cur_z], /datum/space_level)) + var/datum/space_level/cur_level = SSmapping.z_list[cur_z] + width = cur_level.x_bounds - half_chunk_size + 2 + height = cur_level.y_bounds - half_chunk_size + 2 + else + width = world.maxx - half_chunk_size + 2 + height = world.maxy - half_chunk_size + 2 + var/width_inside = width - 1 + var/height_inside = height - 1 + + while(cur_y < height) + while(cur_x < width) + mob.on_mob_jump() + mob.forceMove(locate(cur_x, cur_y, cur_z)) + sleep(sleep_duration) + winset(src, null, "command='.screenshot auto'") + if(cur_x == width_inside) + break + cur_x += chunk_size + cur_x = min(cur_x, width_inside) + if(cur_y == height_inside) + break + cur_x = half_chunk_size + cur_y += chunk_size + cur_y = min(cur_y, height_inside) + + mob.alpha = initial(mob.alpha) + if(mob.hud_used) + mob.hud_used.show_hud(HUD_STYLE_STANDARD) + mob.animate_movement = SLIDE_STEPS // Initial is incorrect + + to_chat(usr, "Provide these values when asked for the MapTileImageTool: [width] [height] [half_chunk_size] [world.icon_size]") //TODO: merge the vievars version into this or something maybe mayhaps /client/proc/cmd_debug_del_all() diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm index 4ca05fe8a93c..e00f4a2d1263 100644 --- a/code/modules/asset_cache/asset_list_items.dm +++ b/code/modules/asset_cache/asset_list_items.dm @@ -271,7 +271,6 @@ /datum/asset/spritesheet/ranks/register() var/icon_file = 'icons/mob/hud/marine_hud.dmi' - var/list/squads = list("Alpha", "Bravo", "Charlie", "Delta", "Foxtrot", "Cryo") var/list/icon_data = list( list("Mar", null), @@ -284,10 +283,8 @@ list("SL", "hudsquad_leader"), ) - var/i - for(i = 1; i < length(squads); i++) - var/squad = squads[i] - var/color = squad_colors[i] + for(var/datum/squad/marine/squad in RoleAuthority.squads) + var/color = squad.equipment_color for(var/iref in icon_data) var/list/iconref = iref var/icon/background = icon('icons/mob/hud/marine_hud.dmi', "hudsquad", SOUTH) diff --git a/code/modules/clothing/gloves/marine_gloves.dm b/code/modules/clothing/gloves/marine_gloves.dm index bbddc1f10bb7..04d0b2f1c0cb 100644 --- a/code/modules/clothing/gloves/marine_gloves.dm +++ b/code/modules/clothing/gloves/marine_gloves.dm @@ -22,11 +22,17 @@ armor_rad = CLOTHING_ARMOR_NONE armor_internaldamage = CLOTHING_ARMOR_LOW var/adopts_squad_color = TRUE + /// The dmi where the grayscale squad overlays are contained + var/squad_overlay_icon = 'icons/mob/humans/onmob/hands_garb.dmi' -/obj/item/clothing/gloves/marine/get_mob_overlay(mob/living/carbon/human/H, slot) +/obj/item/clothing/gloves/marine/get_mob_overlay(mob/living/carbon/human/current_human, slot) var/image/ret = ..() - if(adopts_squad_color && slot == WEAR_HANDS && istype(H) && H.assigned_squad) - ret.overlays += glovemarkings[H.assigned_squad.color] + if(!adopts_squad_color || !(current_human.assigned_squad && current_human.assigned_squad.equipment_color)) + return ret + var/image/glove_overlay = image(squad_overlay_icon, icon_state = "std-gloves") + glove_overlay.alpha = current_human.assigned_squad.armor_alpha + glove_overlay.color = current_human.assigned_squad.equipment_color + ret.overlays += glove_overlay return ret /obj/item/clothing/gloves/marine/insulated diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 1b66d3e1bf5f..0181d239c574 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -360,7 +360,7 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( var/flags_marine_helmet = HELMET_SQUAD_OVERLAY|HELMET_GARB_OVERLAY|HELMET_DAMAGE_OVERLAY var/helmet_bash_cooldown = 0 - var/specialty = "M10 pattern marine" //Give them a specialty var so that they show up correctly in vendors. + var/specialty = "M10 pattern marine" //Give them a specialty var so that they show up correctly in vendors. speciality does NOTHING if you have NO_NAME_OVERRIDE. valid_accessory_slots = list(ACCESSORY_SLOT_HELM_C) restricted_accessory_slots = list(ACCESSORY_SLOT_HELM_C) item_icons = list( @@ -372,8 +372,8 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( var/storage_slots_reserved_for_garb = 1 var/storage_max_w_class = SIZE_TINY // can hold tiny items only, EXCEPT for glasses & metal flask. var/storage_max_storage_space = 4 - - //speciality does NOTHING if you have NO_NAME_OVERRIDE + /// The dmi where the grayscale squad overlays are contained + var/helmet_overlay_icon = 'icons/mob/humans/onmob/head_1.dmi' /obj/item/clothing/head/helmet/marine/New(loc, new_protection[] = list(MAP_ICE_COLONY = ICE_PLANET_MIN_COLD_PROT)) diff --git a/code/modules/clothing/suits/marine_armor.dm b/code/modules/clothing/suits/marine_armor.dm index c6a2f7fcc32b..713b6df355c2 100644 --- a/code/modules/clothing/suits/marine_armor.dm +++ b/code/modules/clothing/suits/marine_armor.dm @@ -28,44 +28,6 @@ #define SOF 7 #define NOSQUAD 8 -var/list/armormarkings = list() -var/list/armormarkings_sql = list() -var/list/helmetmarkings = list() -var/list/helmetmarkings_sql = list() -var/list/glovemarkings = list() -var/list/squad_colors = list(rgb(230,25,25), rgb(255,195,45), rgb(200,100,200), rgb(65,72,200), rgb(103,214,146), rgb(196, 122, 80), rgb(64, 0, 0)) -var/list/squad_colors_chat = list(rgb(230,125,125), rgb(255,230,80), rgb(255,150,255), rgb(130,140,255), rgb(103,214,146), rgb(196, 122, 80), rgb(64, 0, 0)) - -/proc/initialize_marine_armor() - var/i - for(i=1, i<(length(squad_colors) + 1), i++) - var/squad_color = squad_colors[i] - var/armor_color = rgb(hex2num(copytext(squad_color, 2, 4)), hex2num(copytext(squad_color, 4, 6)), hex2num(copytext(squad_color, 6, 8)), 125) - - var/image/armor - var/image/helmet - var/image/glove - - armor = image('icons/mob/humans/onmob/suit_1.dmi',icon_state = "std-armor") - armor.color = armor_color - armormarkings += armor - armor = image('icons/mob/humans/onmob/suit_1.dmi',icon_state = "sql-armor") - armor.color = armor_color - armormarkings_sql += armor - - helmet = image('icons/mob/humans/onmob/head_1.dmi',icon_state = "std-helmet") - helmet.color = armor_color - helmetmarkings += helmet - helmet = image('icons/mob/humans/onmob/head_1.dmi',icon_state = "sql-helmet") - helmet.color = armor_color - helmetmarkings_sql += helmet - - glove = image('icons/mob/humans/onmob/hands_garb.dmi',icon_state = "std-gloves") - glove.color = armor_color - glovemarkings += glove - - - // MARINE STORAGE ARMOR /obj/item/clothing/suit/storage/marine @@ -122,7 +84,7 @@ var/list/squad_colors_chat = list(rgb(230,125,125), rgb(255,230,80), rgb(255,150 var/armor_overlays[] actions_types = list(/datum/action/item_action/toggle) var/flags_marine_armor = ARMOR_SQUAD_OVERLAY|ARMOR_LAMP_OVERLAY - var/specialty = "M3 pattern marine" //Same thing here. Give them a specialty so that they show up correctly in vendors. + var/specialty = "M3 pattern marine" //Same thing here. Give them a specialty so that they show up correctly in vendors. speciality does NOTHING if you have NO_NAME_OVERRIDE w_class = SIZE_HUGE uniform_restricted = list(/obj/item/clothing/under/marine) sprite_sheets = list(SPECIES_MONKEY = 'icons/mob/humans/species/monkeys/onmob/suit_monkey_1.dmi') @@ -132,7 +94,8 @@ var/list/squad_colors_chat = list(rgb(230,125,125), rgb(255,230,80), rgb(255,150 drop_sound = "armorequip" equip_sounds = list('sound/handling/putting_on_armor1.ogg') var/armor_variation = 0 - //speciality does NOTHING if you have NO_NAME_OVERRIDE + /// The dmi where the grayscale squad overlays are contained + var/squad_overlay_icon = 'icons/mob/humans/onmob/suit_1.dmi' /obj/item/clothing/suit/storage/marine/Initialize(mapload) . = ..() @@ -1030,6 +993,12 @@ var/list/squad_colors_chat = list(rgb(230,125,125), rgb(255,230,80), rgb(255,150 #undef FULL_CAMOUFLAGE_ALPHA +/obj/item/clothing/suit/storage/marine/ghillie/forecon + name = "UDEP Thermal Poncho" + desc = "UDEP or the Ultra Diffusive Environmental Poncho is a camouflaged rain-cover worn to protect against the elements and chemical spills. It's commonly treated with an infrared absorbing coating, making a marine almost invisible in the rain. Favoured by USCM specialists for it's comfort and practicality." + icon_state = "mercenary_miner_armor" + flags_atom = MOB_LOCK_ON_EQUIP|NO_SNOW_TYPE|NO_NAME_OVERRIDE + /obj/item/clothing/suit/storage/marine/sof name = "\improper SOF Armor" desc = "A heavily customized suit of M3 armor. Used by Marine Raiders." diff --git a/code/modules/clothing/suits/marine_coat.dm b/code/modules/clothing/suits/marine_coat.dm index 4442109ec425..3113b38e6e41 100644 --- a/code/modules/clothing/suits/marine_coat.dm +++ b/code/modules/clothing/suits/marine_coat.dm @@ -178,6 +178,11 @@ desc = "A Navy regulation dress blues coat for high-ranking officers. For those who wish for style and authority." icon_state = "co_suit" +/obj/item/clothing/suit/storage/jacket/marine/dress/officer/falcon + name = "commanding officer falcon jacket" + desc = "A refurbished jacket liner tailor made for a senior officer. This liner has become more of a proper piece of attire, with a new layer of fabric, wrist cuffs, front pockets, and a custom embroidered falcon on the back. This jacket will keep its wearer warm no matter the circumstance, from a cool Sunday drive to chilly autumn's eve." + icon_state = "co_falcon" + /obj/item/clothing/suit/storage/jacket/marine/dress/general name = "general's jacket" desc = "A black trench coat with gold metallic trim. Flashy, highly protective, and over-the-top. Fit for a king - or, in this case, a General. Has quite a few pockets." diff --git a/code/modules/cm_aliens/structures/tunnel.dm b/code/modules/cm_aliens/structures/tunnel.dm index f03e81ccc408..a5d623bff189 100644 --- a/code/modules/cm_aliens/structures/tunnel.dm +++ b/code/modules/cm_aliens/structures/tunnel.dm @@ -2,6 +2,8 @@ * Tunnels */ +#define TUNNEL_COLLAPSING_TIME (60 SECONDS) + /obj/structure/tunnel name = "tunnel" desc = "A tunnel entrance. Looks like it was dug by some kind of clawed beast." @@ -83,6 +85,25 @@ /obj/structure/tunnel/attackby(obj/item/W as obj, mob/user as mob) if(!isxeno(user)) + if(istype(W, /obj/item/tool/shovel)) + var/obj/item/tool/shovel/destroying_shovel = W + + if(destroying_shovel.folded) + return + + playsound(user.loc, 'sound/effects/thud.ogg', 40, 1, 6) + + user.visible_message(SPAN_NOTICE("[user] starts to collapse [src]!"), SPAN_NOTICE("You start collapsing [src]!")) + + if(user.action_busy || !do_after(user, TUNNEL_COLLAPSING_TIME * ((100 - destroying_shovel.shovelspeed) * 0.01), INTERRUPT_ALL, BUSY_ICON_BUILD)) + return + + playsound(loc, 'sound/effects/tunnel_collapse.ogg', 50) + + visible_message(SPAN_NOTICE("[src] collapses in on itself.")) + + qdel(src) + return ..() return attack_alien(user) diff --git a/code/modules/cm_marines/dropship_equipment.dm b/code/modules/cm_marines/dropship_equipment.dm index 89d33134bdb8..3568f001c977 100644 --- a/code/modules/cm_marines/dropship_equipment.dm +++ b/code/modules/cm_marines/dropship_equipment.dm @@ -289,7 +289,7 @@ density = FALSE equip_categories = list(DROPSHIP_WEAPON, DROPSHIP_CREW_WEAPON) icon_state = "mg_system" - point_cost = 300 + point_cost = 50 var/deployment_cooldown var/obj/structure/machinery/m56d_hmg/mg_turret/dropship/deployed_mg combat_equipment = FALSE @@ -449,7 +449,7 @@ icon_state = "spotlights" desc = "A set of high-powered spotlights to illuminate large areas. Fits on electronics attach points of dropships. Moving this will require a powerloader." is_interactable = TRUE - point_cost = 300 + point_cost = 50 var/spotlights_cooldown var/brightness = 11 @@ -513,7 +513,7 @@ name = "\improper LZ detector" desc = "An electronic device linked to the dropship's camera system that lets you observe your landing zone mid-flight." icon_state = "lz_detector" - point_cost = 400 + point_cost = 50 var/obj/structure/machinery/computer/cameras/dropship/linked_cam_console /obj/structure/dropship_equipment/electronics/landing_zone_detector/update_equipment() @@ -1137,7 +1137,7 @@ name = "rappel deployment system" equip_categories = list(DROPSHIP_CREW_WEAPON) icon_state = "rappel_module_packaged" - point_cost = 500 + point_cost = 50 combat_equipment = FALSE var/harness = /obj/item/rappel_harness diff --git a/code/modules/cm_marines/marines_consoles.dm b/code/modules/cm_marines/marines_consoles.dm index 3539a43e6c15..36535a0b5141 100644 --- a/code/modules/cm_marines/marines_consoles.dm +++ b/code/modules/cm_marines/marines_consoles.dm @@ -594,11 +594,11 @@ /obj/structure/machinery/computer/squad_changer/ui_static_data(mob/user) var/list/data = list() var/list/squads = list() - for(var/datum/squad/S in RoleAuthority.squads) - if(S.name != "Root" && !S.locked && S.active && S.faction == faction) + for(var/datum/squad/current_squad in RoleAuthority.squads) + if(current_squad.name != "Root" && !current_squad.locked && current_squad.active && current_squad.faction == faction) var/list/squad = list(list( - "name" = S.name, - "color" = S.color-1 + "name" = current_squad.name, + "color" = current_squad.equipment_color )) squads += squad data["squads"] = squads diff --git a/code/modules/cm_preds/falcon.dm b/code/modules/cm_preds/falcon.dm index 7b369d6b1032..19977a7bd84a 100644 --- a/code/modules/cm_preds/falcon.dm +++ b/code/modules/cm_preds/falcon.dm @@ -11,12 +11,27 @@ ) flags_equip_slot = SLOT_EAR flags_item = ITEM_PREDATOR + flags_atom = FPRINT|USES_HEARING + + +/obj/item/falcon_drone/hear_talk(mob/living/sourcemob, message, verb, datum/language/language, italics) + var/mob/hologram/falcon/hologram = loc + if(!istype(hologram)) + return FALSE + var/mob/living/carbon/human/user = hologram.owned_bracers.loc + if(!ishuman(user) || user == sourcemob) + return FALSE + + to_chat(user, SPAN_YAUTJABOLD("Falcon Relay: [sourcemob.name] [verb], \"[message]\"")) + if(user && user.client && user.client.prefs && !user.client.prefs.lang_chat_disabled \ + && !user.ear_deaf && user.say_understands(sourcemob, language)) + sourcemob.langchat_display_image(user) + + return TRUE /obj/item/falcon_drone/get_examine_location(mob/living/carbon/human/wearer, mob/examiner, slot, t_he = "They", t_his = "their", t_him = "them", t_has = "have", t_is = "are") switch(slot) - if(WEAR_L_EAR) - return "on [t_his] shoulder" - if(WEAR_R_EAR) + if(WEAR_L_EAR, WEAR_R_EAR) return "on [t_his] shoulder" return ..() diff --git a/code/modules/cm_tech/techs/marine/tier4/nuke.dm b/code/modules/cm_tech/techs/marine/tier4/nuke.dm index eb4e64b59951..441c9aba69fc 100644 --- a/code/modules/cm_tech/techs/marine/tier4/nuke.dm +++ b/code/modules/cm_tech/techs/marine/tier4/nuke.dm @@ -10,7 +10,7 @@ tier = /datum/tier/four announce_name = "NUCLEAR ARSENAL ACQUIRED" - announce_message = "A nuclear device has been purchased and will be delivered to requisitions via ASRS." + announce_message = "A nuclear device has been authorized and will be delivered to requisitions via ASRS." flags = TREE_FLAG_MARINE @@ -20,11 +20,12 @@ /datum/tech/nuke/on_unlock() . = ..() - var/datum/supply_order/new_order = new /datum/supply_order() + var/datum/supply_order/new_order = new() new_order.ordernum = supply_controller.ordernum supply_controller.ordernum++ - new_order.object = supply_controller.supply_packs["Intel Operational Nuke"] + new_order.object = supply_controller.supply_packs["Encrypted Operational Nuke"] new_order.orderedby = MAIN_AI_SYSTEM + new_order.approvedby = MAIN_AI_SYSTEM supply_controller.shoppinglist += new_order diff --git a/code/modules/defenses/sentry.dm b/code/modules/defenses/sentry.dm index fc52c254c0b8..86464d97f5a3 100644 --- a/code/modules/defenses/sentry.dm +++ b/code/modules/defenses/sentry.dm @@ -1,6 +1,5 @@ #define SENTRY_FIREANGLE 135 #define SENTRY_RANGE 5 -#define SENTRY_MUZZLELUM 3 #define SENTRY_ENGAGED_TIMEOUT 60 SECONDS #define SENTRY_LOW_AMMO_TIMEOUT 20 SECONDS #define SENTRY_LOW_AMMO_ALERT_PERCENTAGE 0.25 @@ -336,9 +335,6 @@ if(isnull(angle)) return - SetLuminosity(SENTRY_MUZZLELUM) - addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, SetLuminosity), -SENTRY_MUZZLELUM), 10) - var/image_layer = layer + 0.1 var/offset = 13 @@ -726,4 +722,3 @@ #undef SENTRY_FIREANGLE #undef SENTRY_RANGE -#undef SENTRY_MUZZLELUM diff --git a/code/modules/gear_presets/corpses.dm b/code/modules/gear_presets/corpses.dm index 7e9dd5b841a0..18903ef491ee 100644 --- a/code/modules/gear_presets/corpses.dm +++ b/code/modules/gear_presets/corpses.dm @@ -1035,3 +1035,43 @@ /datum/equipment_preset/corpse/gladiator/burst name = "Corpse - Burst Gladiator" xenovictim = TRUE + + +//FORECON + +/datum/equipment_preset/corpse/forecon_spotter + name = "Corpse - USCM Reconnaissance Spotter" + assignment = "Reconnaissance Spotter" + xenovictim = FALSE + paygrade = "ME5" + idtype = /obj/item/card/id/dogtag + role_comm_title = "FORECON" + faction_group = list(FACTION_USCM, FACTION_SURVIVOR) + access = list( + ACCESS_CIVILIAN_PUBLIC, + ACCESS_CIVILIAN_ENGINEERING, + ACCESS_CIVILIAN_LOGISTICS, + ) + +/datum/equipment_preset/corpse/forecon_spotter/load_gear(mob/living/carbon/human/new_human) + var/obj/item/clothing/under/marine/reconnaissance/uniform = new() + var/obj/item/clothing/accessory/storage/droppouch/pouch = new() + var/obj/item/clothing/accessory/ranks/marine/e5/pin = new() + var/obj/item/clothing/accessory/patch/patch_uscm = new() + var/obj/item/clothing/accessory/patch/forecon/patch_forecon = new() + uniform.attach_accessory(new_human,pouch) + uniform.attach_accessory(new_human,patch_uscm) + uniform.attach_accessory(new_human,pin) + uniform.attach_accessory(new_human,patch_forecon) + new_human.equip_to_slot_or_del(uniform, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/webbing(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/drinks/flask/marine(new_human), WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/facepaint/sniper(new_human), WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE(new_human), WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/device/flashlight(new_human), WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical(new_human), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK) diff --git a/code/modules/gear_presets/forcon_survivors.dm b/code/modules/gear_presets/forcon_survivors.dm index a883759a2f7f..825228f29735 100644 --- a/code/modules/gear_presets/forcon_survivors.dm +++ b/code/modules/gear_presets/forcon_survivors.dm @@ -1,6 +1,5 @@ ///*****************************LV-522 Force Recon Survivors*******************************************************/ //Nanu told me to put them here so they dont clutter up survivors.dm - /datum/equipment_preset/survivor/forecon paygrade = "ME5" idtype = /obj/item/card/id/dogtag @@ -36,6 +35,7 @@ new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical(new_human), WEAR_IN_JACKET) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/sof/survivor_forecon(new_human), WEAR_L_EAR) GLOB.character_traits[/datum/character_trait/skills/spotter].apply_trait(new_human) /datum/equipment_preset/survivor/forecon/add_survivor_weapon_security(mob/living/carbon/human/new_human) @@ -102,7 +102,7 @@ /datum/equipment_preset/survivor/forecon/standard name = "Survivor - USCM Reconnaissance Marine" - assignment = "Reconnaissance Rifleman" + assignment = JOB_FORECON_RIFLEMAN skills = /datum/skills/military/survivor/forecon_standard /datum/equipment_preset/survivor/forecon/standard/load_gear(mob/living/carbon/human/new_human) @@ -116,7 +116,7 @@ /datum/equipment_preset/survivor/forecon/tech name = "Survivor - USCM Reconnaissance Support Technician" - assignment = "Reconnaissance Support Technician" + assignment = JOB_FORECON_SUPPORT skills = /datum/skills/military/survivor/forecon_techician /datum/equipment_preset/survivor/forecon/tech/load_gear(mob/living/carbon/human/new_human) @@ -138,7 +138,7 @@ /datum/equipment_preset/survivor/forecon/marksman name = "Survivor - USCM Reconnaissance Designated Marksman" - assignment = "Reconnaissance Marksman" + assignment = JOB_FORECON_MARKSMAN skills = /datum/skills/military/survivor/forecon_marksman /datum/equipment_preset/survivor/forecon/marksman/load_gear(mob/living/carbon/human/new_human) @@ -154,7 +154,7 @@ /datum/equipment_preset/survivor/forecon/smartgunner name = "Survivor - USCM Reconnaissance Smartgunner" - assignment = "Reconnaissance Smartgunner" + assignment = JOB_FORECON_SMARTGUNNER skills = /datum/skills/military/survivor/forecon_smartgunner /datum/equipment_preset/survivor/forecon/smartgunner/load_gear(mob/living/carbon/human/new_human) @@ -163,33 +163,50 @@ new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/m1911(new_human), WEAR_IN_BELT) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/m1911(new_human), WEAR_IN_BELT) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/m1911(new_human), WEAR_IN_BELT) + new_human.equip_to_slot(new /obj/item/smartgun_battery(new_human), WEAR_IN_BACK) add_forecon_weapon(new_human) spawn_random_headgear(new_human) add_forecon_equipment(new_human) ///*****************************// -/datum/equipment_preset/survivor/forecon/grenadier - name = "Survivor - USCM Reconnaissance Grenadier" - assignment = "Reconnaissance Grenadier" - skills = /datum/skills/military/survivor/forecon_grenadier +/datum/equipment_preset/survivor/forecon/sniper + name = "Survivor - USCM Reconnaissance Sniper" + assignment = JOB_FORECON_SNIPER + skills = /datum/skills/military/survivor/forecon_sniper -/datum/equipment_preset/survivor/forecon/grenadier/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/launcher/grenade/m81/m79(new_human), WEAR_L_HAND) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/m1911(new_human), WEAR_R_HAND) - ..() - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/grenade(new_human), WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/m1911(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/m1911(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/incendiary(new_human), WEAR_IN_BACK) +/datum/equipment_preset/survivor/forecon/sniper/load_gear(mob/living/carbon/human/new_human) + var/obj/item/clothing/under/marine/reconnaissance/uniform = new() + var/obj/item/clothing/accessory/storage/droppouch/pouch = new() + var/obj/item/clothing/accessory/ranks/marine/e5/pin = new() + var/obj/item/clothing/accessory/patch/patch_uscm = new() + var/obj/item/clothing/accessory/patch/forecon/patch_forecon = new() + uniform.attach_accessory(new_human,pouch) + uniform.attach_accessory(new_human,patch_uscm) + uniform.attach_accessory(new_human,pin) + uniform.attach_accessory(new_human,patch_forecon) + new_human.equip_to_slot_or_del(uniform, WEAR_BODY) + new_human.equip_to_slot(new /obj/item/clothing/suit/storage/marine/ghillie/forecon(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/drinks/flask/marine(new_human), WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/facepaint/sniper(new_human), WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE(new_human), WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/general_belt(new_human), WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical(new_human), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/sof/survivor_forecon(new_human), WEAR_L_EAR) spawn_random_headgear(new_human) add_forecon_equipment(new_human) + add_forecon_weapon_pistol(new_human) //---------------------------\\ /datum/equipment_preset/survivor/forecon/squad_leader name = "Survivor - USCM Reconnaissance Squad Leader" - assignment = "Reconnaissance Squad Leader" + assignment = JOB_FORECON_SL skills = /datum/skills/military/survivor/forecon_squad_leader paygrade = "MO1" @@ -215,7 +232,7 @@ /datum/equipment_preset/survivor/forecon/major name = "Survivor - USCM Reconnaissance Major" - assignment = "Reconnaissance Commander" + assignment = JOB_FORECON_CO skills = /datum/skills/commander paygrade = "MO4" idtype = /obj/item/card/id/gold @@ -248,7 +265,7 @@ /datum/equipment_preset/synth/survivor/forecon name = "Survivor - USCM Synthetic" - assignment = "Reconnaissance Synthetic" + assignment = JOB_FORECON_SYN faction_group = list(FACTION_MARINE, FACTION_SURVIVOR) idtype = /obj/item/card/id/gold @@ -261,3 +278,4 @@ preset_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular(preset_human), WEAR_R_HAND) preset_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full(preset_human), WEAR_R_STORE) preset_human.equip_to_slot_or_del(new /obj/item/storage/pouch/survival/synth/full(preset_human), WEAR_L_STORE) + preset_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/sof/survivor_forecon(preset_human), WEAR_L_EAR) diff --git a/code/modules/gear_presets/pmc.dm b/code/modules/gear_presets/pmc.dm index 59f1b9e09cdf..5fa5dd1374e8 100644 --- a/code/modules/gear_presets/pmc.dm +++ b/code/modules/gear_presets/pmc.dm @@ -1837,10 +1837,10 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), languages = ALL_SYNTH_LANGUAGES skills = /datum/skills/synthetic - idtype = /obj/item/card/id/data + idtype = /obj/item/card/id/pmc assignment = JOB_PMC_SYNTH rank = JOB_PMC_SYNTH - role_comm_title = "Syn" + role_comm_title = "WY Syn" headset_type = /obj/item/device/radio/headset/distress/pmc/command @@ -1879,7 +1879,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/surg_vest/equipped, WEAR_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/synth, WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/weapon/telebaton, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/nailgun, WEAR_IN_JACKET) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/nailgun, WEAR_IN_JACKET) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc, WEAR_HEAD) @@ -1895,8 +1895,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), new_human.equip_to_slot_or_del(new /obj/item/roller/surgical, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator/upgraded, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/nailgun, WEAR_IN_BACK) - new /obj/item/clothing/suit/auto_cpr(new_human.back) + new_human.equip_to_slot_or_del(new /obj/item/tool/crew_monitor, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/full/dutch, WEAR_WAIST) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/nailgun/compact, WEAR_J_STORE) diff --git a/code/modules/gear_presets/synths.dm b/code/modules/gear_presets/synths.dm index 3e732e93990a..eaf6299b88a8 100644 --- a/code/modules/gear_presets/synths.dm +++ b/code/modules/gear_presets/synths.dm @@ -372,6 +372,7 @@ /datum/equipment_preset/synth/survivor/security_synth name = "Survivor - Synthetic - Corporate Security Synth" idtype = /obj/item/card/id/silver/cl + role_comm_title = "WY Syn" equipment_to_spawn = list( WEAR_HEAD = /obj/item/clothing/head/soft/sec/corp, WEAR_L_EAR = /obj/item/device/radio/headset/distress/WY, @@ -392,6 +393,7 @@ /datum/equipment_preset/synth/survivor/protection_synth name = "Survivor - Synthetic - Corporate Protection Synth" idtype = /obj/item/card/id/pmc + role_comm_title = "WY Syn" equipment_to_spawn = list( WEAR_HEAD = /obj/item/clothing/head/helmet/marine/veteran/pmc, WEAR_L_EAR = /obj/item/device/radio/headset/distress/pmc/hvh, @@ -414,6 +416,8 @@ /datum/equipment_preset/synth/survivor/corporate_synth name = "Survivor - Synthetic - Corporate Clerical Synth" + idtype = /obj/item/card/id/data + role_comm_title = "WY Syn" equipment_to_spawn = list( WEAR_L_EAR = /obj/item/device/radio/headset/distress/WY, WEAR_BODY = /obj/item/clothing/under/suit_jacket/trainee, @@ -471,7 +475,7 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/surg_vest/equipped, WEAR_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/synth, WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/weapon/telebaton, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/nailgun, WEAR_IN_JACKET) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/nailgun, WEAR_IN_JACKET) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc, WEAR_HEAD) @@ -487,8 +491,7 @@ new_human.equip_to_slot_or_del(new /obj/item/roller/surgical, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator/upgraded, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/nailgun, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/auto_cpr, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/crew_monitor, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/full/dutch, WEAR_WAIST) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/nailgun/compact, WEAR_J_STORE) diff --git a/code/modules/gear_presets/uscm_ship.dm b/code/modules/gear_presets/uscm_ship.dm index 7aa9eabb3042..75d661da503f 100644 --- a/code/modules/gear_presets/uscm_ship.dm +++ b/code/modules/gear_presets/uscm_ship.dm @@ -476,6 +476,13 @@ role_comm_title = "CO" minimum_age = 35 + dress_over = list( + /obj/item/clothing/suit/storage/jacket/marine/dress/officer/white, + /obj/item/clothing/suit/storage/jacket/marine/dress/officer/black, + /obj/item/clothing/suit/storage/jacket/marine/dress/officer/suit, + /obj/item/clothing/suit/storage/jacket/marine/dress/officer/falcon, + ) + /datum/equipment_preset/uscm_ship/commander/council/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/bridge(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/marine/commander/council(new_human), WEAR_HEAD) diff --git a/code/modules/mapping/space_management/space_level.dm b/code/modules/mapping/space_management/space_level.dm index 86958c5b41b4..861258aa20a2 100644 --- a/code/modules/mapping/space_management/space_level.dm +++ b/code/modules/mapping/space_management/space_level.dm @@ -4,11 +4,13 @@ var/list/traits var/z_value = 1 //actual z placement var/linkage = SELFLOOPING - var/xi - var/yi //imaginary placements on the grid + var/x_bounds + var/y_bounds /datum/space_level/New(new_z, new_name, list/new_traits = list()) z_value = new_z name = new_name traits = new_traits //set_linkage(new_traits[ZTRAIT_LINKAGE]) + x_bounds = world.maxx + y_bounds = world.maxy diff --git a/code/modules/mob/dead/observer/orbit.dm b/code/modules/mob/dead/observer/orbit.dm index 94d1203493da..a77138668d72 100644 --- a/code/modules/mob/dead/observer/orbit.dm +++ b/code/modules/mob/dead/observer/orbit.dm @@ -134,7 +134,7 @@ serialized["icon"] = icon ? icon : "private" if(human.assigned_squad) - serialized["background_color"] = human.assigned_squad.color ? squad_colors[human.assigned_squad.color] : human.assigned_squad.minimap_color + serialized["background_color"] = human.assigned_squad.equipment_color ? human.assigned_squad.equipment_color : human.assigned_squad.minimap_color else serialized["background_color"] = human.assigned_equipment_preset?.minimap_background diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index a68286e6c970..ffa3bd1b1977 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -279,9 +279,9 @@ playsound(loc, 'sound/weapons/thudswoosh.ogg', 25, 1, 5) return - adjust_effect(-3, PARALYZE) - adjust_effect(-3, STUN) - adjust_effect(-3, WEAKEN) + adjust_effect(-6, PARALYZE) + adjust_effect(-6, STUN) + adjust_effect(-6, WEAKEN) playsound(loc, 'sound/weapons/thudswoosh.ogg', 25, 1, 5) diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index 181f1c8a2814..35097a8e5c79 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -1,72 +1,72 @@ /mob/living/carbon/human/var/cpr_cooldown /mob/living/carbon/human/var/cpr_attempt_timer -/mob/living/carbon/human/attack_hand(mob/living/carbon/human/M) +/mob/living/carbon/human/attack_hand(mob/living/carbon/human/attacking_mob) if(..()) return TRUE - if((M != src) && check_shields(0, M.name)) - visible_message(SPAN_DANGER("[M] attempted to touch [src]!"), null, null, 5) + if((attacking_mob != src) && check_shields(0, attacking_mob.name)) + visible_message(SPAN_DANGER("[attacking_mob] attempted to touch [src]!"), null, null, 5) return 0 - switch(M.a_intent) + switch(attacking_mob.a_intent) if(INTENT_HELP) - if(on_fire && M != src) + if(on_fire && attacking_mob != src) adjust_fire_stacks(-10, min_stacks = 0) playsound(src.loc, 'sound/weapons/thudswoosh.ogg', 25, 1, 7) - M.visible_message(SPAN_DANGER("[M] tries to put out the fire on [src]!"), \ + attacking_mob.visible_message(SPAN_DANGER("[attacking_mob] tries to put out the fire on [src]!"), \ SPAN_WARNING("You try to put out the fire on [src]!"), null, 5) if(fire_stacks <= 0) - M.visible_message(SPAN_DANGER("[M] has successfully extinguished the fire on [src]!"), \ + attacking_mob.visible_message(SPAN_DANGER("[attacking_mob] has successfully extinguished the fire on [src]!"), \ SPAN_NOTICE("You extinguished the fire on [src]."), null, 5) return 1 // If unconcious with oxygen damage, do CPR. If dead, we do CPR if(!(stat == UNCONSCIOUS && getOxyLoss() > 0) && !(stat == DEAD)) - help_shake_act(M) + help_shake_act(attacking_mob) return 1 - if(M.head && (M.head.flags_inventory & COVERMOUTH) || M.wear_mask && (M.wear_mask.flags_inventory & COVERMOUTH) && !(M.wear_mask.flags_inventory & ALLOWCPR)) - to_chat(M, SPAN_NOTICE("Remove your mask!")) + if(attacking_mob.head && (attacking_mob.head.flags_inventory & COVERMOUTH) || attacking_mob.wear_mask && (attacking_mob.wear_mask.flags_inventory & COVERMOUTH) && !(attacking_mob.wear_mask.flags_inventory & ALLOWCPR)) + to_chat(attacking_mob, SPAN_NOTICE("Remove your mask!")) return 0 if(head && (head.flags_inventory & COVERMOUTH) || wear_mask && (wear_mask.flags_inventory & COVERMOUTH) && !(wear_mask.flags_inventory & ALLOWCPR)) - to_chat(M, SPAN_NOTICE("Remove [src.gender==MALE?"his":"her"] mask!")) + to_chat(attacking_mob, SPAN_NOTICE("Remove [src.gender==MALE?"his":"her"] mask!")) return 0 if(cpr_attempt_timer >= world.time) - to_chat(M, SPAN_NOTICE("CPR is already being performed on [src]!")) + to_chat(attacking_mob, SPAN_NOTICE("CPR is already being performed on [src]!")) return 0 //CPR - if(M.action_busy) + if(attacking_mob.action_busy) return 1 - M.visible_message(SPAN_NOTICE("[M] starts performing CPR on [src]."), + attacking_mob.visible_message(SPAN_NOTICE("[attacking_mob] starts performing CPR on [src]."), SPAN_HELPFUL("You start performing CPR on [src].")) - cpr_attempt_timer = world.time + HUMAN_STRIP_DELAY * M.get_skill_duration_multiplier(SKILL_MEDICAL) - if(do_after(M, HUMAN_STRIP_DELAY * M.get_skill_duration_multiplier(SKILL_MEDICAL), INTERRUPT_ALL, BUSY_ICON_GENERIC, src, INTERRUPT_MOVED, BUSY_ICON_MEDICAL)) + cpr_attempt_timer = world.time + HUMAN_STRIP_DELAY * attacking_mob.get_skill_duration_multiplier(SKILL_MEDICAL) + if(do_after(attacking_mob, HUMAN_STRIP_DELAY * attacking_mob.get_skill_duration_multiplier(SKILL_MEDICAL), INTERRUPT_ALL, BUSY_ICON_GENERIC, src, INTERRUPT_MOVED, BUSY_ICON_MEDICAL)) if(stat != DEAD) var/suff = min(getOxyLoss(), 10) //Pre-merge level, less healing, more prevention of dieing. apply_damage(-suff, OXY) updatehealth() - src.affected_message(M, + src.affected_message(attacking_mob, SPAN_HELPFUL("You feel a breath of fresh air enter your lungs. It feels good."), SPAN_HELPFUL("You perform CPR on [src]. Repeat at least every 7 seconds."), - SPAN_NOTICE("[M] performs CPR on [src].")) + SPAN_NOTICE("[attacking_mob] performs CPR on [src].")) if(is_revivable() && stat == DEAD) if(cpr_cooldown < world.time) revive_grace_period += 7 SECONDS - M.visible_message(SPAN_NOTICE("[M] performs CPR on [src]."), + attacking_mob.visible_message(SPAN_NOTICE("[attacking_mob] performs CPR on [src]."), SPAN_HELPFUL("You perform CPR on [src].")) else - M.visible_message(SPAN_NOTICE("[M] fails to perform CPR on [src]."), + attacking_mob.visible_message(SPAN_NOTICE("[attacking_mob] fails to perform CPR on [src]."), SPAN_HELPFUL("You fail to perform CPR on [src]. Incorrect rhythm. Do it slower.")) cpr_cooldown = world.time + 7 SECONDS cpr_attempt_timer = 0 return 1 if(INTENT_GRAB) - if(M == src) + if(attacking_mob == src) check_for_injuries() return 1 @@ -74,116 +74,112 @@ return 0 if(w_uniform) - w_uniform.add_fingerprint(M) - - M.start_pulling(src) + w_uniform.add_fingerprint(attacking_mob) + attacking_mob.start_pulling(src) return 1 if(INTENT_HARM) // See if they can attack, and which attacks to use. - var/datum/unarmed_attack/attack = M.species.unarmed - if(!attack.is_usable(M)) attack = M.species.secondary_unarmed - if(!attack.is_usable(M)) return + var/datum/unarmed_attack/attack = attacking_mob.species.unarmed + if(!attack.is_usable(attacking_mob)) + attack = attacking_mob.species.secondary_unarmed + return last_damage_data = create_cause_data("fisticuffs", src) - M.attack_log += text("\[[time_stamp()]\] [pick(attack.attack_verb)]ed [key_name(src)]") - attack_log += text("\[[time_stamp()]\] Has been [pick(attack.attack_verb)]ed by [key_name(M)]") - msg_admin_attack("[key_name(M)] [pick(attack.attack_verb)]ed [key_name(src)] in [get_area(src)] ([src.loc.x],[src.loc.y],[src.loc.z]).", src.loc.x, src.loc.y, src.loc.z) + attacking_mob.attack_log += text("\[[time_stamp()]\] [pick(attack.attack_verb)]ed [key_name(src)]") + attack_log += text("\[[time_stamp()]\] Has been [pick(attack.attack_verb)]ed by [key_name(attacking_mob)]") + msg_admin_attack("[key_name(attacking_mob)] [pick(attack.attack_verb)]ed [key_name(src)] in [get_area(src)] ([src.loc.x],[src.loc.y],[src.loc.z]).", src.loc.x, src.loc.y, src.loc.z) - M.animation_attack_on(src) - M.flick_attack_overlay(src, "punch") + attacking_mob.animation_attack_on(src) + attacking_mob.flick_attack_overlay(src, "punch") var/extra_cqc_dmg = 0 //soft maximum of 5, this damage is added onto the final value depending on how much cqc skill you have - if(M.skills) - extra_cqc_dmg = M.skills?.get_skill_level(SKILL_CQC) + if(attacking_mob.skills) + extra_cqc_dmg = attacking_mob.skills?.get_skill_level(SKILL_CQC) var/raw_damage = 0 //final value, gets absorbed by the armor and then deals the leftover to the mob - var/obj/limb/affecting = get_limb(rand_zone(M.zone_selected, 70)) + var/obj/limb/affecting = get_limb(rand_zone(attacking_mob.zone_selected, 70)) var/armor = getarmor(affecting, ARMOR_MELEE) playsound(loc, attack.attack_sound, 25, 1) - visible_message(SPAN_DANGER("[M] [pick(attack.attack_verb)]ed [src]!"), null, null, 5) + visible_message(SPAN_DANGER("[attacking_mob] [pick(attack.attack_verb)]ed [src]!"), null, null, 5) raw_damage = attack.damage + extra_cqc_dmg var/final_damage = armor_damage_reduction(GLOB.marine_melee, raw_damage, armor, FALSE) // no penetration from punches apply_damage(final_damage, BRUTE, affecting, sharp=attack.sharp, edge = attack.edge) if(INTENT_DISARM) - if(M == src) + if(attacking_mob == src) check_for_injuries() return 1 - M.attack_log += text("\[[time_stamp()]\] Disarmed [key_name(src)]") - src.attack_log += text("\[[time_stamp()]\] Has been disarmed by [key_name(M)]") + attacking_mob.attack_log += text("\[[time_stamp()]\] Disarmed [key_name(src)]") + src.attack_log += text("\[[time_stamp()]\] Has been disarmed by [key_name(attacking_mob)]") - M.animation_attack_on(src) - M.flick_attack_overlay(src, "disarm") + attacking_mob.animation_attack_on(src) + attacking_mob.flick_attack_overlay(src, "disarm") - msg_admin_attack("[key_name(M)] disarmed [key_name(src)] in [get_area(src)] ([src.loc.x],[src.loc.y],[src.loc.z]).", src.loc.x, src.loc.y, src.loc.z) + msg_admin_attack("[key_name(attacking_mob)] disarmed [key_name(src)] in [get_area(src)] ([src.loc.x],[src.loc.y],[src.loc.z]).", src.loc.x, src.loc.y, src.loc.z) if(w_uniform) - w_uniform.add_fingerprint(M) + w_uniform.add_fingerprint(attacking_mob) //Accidental gun discharge - if(!skillcheck(M, SKILL_CQC, SKILL_CQC_SKILLED)) + if(!skillcheck(attacking_mob, SKILL_CQC, SKILL_CQC_SKILLED)) if (isgun(r_hand) || isgun(l_hand)) - var/obj/item/weapon/gun/W = null + var/obj/item/weapon/gun/held_weapon = null var/chance = 0 if (isgun(l_hand)) - W = l_hand + held_weapon = l_hand chance = hand ? 40 : 20 if (isgun(r_hand)) - W = r_hand + held_weapon = r_hand chance = !hand ? 40 : 20 if (prob(chance)) - visible_message(SPAN_DANGER("[M] accidentally makes [src]'s [W.name] go off during the struggle!"), SPAN_DANGER("You accidentally make [src]'s [W.name] go off during the struggle!"), null, 5) + visible_message(SPAN_DANGER("[attacking_mob] accidentally makes [src]'s [held_weapon.name] go off during the struggle!"), SPAN_DANGER("You accidentally make [src]'s [held_weapon.name] go off during the struggle!"), null, 5) var/list/turfs = list() for(var/turf/T in view()) turfs += T var/turf/target = pick(turfs) count_niche_stat(STATISTICS_NICHE_DISCHARGE) - attack_log += "\[[time_stamp()]\] [key_name(src)] accidentally fired [W.name] in [get_area(src)] triggered by [key_name(M)]." - M.attack_log += "\[[time_stamp()]\] [key_name(src)] accidentally fired [W.name] in [get_area(src)] triggered by [key_name(M)]." - msg_admin_attack("[key_name(src)] accidentally fired [W.name] in [get_area(M)] ([M.loc.x],[M.loc.y],[M.loc.z]) triggered by [key_name(M)].", M.loc.x, M.loc.y, M.loc.z) - - return W.afterattack(target,src) + attack_log += "\[[time_stamp()]\] [key_name(src)] accidentally fired [held_weapon.name] in [get_area(src)] triggered by [key_name(attacking_mob)]." + attacking_mob.attack_log += "\[[time_stamp()]\] [key_name(src)] accidentally fired [held_weapon.name] in [get_area(src)] triggered by [key_name(attacking_mob)]." + msg_admin_attack("[key_name(src)] accidentally fired [held_weapon.name] in [get_area(attacking_mob)] ([attacking_mob.loc.x],[attacking_mob.loc.y],[attacking_mob.loc.z]) triggered by [key_name(attacking_mob)].", attacking_mob.loc.x, attacking_mob.loc.y, attacking_mob.loc.z) - var/randn = rand(1, 100) - var/skill_level = M.skills.get_skill_level(SKILL_CQC) - if(M.skills) - randn -= 5 * skill_level //attacker's martial arts training + return held_weapon.afterattack(target,src) - if(skills) - randn += 5 * skill_level //defender's martial arts training + var/disarm_chance = rand(1, 100) + var/attacker_skill_level = attacking_mob.skills ? skills.get_skill_level(SKILL_CQC) : SKILL_CQC_MAX // No skills, so assume max + var/defender_skill_level = skills ? skills.get_skill_level(SKILL_CQC) : SKILL_CQC_MAX // No skills, so assume max + disarm_chance -= 5 * attacker_skill_level + disarm_chance += 5 * defender_skill_level - if (randn <= 25) - apply_effect(2 + skill_level, WEAKEN) + if(disarm_chance <= 25) + apply_effect(2 + max((attacker_skill_level - defender_skill_level), 0), WEAKEN) playsound(loc, 'sound/weapons/thudswoosh.ogg', 25, 1, 7) - var/shovetext = skill_level > 1 ? "tackled" : pick("pushed", "shoved") - visible_message(SPAN_DANGER("[M] has [shovetext] [src]!"), null, null, 5) + var/shove_text = attacker_skill_level > 1 ? "tackled" : pick("pushed", "shoved") + visible_message(SPAN_DANGER("[attacking_mob] has [shove_text] [src]!"), null, null, 5) return - if(randn <= 60) + if(disarm_chance <= 60) //BubbleWrap: Disarming breaks a pull if(pulling) - visible_message(SPAN_DANGER("[M] has broken [src]'s grip on [pulling]!"), null, null, 5) + visible_message(SPAN_DANGER("[attacking_mob] has broken [src]'s grip on [pulling]!"), null, null, 5) stop_pulling() else drop_held_item() - visible_message(SPAN_DANGER("[M] has disarmed [src]!"), null, null, 5) + visible_message(SPAN_DANGER("[attacking_mob] has disarmed [src]!"), null, null, 5) playsound(loc, 'sound/weapons/thudswoosh.ogg', 25, 1, 7) return - playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, 7) - visible_message(SPAN_DANGER("[M] attempted to disarm [src]!"), null, null, 5) - return + visible_message(SPAN_DANGER("[attacking_mob] attempted to disarm [src]!"), null, null, 5) /mob/living/carbon/human/proc/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, inrange, params) return @@ -231,9 +227,9 @@ playsound(src.loc, 'sound/weapons/thudswoosh.ogg', 25, 1, 5) return - adjust_effect(-3, PARALYZE) - adjust_effect(-3, STUN) - adjust_effect(-3, WEAKEN) + adjust_effect(-6, PARALYZE) + adjust_effect(-6, STUN) + adjust_effect(-6, WEAKEN) playsound(loc, 'sound/weapons/thudswoosh.ogg', 25, 1, 7) diff --git a/code/modules/mob/living/carbon/human/species/emote-yautja.dm b/code/modules/mob/living/carbon/human/species/emote-yautja.dm deleted file mode 100644 index 8c959329c953..000000000000 --- a/code/modules/mob/living/carbon/human/species/emote-yautja.dm +++ /dev/null @@ -1,145 +0,0 @@ -/datum/emote/living/carbon/human/yautja - species_type_allowed_typecache = list(/datum/species/yautja) - keybind_category = CATEGORY_YAUTJA_EMOTE - -/datum/emote/living/carbon/human/yautja/anytime - key = "anytime" - sound = 'sound/voice/pred_anytime.ogg' - emote_type = EMOTE_AUDIBLE - -/datum/emote/living/carbon/human/yautja/click - key = "click" - emote_type = EMOTE_AUDIBLE - -/datum/emote/living/carbon/human/yautja/click/get_sound(mob/living/user) - if(rand(0,100) < 50) - return 'sound/voice/pred_click1.ogg' - else - return 'sound/voice/pred_click2.ogg' - -/datum/emote/living/carbon/human/yautja/helpme - key = "helpme" - sound = 'sound/voice/pred_helpme.ogg' - volume = 25 - emote_type = EMOTE_AUDIBLE - -/datum/emote/living/carbon/human/yautja/malescream - key = "malescream" - emote_type = EMOTE_AUDIBLE - sound = "male_scream" - -/datum/emote/living/carbon/human/yautja/femalescream - key = "femalescream" - emote_type = EMOTE_AUDIBLE - sound = "female_scream" - -/datum/emote/living/carbon/human/yautja/iseeyou - key = "iseeyou" - sound = 'sound/hallucinations/i_see_you2.ogg' - emote_type = EMOTE_AUDIBLE - -/datum/emote/living/carbon/human/yautja/itsatrap - key = "itsatrap" - sound = 'sound/voice/pred_itsatrap.ogg' - volume = 25 - emote_type = EMOTE_AUDIBLE - -/datum/emote/living/carbon/human/yautja/laugh1 - key = "laugh1" - sound = 'sound/voice/pred_laugh1.ogg' - volume = 25 - emote_type = EMOTE_AUDIBLE - -/datum/emote/living/carbon/human/yautja/laugh2 - key = "laugh2" - sound = 'sound/voice/pred_laugh2.ogg' - volume = 25 - emote_type = EMOTE_AUDIBLE - -/datum/emote/living/carbon/human/yautja/laugh3 - key = "laugh3" - sound = 'sound/voice/pred_laugh3.ogg' - volume = 25 - emote_type = EMOTE_AUDIBLE - -/datum/emote/living/carbon/human/yautja/overhere - key = "overhere" - sound = 'sound/voice/pred_overhere.ogg' - volume = 25 - emote_type = EMOTE_AUDIBLE - -/datum/emote/living/carbon/human/yautja/roar - key = "roar" - message = "roars!" - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/yautja/roar/get_sound(mob/living/user) - return pick('sound/voice/pred_roar1.ogg', 'sound/voice/pred_roar2.ogg') - -/datum/emote/living/carbon/human/yautja/roar2 - key = "roar2" - sound = 'sound/voice/pred_roar3.ogg' - message = "roars!" - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/yautja/loudroar - key = "loudroar" - message = "roars loudly!" - volume = 60 - cooldown = 120 SECONDS - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/yautja/loudroar/get_sound(mob/living/user) - return pick('sound/voice/pred_roar4.ogg', 'sound/voice/pred_roar5.ogg') - -/datum/emote/living/carbon/human/yautja/loudroar/run_emote(mob/user, params, type_override, intentional) - . = ..() - if(!.) - return - - for(var/mob/current_mob as anything in get_mobs_in_z_level_range(get_turf(user), 18) - user) - var/relative_dir = get_dir(current_mob, user) - var/final_dir = dir2text(relative_dir) - to_chat(current_mob, SPAN_HIGHDANGER("You hear a loud roar coming from [final_dir ? "the [final_dir]" : "nearby"]!")) - -/datum/emote/living/carbon/human/yautja/turnaround - key = "turnaround" - sound = 'sound/voice/pred_turnaround.ogg' - volume = 25 - emote_type = EMOTE_AUDIBLE - -/datum/emote/living/carbon/human/yautja/click2 - key = "click2" - emote_type = EMOTE_AUDIBLE - -/datum/emote/living/carbon/human/yautja/click2/get_sound(mob/living/user) - return pick('sound/voice/pred_click3.ogg', 'sound/voice/pred_click4.ogg') - -/datum/emote/living/carbon/human/yautja/aliengrowl - key = "aliengrowl" - emote_type = EMOTE_AUDIBLE - -/datum/emote/living/carbon/human/yautja/aliengrowl/get_sound(mob/living/user) - return pick('sound/voice/alien_growl1.ogg', 'sound/voice/alien_growl2.ogg') - -/datum/emote/living/carbon/human/yautja/alienhelp - key = "alienhelp" - emote_type = EMOTE_AUDIBLE - -/datum/emote/living/carbon/human/yautja/alienhelp/get_sound(mob/living/user) - return pick('sound/voice/alien_help1.ogg', 'sound/voice/alien_help2.ogg') - -/datum/emote/living/carbon/human/yautja/comeonout - key = "comeonout" - sound = 'sound/voice/pred_come_on_out.ogg' - emote_type = EMOTE_AUDIBLE - -/datum/emote/living/carbon/human/yautja/overthere - key = "overthere" - sound = 'sound/voice/pred_over_there.ogg' - emote_type = EMOTE_AUDIBLE - -/datum/emote/living/carbon/human/yautja/uglyfreak - key = "uglyfreak" - sound = 'sound/voice/pred_ugly_freak.ogg' - emote_type = EMOTE_AUDIBLE diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index a6d0355bfbe5..b6eeb68e95d3 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -123,6 +123,10 @@ /datum/species/proc/larva_impregnated(obj/item/alien_embryo/embryo) return +/// Override to add an emote panel to a species +/datum/species/proc/open_emote_panel() + return + /datum/species/proc/handle_npc(mob/living/carbon/human/H) set waitfor = FALSE return diff --git a/code/modules/mob/living/carbon/human/species/working_joe/_emote.dm b/code/modules/mob/living/carbon/human/species/working_joe/_emote.dm index 63cc79a57dae..e66fec576f64 100644 --- a/code/modules/mob/living/carbon/human/species/working_joe/_emote.dm +++ b/code/modules/mob/living/carbon/human/species/working_joe/_emote.dm @@ -2,7 +2,7 @@ species_type_allowed_typecache = list(/datum/species/synthetic/colonial/working_joe) keybind_category = CATEGORY_SYNTH_EMOTE volume = 75 - /// A general category for the emote, for use in the WJ emote panel. See [code/__DEFINES/wj_emotes.dm] for categories. + /// A general category for the emote, for use in the WJ emote panel. See [code/__DEFINES/emote_panels.dm] for categories. var/category = "" /// Override text for the emote to be displayed in the WJ emote panel var/override_say = "" diff --git a/code/modules/mob/living/carbon/human/species/working_joe/_species.dm b/code/modules/mob/living/carbon/human/species/working_joe/_species.dm index b9044becb6f5..139b339fbfd7 100644 --- a/code/modules/mob/living/carbon/human/species/working_joe/_species.dm +++ b/code/modules/mob/living/carbon/human/species/working_joe/_species.dm @@ -22,7 +22,7 @@ return ..() /// Open the WJ's emote panel, which allows them to use voicelines -/datum/species/synthetic/colonial/working_joe/proc/open_emote_panel() +/datum/species/synthetic/colonial/working_joe/open_emote_panel() var/datum/joe_emote_panel/ui = new(usr) ui.ui_interact(usr) diff --git a/code/modules/mob/living/carbon/human/species/yautja/_emote.dm b/code/modules/mob/living/carbon/human/species/yautja/_emote.dm new file mode 100644 index 000000000000..0202eece1620 --- /dev/null +++ b/code/modules/mob/living/carbon/human/species/yautja/_emote.dm @@ -0,0 +1,10 @@ +/datum/emote/living/carbon/human/yautja + species_type_allowed_typecache = list(/datum/species/yautja) + keybind_category = CATEGORY_YAUTJA_EMOTE + emote_type = EMOTE_AUDIBLE + /// A general category for the emote, for use in the Yautja emote panel. See [code/__DEFINES/emote_panels.dm] for categories. + var/category = "" + /// Override text for the emote to be displayed in the Yautja emote panel + var/override_say = "" + /// Override for being in panel or not + var/no_panel = FALSE diff --git a/code/modules/mob/living/carbon/human/species/yautja.dm b/code/modules/mob/living/carbon/human/species/yautja/_species.dm similarity index 68% rename from code/modules/mob/living/carbon/human/species/yautja.dm rename to code/modules/mob/living/carbon/human/species/yautja/_species.dm index a4c87b5da4e1..8e8849f5ad4c 100644 --- a/code/modules/mob/living/carbon/human/species/yautja.dm +++ b/code/modules/mob/living/carbon/human/species/yautja/_species.dm @@ -180,16 +180,16 @@ limb.max_damage = 35 limb.time_to_knit = -1 -/datum/species/yautja/handle_post_spawn(mob/living/carbon/human/H) - GLOB.alive_human_list -= H - H.universal_understand = 1 +/datum/species/yautja/handle_post_spawn(mob/living/carbon/human/hunter) + GLOB.alive_human_list -= hunter + hunter.universal_understand = 1 - H.blood_type = "Y*" - H.h_style = "Standard" + hunter.blood_type = "Y*" + hunter.h_style = "Standard" #ifndef UNIT_TESTS // Since this is a hard ref, we shouldn't confuse create_and_destroy - GLOB.yautja_mob_list += H + GLOB.yautja_mob_list += hunter #endif - for(var/obj/limb/limb in H.limbs) + for(var/obj/limb/limb in hunter.limbs) switch(limb.name) if("groin","chest") limb.min_broken_damage = 145 @@ -208,7 +208,8 @@ limb.max_damage = 150 limb.time_to_knit = 600 // 1 minute to self heal bone break, time is in tenths of a second - H.set_languages(list(LANGUAGE_YAUTJA)) + hunter.set_languages(list(LANGUAGE_YAUTJA)) + give_action(hunter, /datum/action/yautja_emote_panel) return ..() /datum/species/yautja/get_hairstyle(style) @@ -220,3 +221,105 @@ /datum/species/yautja/handle_paygrades() return "" + +/// Open the Yautja emote panel, which allows them to use their emotes easier. +/datum/species/yautja/open_emote_panel() + var/datum/yautja_emote_panel/ui = new(usr) + ui.ui_interact(usr) + +/datum/action/yautja_emote_panel + name = "Open Emote Panel" + action_icon_state = "looc_toggle" + +/datum/action/yautja_emote_panel/can_use_action() + . = ..() + if(!.) + return FALSE + + if(!isyautja(owner)) + return FALSE + + return TRUE + +/datum/action/yautja_emote_panel/action_activate() + if(!can_use_action()) + return + + var/mob/living/carbon/human/human_owner = owner + var/datum/species/yautja/yautja_species = human_owner.species + yautja_species.open_emote_panel() + +/datum/yautja_emote_panel + /// Static dict ("category" : (emotes)) of every yautja emote typepath + var/static/list/yautja_emotes + /// Static list of categories + var/static/list/yautja_categories = list() + /// Panel allows you to spam, so a manual CD is added here + COOLDOWN_DECLARE(panel_emote_cooldown) + +/datum/yautja_emote_panel/New() + if(!length(yautja_emotes)) + var/list/emotes_to_add = list() + for(var/datum/emote/living/carbon/human/yautja/emote as anything in subtypesof(/datum/emote/living/carbon/human/yautja)) + if(!initial(emote.key) || initial(emote.no_panel)) + continue + + if(!(initial(emote.category) in yautja_categories)) + yautja_categories += initial(emote.category) + emotes_to_add += emote + yautja_emotes = emotes_to_add + +/datum/yautja_emote_panel/proc/ui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "YautjaEmotes") + ui.open() + +/datum/yautja_emote_panel/ui_data(mob/user) + var/list/data = list() + + data["on_cooldown"] = !COOLDOWN_FINISHED(src, panel_emote_cooldown) + + return data + +/datum/yautja_emote_panel/ui_state(mob/user) + return GLOB.conscious_state + +/datum/yautja_emote_panel/ui_static_data(mob/user) + var/list/data = list() + + data["categories"] = yautja_categories + data["emotes"] = list() + + for(var/datum/emote/living/carbon/human/yautja/emote as anything in yautja_emotes) + data["emotes"] += list(list( + "id" = initial(emote.key), + "text" = (initial(emote.override_say) || initial(emote.say_message) || initial(emote.key)), + "category" = initial(emote.category), + "path" = "[emote]", + )) + + return data + +/datum/yautja_emote_panel/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) + . = ..() + if(.) + return + + switch(action) + if("emote") + var/datum/emote/living/carbon/human/yautja/path + if(!params["emotePath"]) + return FALSE + + path = text2path(params["emotePath"]) + + if(!path || !COOLDOWN_FINISHED(src, panel_emote_cooldown)) + return + + if(!(path in subtypesof(/datum/emote/living/carbon/human/yautja))) + return FALSE + + COOLDOWN_START(src, panel_emote_cooldown, 2.5 SECONDS) + usr.emote(initial(path.key)) + return TRUE diff --git a/code/modules/mob/living/carbon/human/species/yautja/fake_sounds.dm b/code/modules/mob/living/carbon/human/species/yautja/fake_sounds.dm new file mode 100644 index 000000000000..f29a990b6254 --- /dev/null +++ b/code/modules/mob/living/carbon/human/species/yautja/fake_sounds.dm @@ -0,0 +1,22 @@ +/datum/emote/living/carbon/human/yautja/fake_sound + category = YAUTJA_EMOTE_CATEGORY_FAKESOUND + +/datum/emote/living/carbon/human/yautja/fake_sound/aliengrowl + key = "aliengrowl" + +/datum/emote/living/carbon/human/yautja/fake_sound/aliengrowl/get_sound(mob/living/user) + return pick('sound/voice/alien_growl1.ogg', 'sound/voice/alien_growl2.ogg') + +/datum/emote/living/carbon/human/yautja/fake_sound/alienhelp + key = "alienhelp" + +/datum/emote/living/carbon/human/yautja/fake_sound/alienhelp/get_sound(mob/living/user) + return pick('sound/voice/alien_help1.ogg', 'sound/voice/alien_help2.ogg') + +/datum/emote/living/carbon/human/yautja/fake_sound/malescream + key = "malescream" + sound = "male_scream" + +/datum/emote/living/carbon/human/yautja/fake_sound/femalescream + key = "femalescream" + sound = "female_scream" diff --git a/code/modules/mob/living/carbon/human/species/yautja/fake_voice.dm b/code/modules/mob/living/carbon/human/species/yautja/fake_voice.dm new file mode 100644 index 000000000000..409fa83e7f1b --- /dev/null +++ b/code/modules/mob/living/carbon/human/species/yautja/fake_voice.dm @@ -0,0 +1,50 @@ +/datum/emote/living/carbon/human/yautja/voice + category = YAUTJA_EMOTE_CATEGORY_VOICE + +/datum/emote/living/carbon/human/yautja/voice/anytime + key = "anytime" + sound = 'sound/voice/pred_anytime.ogg' + + +/datum/emote/living/carbon/human/yautja/voice/helpme + key = "helpme" + sound = 'sound/voice/pred_helpme.ogg' + volume = 25 + + +/datum/emote/living/carbon/human/yautja/voice/iseeyou + key = "iseeyou" + sound = 'sound/hallucinations/i_see_you2.ogg' + + +/datum/emote/living/carbon/human/yautja/voice/itsatrap + key = "itsatrap" + sound = 'sound/voice/pred_itsatrap.ogg' + volume = 25 + + +/datum/emote/living/carbon/human/yautja/voice/overhere + key = "overhere" + sound = 'sound/voice/pred_overhere.ogg' + volume = 25 + + +/datum/emote/living/carbon/human/yautja/voice/turnaround + key = "turnaround" + sound = 'sound/voice/pred_turnaround.ogg' + volume = 25 + + +/datum/emote/living/carbon/human/yautja/voice/comeonout + key = "comeonout" + sound = 'sound/voice/pred_come_on_out.ogg' + + +/datum/emote/living/carbon/human/yautja/voice/overthere + key = "overthere" + sound = 'sound/voice/pred_over_there.ogg' + + +/datum/emote/living/carbon/human/yautja/voice/uglyfreak + key = "uglyfreak" + sound = 'sound/voice/pred_ugly_freak.ogg' diff --git a/code/modules/mob/living/carbon/human/species/yautja/yautja_sound.dm b/code/modules/mob/living/carbon/human/species/yautja/yautja_sound.dm new file mode 100644 index 000000000000..a6a9a659f215 --- /dev/null +++ b/code/modules/mob/living/carbon/human/species/yautja/yautja_sound.dm @@ -0,0 +1,70 @@ +/datum/emote/living/carbon/human/yautja/species_sound + category = YAUTJA_EMOTE_CATEGORY_SPECIES + +/datum/emote/living/carbon/human/yautja/species_sound/click + key = "click" + +/datum/emote/living/carbon/human/yautja/species_sound/click/get_sound(mob/living/user) + if(rand(0,100) < 50) + return 'sound/voice/pred_click1.ogg' + else + return 'sound/voice/pred_click2.ogg' + +/datum/emote/living/carbon/human/yautja/species_sound/click2 + key = "click2" + +/datum/emote/living/carbon/human/yautja/species_sound/click2/get_sound(mob/living/user) + return pick('sound/voice/pred_click3.ogg', 'sound/voice/pred_click4.ogg') + +// Laughing Emotes +/datum/emote/living/carbon/human/yautja/species_sound/laugh1 + key = "laugh1" + sound = 'sound/voice/pred_laugh1.ogg' + volume = 25 + +/datum/emote/living/carbon/human/yautja/species_sound/laugh2 + key = "laugh2" + sound = 'sound/voice/pred_laugh2.ogg' + volume = 25 + +/datum/emote/living/carbon/human/yautja/species_sound/laugh3 + key = "laugh3" + sound = 'sound/voice/pred_laugh3.ogg' + volume = 25 + + +// Roar Emotes +/datum/emote/living/carbon/human/yautja/species_sound/roar + key = "roar" + message = "roars!" + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/yautja/species_sound/roar/get_sound(mob/living/user) + return pick('sound/voice/pred_roar1.ogg', 'sound/voice/pred_roar2.ogg') + +/datum/emote/living/carbon/human/yautja/species_sound/roar2 + key = "roar2" + sound = 'sound/voice/pred_roar3.ogg' + message = "roars!" + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/yautja/species_sound/loudroar + key = "loudroar" + message = "roars loudly!" + volume = 60 + cooldown = 120 SECONDS + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + no_panel = TRUE + +/datum/emote/living/carbon/human/yautja/species_sound/loudroar/get_sound(mob/living/user) + return pick('sound/voice/pred_roar4.ogg', 'sound/voice/pred_roar5.ogg') + +/datum/emote/living/carbon/human/yautja/species_sound/loudroar/run_emote(mob/user, params, type_override, intentional) + . = ..() + if(!.) + return + + for(var/mob/current_mob as anything in get_mobs_in_z_level_range(get_turf(user), 18) - user) + var/relative_dir = get_dir(current_mob, user) + var/final_dir = dir2text(relative_dir) + to_chat(current_mob, SPAN_HIGHDANGER("You hear a loud roar coming from [final_dir ? "the [final_dir]" : "nearby"]!")) diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index f74b65c2606d..6ee249a6333e 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -367,7 +367,6 @@ Applied by gun suicide and high impact bullet executions, removed by rejuvenate, overlays_standing[GLOVES_LAYER] = I apply_overlay(GLOVES_LAYER) - /mob/living/carbon/human/update_inv_glasses() remove_overlay(GLASSES_LAYER) if(glasses) @@ -458,12 +457,15 @@ Applied by gun suicide and high impact bullet executions, removed by rejuvenate, if(istype(head, /obj/item/clothing/head/helmet/marine)) var/obj/item/clothing/head/helmet/marine/marine_helmet = head if(assigned_squad && marine_helmet.flags_marine_helmet & HELMET_SQUAD_OVERLAY) - var/datum/squad/S = assigned_squad - var/leader = S.squad_leader == src - if(S.color <= helmetmarkings.len) - var/image/J = leader? helmetmarkings_sql[S.color] : helmetmarkings[S.color] - J.layer = -HEAD_SQUAD_LAYER - overlays_standing[HEAD_SQUAD_LAYER] = J + if(assigned_squad && assigned_squad.equipment_color) + var/leader = assigned_squad.squad_leader + var/image/helmet_overlay = image(marine_helmet.helmet_overlay_icon, icon_state = "std-helmet") + if(leader == src) + helmet_overlay = image(marine_helmet.helmet_overlay_icon, icon_state = "sql-helmet") + helmet_overlay.layer = -HEAD_SQUAD_LAYER + helmet_overlay.alpha = assigned_squad.armor_alpha + helmet_overlay.color = assigned_squad.equipment_color + overlays_standing[HEAD_SQUAD_LAYER] = helmet_overlay apply_overlay(HEAD_SQUAD_LAYER) var/num_helmet_overlays = 0 @@ -517,14 +519,16 @@ Applied by gun suicide and high impact bullet executions, removed by rejuvenate, if(istype(wear_suit, /obj/item/clothing/suit/storage/marine)) var/obj/item/clothing/suit/storage/marine/marine_armor = wear_suit if(marine_armor.flags_marine_armor & ARMOR_SQUAD_OVERLAY) - if(assigned_squad) - var/datum/squad/S = assigned_squad - var/leader = S.squad_leader == src - if(S.color <= helmetmarkings.len) - var/image/J = leader? armormarkings_sql[S.color] : armormarkings[S.color] - J.layer = -SUIT_SQUAD_LAYER - overlays_standing[SUIT_SQUAD_LAYER] = J - apply_overlay(SUIT_SQUAD_LAYER) + if(assigned_squad && assigned_squad.equipment_color) + var/leader = assigned_squad.squad_leader + var/image/squad_overlay = image(marine_armor.squad_overlay_icon, icon_state = "std-armor") + if(leader == src) + squad_overlay = image(marine_armor.squad_overlay_icon, icon_state = "sql-armor") + squad_overlay.layer = -SUIT_SQUAD_LAYER + squad_overlay.alpha = assigned_squad.armor_alpha + squad_overlay.color = assigned_squad.equipment_color + overlays_standing[SUIT_SQUAD_LAYER] = squad_overlay + apply_overlay(SUIT_SQUAD_LAYER) if(marine_armor.armor_overlays.len) var/image/K diff --git a/code/modules/mob/living/carbon/xenomorph/Embryo.dm b/code/modules/mob/living/carbon/xenomorph/Embryo.dm index e390cd15dca2..b599e9b5567a 100644 --- a/code/modules/mob/living/carbon/xenomorph/Embryo.dm +++ b/code/modules/mob/living/carbon/xenomorph/Embryo.dm @@ -100,6 +100,14 @@ switch(stage) if(2) + if(prob(4)) + if(affected_mob.knocked_out < 1) + affected_mob.pain.apply_pain(PAIN_CHESTBURST_WEAK) + affected_mob.visible_message(SPAN_DANGER("[affected_mob] starts shaking uncontrollably!"), \ + SPAN_DANGER("You feel something moving inside you! You start shaking uncontrollably!")) + affected_mob.apply_effect(1, PARALYZE) + affected_mob.make_jittery(105) + affected_mob.take_limb_damage(1) if(prob(2)) var/message = SPAN_WARNING("[pick("Your chest hurts a little bit", "Your stomach hurts")].") to_chat(affected_mob, message) @@ -113,15 +121,15 @@ affected_mob.take_limb_damage(1) else if(prob(2)) affected_mob.emote("[pick("sneeze", "cough")]") - if(4) - if(prob(1)) + if(prob(5)) if(affected_mob.knocked_out < 1) affected_mob.pain.apply_pain(PAIN_CHESTBURST_WEAK) affected_mob.visible_message(SPAN_DANGER("\The [affected_mob] starts shaking uncontrollably!"), \ - SPAN_DANGER("You start shaking uncontrollably!")) - affected_mob.apply_effect(10, PARALYZE) + SPAN_DANGER("You feel something moving inside you! You start shaking uncontrollably!")) + affected_mob.apply_effect(2, PARALYZE) affected_mob.make_jittery(105) affected_mob.take_limb_damage(1) + if(4) if(prob(2)) affected_mob.pain.apply_pain(PAIN_CHESTBURST_WEAK) var/message = pick("Your chest hurts badly", "It becomes difficult to breathe", "Your heart starts beating rapidly, and each beat is painful") @@ -129,6 +137,14 @@ to_chat(affected_mob, message) if(prob(50)) affected_mob.emote("scream") + if(prob(6)) + if(affected_mob.knocked_out < 1) + affected_mob.pain.apply_pain(PAIN_CHESTBURST_WEAK) + affected_mob.visible_message(SPAN_DANGER("[affected_mob] starts shaking uncontrollably!"), \ + SPAN_DANGER("You feel something moving inside you! You start shaking uncontrollably!")) + affected_mob.apply_effect(3, PARALYZE) + affected_mob.make_jittery(105) + affected_mob.take_limb_damage(1) if(5) become_larva() if(6) diff --git a/code/modules/mob/living/carbon/xenomorph/Evolution.dm b/code/modules/mob/living/carbon/xenomorph/Evolution.dm index 4806f7528582..d8767ffce87a 100644 --- a/code/modules/mob/living/carbon/xenomorph/Evolution.dm +++ b/code/modules/mob/living/carbon/xenomorph/Evolution.dm @@ -39,7 +39,7 @@ if(!evolve_checks()) return - if((!hive.living_xeno_queen) && castepick != XENO_CASTE_QUEEN && !islarva(src) && !hive.allow_no_queen_actions) + if((!hive.living_xeno_queen) && castepick != XENO_CASTE_QUEEN && !islarva(src) && !hive.allow_no_queen_evo) to_chat(src, SPAN_WARNING("The Hive is shaken by the death of the last Queen. You can't find the strength to evolve.")) return diff --git a/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm b/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm index 09fdb42ad5c3..667367339698 100644 --- a/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm +++ b/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm @@ -71,7 +71,7 @@ if(caste && caste.evolution_allowed) evolve_progress = "[min(stored_evolution, evolution_threshold)]/[evolution_threshold]" - if(hive && !hive.allow_no_queen_actions && !caste?.evolve_without_queen) + if(hive && !hive.allow_no_queen_evo && !caste?.evolve_without_queen) if(!hive.living_xeno_queen) evolve_progress += " (NO QUEEN)" else if(!(hive.living_xeno_queen.ovipositor || hive.evolution_without_ovipositor)) diff --git a/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm b/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm index 5586da3765dc..dd53868caf36 100644 --- a/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm +++ b/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm @@ -271,27 +271,40 @@ // ////////////////////////////////////////////////////////////////// var/tunnel = FALSE - var/stealth = FALSE // for check on lurker invisibility + /// for check on lurker invisibility + var/stealth = FALSE var/burrow = FALSE var/fortify = FALSE var/crest_defense = FALSE - var/agility = FALSE // 0 - upright, 1 - all fours + /// 0/FALSE - upright, 1/TRUE - all fours + var/agility = FALSE var/ripping_limb = FALSE var/steelcrest = FALSE - // Related to zooming out (primarily queen and boiler) - var/devour_timer = 0 // The world.time at which we will regurgitate our currently-vored victim - var/extra_build_dist = 0 // For drones/hivelords. Extends the maximum build range they have + /// The world.time at which we will regurgitate our currently-vored victim + var/devour_timer = 0 + /// For drones/hivelords. Extends the maximum build range they have + var/extra_build_dist = 0 + /// tiles from self you can plant eggs. + var/egg_planting_range = 1 var/can_stack_builds = FALSE var/list/resin_build_order - var/selected_resin // Which resin structure to build when we secrete resin, defaults to null. - var/selected_construction = XENO_STRUCTURE_CORE //which special structure to build when we place constructions - var/selected_mark // If leader what mark you will place when you make one - var/datum/ammo/xeno/ammo = null //The ammo datum for our spit projectiles. We're born with this, it changes sometimes. + /// Which resin structure to build when we secrete resin, defaults to null. + var/selected_resin + /// which special structure to build when we place constructions + var/selected_construction = XENO_STRUCTURE_CORE + /// If leader what mark you will place when you make one + var/selected_mark + /// The ammo datum for our spit projectiles. We're born with this, it changes sometimes. + var/datum/ammo/xeno/ammo = null var/tunnel_delay = 0 - var/list/available_fruits = list() // List of placeable the xenomorph has access to. - var/list/current_fruits = list() // If we have current_fruits that are limited, e.g. fruits - var/max_placeable = 0 // Limit to that amount - var/obj/effect/alien/resin/fruit/selected_fruit = null // the typepath of the placeable we wanna put down + /// List of placeable the xenomorph has access to. + var/list/available_fruits = list() + /// If we have current_fruits that are limited, e.g. fruits + var/list/current_fruits = list() + /// Limit to that amount + var/max_placeable = 0 + /// the typepath of the placeable we wanna put down + var/obj/effect/alien/resin/fruit/selected_fruit = null var/list/built_structures = list() var/icon_xeno @@ -1112,3 +1125,8 @@ SPAN_WARNING("You squeeze and scuttle underneath [current_structure]."), max_distance = 5) forceMove(current_structure.loc) return TRUE + +/mob/living/carbon/xenomorph/knocked_down_callback() + . = ..() + if(!resting) // !resting because we dont wanna prematurely update wounds if they're just trying to rest + update_wounds() diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm index a999836c00db..a9cffb196cb3 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm @@ -506,7 +506,9 @@ var/mob/living/carbon/xenomorph/xeno = owner if(!xeno.check_state(TRUE)) return - if (!action_cooldown_check()) + if(!action_cooldown_check()) + return + if(xeno.action_busy) return if(xeno.layer != XENO_HIDING_LAYER) xeno.layer = XENO_HIDING_LAYER diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm b/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm index d82e43db2aaf..79a5f986ea10 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm @@ -149,7 +149,7 @@ /mob/living/carbon/xenomorph/facehugger/proc/handle_hug(mob/living/carbon/human/human) var/obj/item/clothing/mask/facehugger/hugger = new /obj/item/clothing/mask/facehugger(loc, hivenumber) - var/did_hug = hugger.attach(human, TRUE, 0.5, src) + var/did_hug = hugger.attach(human, TRUE, 1, src) if(client) client.player_data?.adjust_stat(PLAYER_STAT_FACEHUGS, STAT_CATEGORY_XENO, 1) qdel(src) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Predalien.dm b/code/modules/mob/living/carbon/xenomorph/castes/Predalien.dm index c7970e017c4b..14aa31b1f1e8 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Predalien.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Predalien.dm @@ -136,12 +136,18 @@ Your health meter will not regenerate normally, so kill and die for the hive!= WEED_LEVEL_HIVE && W.linked_hive.hivenumber == hivenumber) - hive_weeds = W + var/obj/effect/alien/weeds/hive_weeds + var/obj/effect/alien/weeds/any_weeds + for(var/obj/effect/alien/weeds/weed in T) + if(weed.weed_strength >= WEED_LEVEL_HIVE && weed.linked_hive.hivenumber == hivenumber) + hive_weeds = weed break + if(weed.weed_strength >= WEED_LEVEL_WEAK && weed.linked_hive.hivenumber == hivenumber) //check for ANY weeds + any_weeds = weed - if(!hive_weeds) - var/datum/hive_status/hive = GLOB.hive_datum[hivenumber] + var/datum/hive_status/hive = GLOB.hive_datum[hivenumber] + if(!any_weeds && !hive_weeds) //you need at least some weeds to plant on. + to_chat(user, SPAN_XENOWARNING("[src] must be planted on [lowertext(hive.prefix)]weeds.")) + return + + if(!hive_weeds && user.mutation_type != CARRIER_EGGSAC) to_chat(user, SPAN_XENOWARNING("[src] can only be planted on [lowertext(hive.prefix)]hive weeds.")) return @@ -106,8 +116,8 @@ if(!user.check_plasma(30)) return - for(var/obj/effect/alien/weeds/W in T) - if(W.weed_strength >= WEED_LEVEL_HIVE) + for(var/obj/effect/alien/weeds/weed in T) + if(weed.weed_strength >= WEED_LEVEL_HIVE || user.mutation_type == CARRIER_EGGSAC) user.use_plasma(30) var/obj/effect/alien/egg/newegg = new /obj/effect/alien/egg(T, hivenumber) diff --git a/code/modules/mob/living/carbon/xenomorph/hive_faction.dm b/code/modules/mob/living/carbon/xenomorph/hive_faction.dm index 1eb5818674fd..10af37b8d8e8 100644 --- a/code/modules/mob/living/carbon/xenomorph/hive_faction.dm +++ b/code/modules/mob/living/carbon/xenomorph/hive_faction.dm @@ -57,4 +57,5 @@ GLOBAL_LIST_INIT(hive_alliable_factions, generate_alliable_factions()) var/should_ally = text2num(params["should_ally"]) assoc_hive.allies[params["target_faction"]] = should_ally + assoc_hive.on_stance_change(params["target_faction"]) . = TRUE diff --git a/code/modules/mob/living/carbon/xenomorph/items/iff_tag.dm b/code/modules/mob/living/carbon/xenomorph/items/iff_tag.dm index cde9cd072a95..4c63fc2b5923 100644 --- a/code/modules/mob/living/carbon/xenomorph/items/iff_tag.dm +++ b/code/modules/mob/living/carbon/xenomorph/items/iff_tag.dm @@ -19,6 +19,8 @@ injector.visible_message(SPAN_NOTICE("[injector] forces \the [src] into [xeno]'s carapace!"), SPAN_NOTICE("You force \the [src] into [xeno]'s carapace!")) xeno.iff_tag = src injector.drop_inv_item_to_loc(src, xeno) + if(xeno.hive.hivenumber == XENO_HIVE_RENEGADE) //it's important to know their IFF settings for renegade + to_chat(xeno, SPAN_NOTICE("With the insertion of the device into your carapace, your instincts have changed compelling you to protect [english_list(faction_groups, "no one")].")) return return ..() @@ -48,6 +50,8 @@ if("Remove") faction_groups = list() to_chat(programmer, SPAN_NOTICE("You [option] the IFF group data, the IFF group on the tag now reads as: [english_list(faction_groups, "None")]")) + if(xeno?.hive.hivenumber == XENO_HIVE_RENEGADE) //it's important to know their IFF settings for renegade + to_chat(xeno, SPAN_NOTICE("Your instincts have changed, you seem compelled to protect [english_list(faction_groups, "no one")].")) return TRUE /obj/item/iff_tag/pmc_handler diff --git a/code/modules/mob/living/carbon/xenomorph/life.dm b/code/modules/mob/living/carbon/xenomorph/life.dm index 842e3b45a76d..6f9a667642e3 100644 --- a/code/modules/mob/living/carbon/xenomorph/life.dm +++ b/code/modules/mob/living/carbon/xenomorph/life.dm @@ -42,7 +42,7 @@ var/progress_amount = 1 if(SSxevolution) progress_amount = SSxevolution.get_evolution_boost_power(hive.hivenumber) - var/ovipositor_check = (hive.allow_no_queen_actions || hive.evolution_without_ovipositor || (hive.living_xeno_queen && hive.living_xeno_queen.ovipositor)) + var/ovipositor_check = (hive.allow_no_queen_evo || hive.evolution_without_ovipositor || (hive.living_xeno_queen && hive.living_xeno_queen.ovipositor)) if(caste && caste.evolution_allowed && (ovipositor_check || caste?.evolve_without_queen)) if(evolution_stored >= evolution_threshold) if(!got_evolution_message) @@ -334,11 +334,6 @@ Make sure their actual health updates immediately.*/ if(!T || !istype(T)) return - var/is_runner_hiding - - if(isrunner(src) && layer != initial(layer)) - is_runner_hiding = 1 - if(caste) if(caste.innate_healing || check_weeds_for_healing()) if(!hive) return // can't heal if you have no hive, sorry bud @@ -369,9 +364,8 @@ Make sure their actual health updates immediately.*/ if(armor_integrity > armor_integrity_max) armor_integrity = armor_integrity_max - else //Xenos restore plasma VERY slowly off weeds, regardless of health, as long as they are not using special abilities - if(prob(50) && !is_runner_hiding && !current_aura) - plasma_stored += 0.1 * plasma_max / 100 + else if(prob(50) && !current_aura) //Xenos restore plasma VERY slowly off weeds, regardless of health, as long as they are not using special abilities + plasma_stored += 0.1 * plasma_max / 100 for(var/datum/action/xeno_action/action in src.actions) diff --git a/code/modules/mob/living/carbon/xenomorph/mutators/strains/carrier/eggsac.dm b/code/modules/mob/living/carbon/xenomorph/mutators/strains/carrier/eggsac.dm index 436adb79e5aa..7e5773e5aec5 100644 --- a/code/modules/mob/living/carbon/xenomorph/mutators/strains/carrier/eggsac.dm +++ b/code/modules/mob/living/carbon/xenomorph/mutators/strains/carrier/eggsac.dm @@ -1,6 +1,6 @@ /datum/xeno_mutator/eggsac name = "STRAIN: Carrier - Eggsac" - description = "In exchange for your ability to store huggers and place traps, you gain larger plasma stores, strong pheromones, and the ability to lay eggs by using your plasma stores. In addition, you can now carry twelve eggs at once and can place eggs one pace further than normal." + description = "In exchange for your ability to store huggers and place traps, you gain larger plasma stores, strong pheromones, and the ability to lay eggs by using your plasma stores. In addition, you can now carry twelve eggs at once, can plant eggs of non-hive weeds, and can place eggs one pace further than normal" flavor_description = "An egg is always an adventure; the next one may be different." cost = MUTATOR_COST_EXPENSIVE individual_only = TRUE @@ -39,7 +39,7 @@ carrier.update_hugger_overlays() carrier.update_eggsac_overlays() carrier.eggs_max = 12 - carrier.extra_build_dist = 1 + carrier.egg_planting_range = 2 return TRUE /datum/action/xeno_action/active_toggle/generate_egg @@ -75,4 +75,5 @@ if(egg_generation_progress >= 15) egg_generation_progress = 0 xeno.eggs_cur++ + to_chat(xeno, SPAN_XENONOTICE("You generate a egg. Now sheltering: [xeno.eggs_cur] / [xeno.eggs_max].")) xeno.update_icons() diff --git a/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm b/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm index eaff5a66309e..bb58d2cf2a03 100644 --- a/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm +++ b/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm @@ -295,8 +295,9 @@ var/evolution_bonus = 0 var/allow_no_queen_actions = FALSE + var/allow_no_queen_evo = FALSE var/evolution_without_ovipositor = TRUE //Temporary for the roundstart. - /// Set to true if you want to prevent evolutions into Queens + /// Set to false if you want to prevent evolutions into Queens var/allow_queen_evolve = TRUE /// Set to true if you want to prevent bursts and spawns of new xenos. Will also prevent healing if the queen no longer exists var/hardcore = FALSE @@ -812,16 +813,6 @@ #undef OPEN_SLOTS #undef GUARANTEED_SLOTS -// returns if that location can be used to plant eggs -/datum/hive_status/proc/in_egg_plant_range(turf/T) - if(!istype(living_xeno_queen)) - return TRUE // xenos already dicked without queen. Let them plant whereever - - if(!living_xeno_queen.ovipositor) - return FALSE // ovid queen only - - return get_dist(living_xeno_queen, T) <= egg_planting_range - /datum/hive_status/proc/can_build_structure(structure_name) if(!structure_name || !hive_structures_limit[structure_name]) return FALSE @@ -1054,6 +1045,7 @@ hugger.visible_message(SPAN_XENODANGER("A facehugger suddenly emerges out of \the [A]!"), SPAN_XENODANGER("You emerge out of \the [A] and awaken from your slumber. For the Hive!")) playsound(hugger, 'sound/effects/xeno_newlarva.ogg', 25, TRUE) hugger.generate_name() + hugger.timeofdeath = user.timeofdeath // Keep old death time /datum/hive_status/proc/update_lesser_drone_limit() lesser_drone_limit = Ceiling(totalXenos.len / 3) @@ -1121,13 +1113,15 @@ need_round_end_check = TRUE -/datum/hive_status/corrupted/add_xeno(mob/living/carbon/xenomorph/X) + var/list/defectors = list() + +/datum/hive_status/corrupted/add_xeno(mob/living/carbon/xenomorph/xeno) . = ..() - X.add_language(LANGUAGE_ENGLISH) + xeno.add_language(LANGUAGE_ENGLISH) -/datum/hive_status/corrupted/remove_xeno(mob/living/carbon/xenomorph/X, hard) +/datum/hive_status/corrupted/remove_xeno(mob/living/carbon/xenomorph/xeno, hard) . = ..() - X.remove_language(LANGUAGE_ENGLISH) + xeno.remove_language(LANGUAGE_ENGLISH) /datum/hive_status/corrupted/can_delay_round_end(mob/living/carbon/xenomorph/xeno) if(!faction_is_ally(FACTION_MARINE, TRUE)) @@ -1190,6 +1184,7 @@ destruction_allowed = XENO_NOBODY dynamic_evolution = FALSE allow_no_queen_actions = TRUE + allow_no_queen_evo = TRUE allow_queen_evolve = FALSE ignore_slots = TRUE latejoin_burrowed = FALSE @@ -1204,6 +1199,7 @@ dynamic_evolution = FALSE allow_no_queen_actions = TRUE + allow_no_queen_evo = TRUE allow_queen_evolve = FALSE ignore_slots = TRUE latejoin_burrowed = FALSE @@ -1221,6 +1217,7 @@ dynamic_evolution = FALSE allow_no_queen_actions = TRUE + allow_no_queen_evo = TRUE allow_queen_evolve = FALSE ignore_slots = TRUE latejoin_burrowed = FALSE @@ -1250,6 +1247,7 @@ dynamic_evolution = FALSE allow_no_queen_actions = TRUE + allow_no_queen_evo = TRUE allow_queen_evolve = FALSE ignore_slots = TRUE latejoin_burrowed = FALSE @@ -1305,6 +1303,123 @@ return ..() +/datum/hive_status/corrupted/renegade + name = "Renegade Hive" + reporting_id = "renegade" + hivenumber = XENO_HIVE_RENEGADE + prefix = "Renegade " + color = "#9c7a4d" + ui_color ="#80705c" + + dynamic_evolution = FALSE + allow_queen_evolve = FALSE + allow_no_queen_evo = TRUE + latejoin_burrowed = FALSE + +/datum/hive_status/corrupted/renegade/New() + . = ..() + hive_structures_limit[XENO_STRUCTURE_EGGMORPH] = 0 + hive_structures_limit[XENO_STRUCTURE_EVOPOD] = 0 + for(var/faction in FACTION_LIST_HUMANOID) //renegades allied to all humanoids, but it mostly affects structures. Their ability to attack humanoids and other xenos (including of the same hive) depends on iff settings + allies[faction] = TRUE + +/datum/hive_status/corrupted/renegade/can_spawn_as_hugger(mob/dead/observer/user) + to_chat(user, SPAN_WARNING("The [name] cannot support facehuggers.")) + return FALSE + +/datum/hive_status/corrupted/renegade/proc/iff_protection_check(mob/living/carbon/xenomorph/xeno, mob/living/carbon/attempt_harm_mob) + if(xeno == attempt_harm_mob) + return TRUE //you cannot hurt yourself... + if(!xeno.iff_tag) + return FALSE //can attack anyone if you don't have iff tag + if(isxeno(attempt_harm_mob)) + var/mob/living/carbon/xenomorph/target_xeno = attempt_harm_mob + if(!target_xeno.iff_tag) + return FALSE //can attack any xeno who don't have iff tag + for(var/faction in xeno.iff_tag.faction_groups) + if(faction in target_xeno.iff_tag.faction_groups) + return TRUE //cannot attack xenos with same iff setting + return FALSE + for(var/faction in xeno.iff_tag.faction_groups) + if(faction in attempt_harm_mob.faction_group) + return TRUE //cannot attack mob if iff is set to at least one of its factions + return FALSE + +/datum/hive_status/corrupted/renegade/faction_is_ally(faction, ignore_queen_check = TRUE) + return ..() + +/datum/hive_status/proc/on_stance_change(faction) + if(!living_xeno_queen) + return + if(allies[faction]) + xeno_message(SPAN_XENOANNOUNCE("Your Queen set up an alliance with [faction]!"), 3, hivenumber) + else + xeno_message(SPAN_XENOANNOUNCE("Your Queen broke the alliance with [faction]!"), 3, hivenumber) + + for(var/number in GLOB.hive_datum) + var/datum/hive_status/target_hive = GLOB.hive_datum[number] + if(target_hive.name != faction) + continue + if(!target_hive.living_xeno_queen && !target_hive.allow_no_queen_actions) + return + if(allies[faction]) + xeno_message(SPAN_XENOANNOUNCE("You sense that [name] Queen set up an alliance with us!"), 3, target_hive.hivenumber) + return + + xeno_message(SPAN_XENOANNOUNCE("You sense that [name] Queen broke the alliance with us!"), 3, target_hive.hivenumber) + +/datum/hive_status/corrupted/on_stance_change(faction) + . = ..() + if(allies[faction]) + return + if(!(faction in FACTION_LIST_HUMANOID)) + return + + for(var/mob/living/carbon/xenomorph/xeno in totalXenos) // handle defecting xenos on betrayal + if(!xeno.iff_tag) + continue + if(!(faction in xeno.iff_tag.faction_groups)) + continue + if(xeno in defectors) + continue + if(xeno.caste_type == XENO_CASTE_QUEEN) + continue + INVOKE_ASYNC(src, PROC_REF(give_defection_choice), xeno, faction) + addtimer(CALLBACK(src, PROC_REF(handle_defectors), faction), 11 SECONDS) + +/datum/hive_status/corrupted/proc/give_defection_choice(mob/living/carbon/xenomorph/xeno, faction) + if(tgui_alert(xeno, "Your Queen has broken the alliance with the [faction]. The device inside your carapace begins to suppress your connection with the Hive. Do you remove it and stay loyal to her?", "Alliance broken!", list("Stay loyal", "Obey the talls"), 10 SECONDS) == "Obey the talls") + if(!xeno.iff_tag) + to_chat(xeno, SPAN_XENOWARNING("It's too late now. The device is gone and your service to the Queen continues.")) + return + defectors += xeno + xeno.set_hive_and_update(XENO_HIVE_RENEGADE) + to_chat(xeno, SPAN_XENOANNOUNCE("You lost the connection with your Hive. Now you have no Queen, only your masters.")) + to_chat(xeno, SPAN_NOTICE("Your instincts have changed, you seem compelled to protect [english_list(xeno.iff_tag.faction_groups, "no one")].")) + return + xeno.visible_message(SPAN_XENOWARNING("[xeno] rips out [xeno.iff_tag]!"), SPAN_XENOWARNING("You rip out [xeno.iff_tag]! For the Hive!")) + xeno.adjustBruteLoss(50) + xeno.iff_tag.forceMove(get_turf(xeno)) + xeno.iff_tag = null + +/datum/hive_status/corrupted/proc/handle_defectors(faction) + for(var/mob/living/carbon/xenomorph/xeno in totalXenos) + if(!xeno.iff_tag) + continue + if(xeno in defectors) + continue + if(!(faction in xeno.iff_tag.faction_groups)) + continue + xeno.visible_message(SPAN_XENOWARNING("[xeno] rips out [xeno.iff_tag]!"), SPAN_XENOWARNING("You rip out [xeno.iff_tag]! For the hive!")) + xeno.adjustBruteLoss(50) + xeno.iff_tag.forceMove(get_turf(xeno)) + xeno.iff_tag = null + if(!length(defectors)) + return + + xeno_message(SPAN_XENOANNOUNCE("You sense that [english_list(defectors)] turned their backs against their sisters and the Queen in favor of their slavemasters!"), 3, hivenumber) + defectors.Cut() + //Xeno Resin Mark Shit, the very best place for it too :0) //Defines at the bottom of this list here will show up at the top in the mark menu /datum/xeno_mark_define diff --git a/code/modules/mob/living/carbon/xenomorph/xeno_verbs.dm b/code/modules/mob/living/carbon/xenomorph/xeno_verbs.dm index 6b37145ad7a1..583d26de3ee5 100644 --- a/code/modules/mob/living/carbon/xenomorph/xeno_verbs.dm +++ b/code/modules/mob/living/carbon/xenomorph/xeno_verbs.dm @@ -25,6 +25,13 @@ if(!hive) return + if(hive.hivenumber == XENO_HIVE_RENEGADE) //Renegade's ability to attack someone depends on IFF settings, not on alliance + if(!iff_tag) + to_chat(src, SPAN_NOTICE("You are not obligated to protect anyone.")) + return + to_chat(src, SPAN_NOTICE("You seem compelled to protect [english_list(iff_tag.faction_groups, "no one")].")) + return + if((!hive.living_xeno_queen || Check_WO()) && !hive.allow_no_queen_actions) //No Hive status on WO to_chat(src, SPAN_WARNING("There is no Queen. You are alone.")) return diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 0c182fb0fe9c..06df71427e4f 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -594,8 +594,8 @@ below 100 is not dizzy if(!istype(src, /mob/living/carbon/human)) // for the moment, only humans get dizzy return - dizziness = min(1000, dizziness + amount) // store what will be new value - // clamped to max 1000 + dizziness = min(500, dizziness + amount) // store what will be new value + // clamped to max 500 if(dizziness > 100 && !is_dizzy) INVOKE_ASYNC(src, PROC_REF(dizzy_process)) @@ -609,16 +609,22 @@ note dizziness decrements automatically in the mob's Life() proc. is_dizzy = 1 while(dizziness > 100) if(client) - var/amplitude = dizziness*(sin(dizziness * 0.044 * world.time) + 1) / 70 - client.pixel_x = amplitude * sin(0.008 * dizziness * world.time) - client.pixel_y = amplitude * cos(0.008 * dizziness * world.time) - + if(buckled || resting) + client.pixel_x = 0 + client.pixel_y = 0 + else + var/amplitude = dizziness*(sin(dizziness * 0.044 * world.time) + 1) / 70 + client.pixel_x = amplitude * sin(0.008 * dizziness * world.time) + client.pixel_y = amplitude * cos(0.008 * dizziness * world.time) + if(prob(1)) + to_chat(src, "The dizziness is becoming unbearable! It should pass faster if you lie down.") sleep(1) //endwhile - reset the pixel offsets to zero is_dizzy = 0 if(client) client.pixel_x = 0 client.pixel_y = 0 + to_chat(src, "The dizziness has passed, you're starting to feel better.") // jitteriness - copy+paste of dizziness diff --git a/code/modules/projectiles/gun_attachables.dm b/code/modules/projectiles/gun_attachables.dm index 001cd9fbe10c..2a77a6ba6a68 100644 --- a/code/modules/projectiles/gun_attachables.dm +++ b/code/modules/projectiles/gun_attachables.dm @@ -1315,15 +1315,17 @@ Defined in conflicts.dm of the #defines folder. /obj/item/attachable/stock/hg3712/New() ..() - //it makes stuff much better when two-handed - accuracy_mod = HIT_ACCURACY_MULT_TIER_4 - recoil_mod = -RECOIL_AMOUNT_TIER_4 - scatter_mod = -SCATTER_AMOUNT_TIER_8 - movement_onehanded_acc_penalty_mod = -MOVEMENT_ACCURACY_PENALTY_MULT_TIER_5 - //it makes stuff much worse when one handed - accuracy_unwielded_mod = -HIT_ACCURACY_MULT_TIER_3 - recoil_unwielded_mod = RECOIL_AMOUNT_TIER_4 - scatter_unwielded_mod = SCATTER_AMOUNT_TIER_8 + + //HG stock is purely aesthetics, any changes should be done to the gun itself + accuracy_mod = 0 + recoil_mod = 0 + scatter_mod = 0 + movement_onehanded_acc_penalty_mod = 0 + accuracy_unwielded_mod = 0 + recoil_unwielded_mod = 0 + scatter_unwielded_mod = 0 + aim_speed_mod = 0 + wield_delay_mod = WIELD_DELAY_NONE /obj/item/attachable/stock/hg3712/m3717 name = "hg3717 stock" @@ -2323,6 +2325,9 @@ Defined in conflicts.dm of the #defines folder. burn_level = BURN_LEVEL_TIER_5 burn_duration = BURN_TIME_TIER_2 +/obj/item/attachable/attached_gun/flamer/advanced/unique_action(mob/user) + return //No need for volatile mode, it already does high damage by default + /obj/item/attachable/attached_gun/flamer/advanced/integrated name = "integrated flamethrower" diff --git a/code/modules/reagents/chemistry_reactions/food_drink.dm b/code/modules/reagents/chemistry_reactions/food_drink.dm index 9864af675cee..7e3fdac324f7 100644 --- a/code/modules/reagents/chemistry_reactions/food_drink.dm +++ b/code/modules/reagents/chemistry_reactions/food_drink.dm @@ -160,16 +160,16 @@ new /obj/item/reagent_container/food/snacks/sliceable/cheesewheel/immature(location) -/datum/chemical_reaction/syntiflesh - name = "Syntiflesh" - id = "syntiflesh" +/datum/chemical_reaction/synthmeat + name = "synthmeat" + id = "synthmeat" result = null required_reagents = list("blood" = 5, "clonexadone" = 1) result_amount = 1 -/datum/chemical_reaction/syntiflesh/on_reaction(datum/reagents/holder, created_volume) +/datum/chemical_reaction/synthmeat/on_reaction(datum/reagents/holder, created_volume) var/location = get_turf(holder.my_atom) - new /obj/item/reagent_container/food/snacks/meat/syntiflesh(location) + new /obj/item/reagent_container/food/snacks/meat/synthmeat(location) /datum/chemical_reaction/hot_ramen diff --git a/code/modules/shuttle/computers/escape_pod_computer.dm b/code/modules/shuttle/computers/escape_pod_computer.dm index a28f2bfd2d60..99a989ab2e9f 100644 --- a/code/modules/shuttle/computers/escape_pod_computer.dm +++ b/code/modules/shuttle/computers/escape_pod_computer.dm @@ -204,11 +204,18 @@ heat_proof = 1 unslashable = TRUE unacidable = TRUE + var/obj/docking_port/mobile/escape_shuttle/linked_shuttle /obj/structure/machinery/door/airlock/evacuation/Initialize() . = ..() INVOKE_ASYNC(src, PROC_REF(lock)) +/obj/structure/machinery/door/airlock/evacuation/Destroy() + if(linked_shuttle) + linked_shuttle.mode = SHUTTLE_CRASHED + linked_shuttle.door_handler.doors -= list(src) + . = ..() + //Can't interact with them, mostly to prevent grief and meta. /obj/structure/machinery/door/airlock/evacuation/Collided() return FALSE @@ -219,8 +226,24 @@ /obj/structure/machinery/door/airlock/evacuation/attack_hand() return FALSE -/obj/structure/machinery/door/airlock/evacuation/attack_alien() - return FALSE //Probably a better idea that these cannot be forced open. +/obj/structure/machinery/door/airlock/evacuation/attack_alien(mob/living/carbon/xenomorph/xeno) + if(!density || unslashable) //doors become slashable after evac is called + return FALSE + + if(xeno.claw_type < CLAW_TYPE_SHARP) + to_chat(xeno, SPAN_WARNING("[src] is bolted down tight.")) + return XENO_NO_DELAY_ACTION + + xeno.animation_attack_on(src) + playsound(src, 'sound/effects/metalhit.ogg', 25, 1) + take_damage(HEALTH_DOOR / XENO_HITS_TO_DESTROY_BOLTED_DOOR) + return XENO_ATTACK_ACTION + /obj/structure/machinery/door/airlock/evacuation/attack_remote() return FALSE + +/obj/structure/machinery/door/airlock/evacuation/get_applying_acid_time() //you can melt evacuation doors only when they are manually locked + if(!density) + return -1 + return ..() diff --git a/code/modules/shuttle/shuttles/escape_shuttle.dm b/code/modules/shuttle/shuttles/escape_shuttle.dm index 6c580f9f163b..859aa45aceb3 100644 --- a/code/modules/shuttle/shuttles/escape_shuttle.dm +++ b/code/modules/shuttle/shuttles/escape_shuttle.dm @@ -9,7 +9,8 @@ ignitionTime = 8 SECONDS ignition_sound = 'sound/effects/escape_pod_warmup.ogg' /// The % chance of the escape pod crashing into the groundmap - var/crash_land_chance = 33 + var/early_crash_land_chance = 75 + var/crash_land_chance = 25 var/datum/door_controller/single/door_handler = new() var/launched = FALSE @@ -19,11 +20,12 @@ /obj/docking_port/mobile/escape_shuttle/Initialize(mapload) . = ..(mapload) for(var/place in shuttle_areas) - for(var/obj/structure/machinery/door/air in place) + for(var/obj/structure/machinery/door/airlock/evacuation/air in place) door_handler.doors += list(air) air.breakable = FALSE air.indestructible = TRUE air.unacidable = TRUE + air.linked_shuttle = src /obj/docking_port/mobile/escape_shuttle/proc/cancel_evac() door_handler.control_doors("force-unlock") @@ -43,6 +45,12 @@ for(var/area/interior_area in shuttle_areas) for(var/obj/structure/machinery/cryopod/evacuation/cryotube in interior_area) cryotube.dock_state = STATE_READY + for(var/obj/structure/machinery/door/air in door_handler.doors) + air.breakable = TRUE + air.indestructible = FALSE + air.unslashable = FALSE + air.unacidable = FALSE + /obj/docking_port/mobile/escape_shuttle/proc/evac_launch() if(mode == SHUTTLE_CRASHED) @@ -76,7 +84,7 @@ return destination = null - if(prob(crash_land_chance)) + if(prob((EvacuationAuthority.evac_status >= EVACUATION_STATUS_IN_PROGRESS ? crash_land_chance : early_crash_land_chance))) create_crash_point() set_mode(SHUTTLE_IGNITING) @@ -84,6 +92,16 @@ setTimer(ignitionTime) launched = TRUE + if(!crash_land) // so doors won't break in space + for(var/obj/structure/machinery/door/air in door_handler.doors) + for(var/obj/effect/xenomorph/acid/acid in air.loc) + if(acid.acid_t == air) + qdel(acid) + air.breakable = FALSE + air.indestructible = TRUE + air.unacidable = TRUE + + /obj/docking_port/mobile/escape_shuttle/proc/create_crash_point() for(var/i = 1 to 10) var/list/all_ground_levels = SSmapping.levels_by_trait(ZTRAIT_GROUND) @@ -191,6 +209,8 @@ id = ESCAPE_SHUTTLE_EAST_CL width = 4 height = 5 + early_crash_land_chance = 25 + crash_land_chance = 5 /obj/docking_port/mobile/escape_shuttle/w id = ESCAPE_SHUTTLE_WEST diff --git a/code/modules/tents/deployed_tents.dm b/code/modules/tents/deployed_tents.dm index 28bf11a38a6a..fc9a69d2366c 100644 --- a/code/modules/tents/deployed_tents.dm +++ b/code/modules/tents/deployed_tents.dm @@ -149,10 +149,10 @@ icon_state = "big_interior" roof_state = "big_top" x_dim = 3 - y_dim = 3 + y_dim = 4 /obj/structure/tent/reqs icon_state = "reqs_interior" roof_state = "reqs_top" x_dim = 4 - y_dim = 3 + y_dim = 4 diff --git a/code/modules/unit_tests/_unit_tests.dm b/code/modules/unit_tests/_unit_tests.dm index 010cba770ce2..7e620b6bc1fa 100644 --- a/code/modules/unit_tests/_unit_tests.dm +++ b/code/modules/unit_tests/_unit_tests.dm @@ -85,7 +85,7 @@ #include "unit_test.dm" #include "spawn_humans.dm" #include "check_runtimes.dm" -#include "wj_emotes.dm" +#include "emote_panels.dm" #undef TEST_ASSERT #undef TEST_ASSERT_EQUAL diff --git a/code/modules/unit_tests/emote_panels.dm b/code/modules/unit_tests/emote_panels.dm new file mode 100644 index 000000000000..87bbd5e15620 --- /dev/null +++ b/code/modules/unit_tests/emote_panels.dm @@ -0,0 +1,11 @@ +/// Test that all emotes for Working Joes & Yautja have a category +/datum/unit_test/emote_panels + +/datum/unit_test/emote_panels/Run() + for(var/datum/emote/living/carbon/human/synthetic/working_joe/wj_emote as anything in subtypesof(/datum/emote/living/carbon/human/synthetic/working_joe)) + if(!initial(wj_emote.category)) + TEST_FAIL("Emote [wj_emote] did not have a category!") + + for(var/datum/emote/living/carbon/human/yautja/yautja_emote as anything in subtypesof(/datum/emote/living/carbon/human/yautja)) + if(!initial(yautja_emote.category)) + TEST_FAIL("Emote [yautja_emote] did not have a category!") diff --git a/code/modules/unit_tests/missing_icons.dm b/code/modules/unit_tests/missing_icons.dm index 53abbed70d6a..44f135ae34fb 100644 --- a/code/modules/unit_tests/missing_icons.dm +++ b/code/modules/unit_tests/missing_icons.dm @@ -19,6 +19,7 @@ /datum/unit_test/missing_icons/Run() generate_possible_icon_states_list() generate_possible_icon_states_list("icons/effects/") + generate_possible_icon_states_list("icons/mobs/") if(additional_icon_location) generate_possible_icon_states_list(additional_icon_location) diff --git a/code/modules/unit_tests/wj_emotes.dm b/code/modules/unit_tests/wj_emotes.dm deleted file mode 100644 index f89757665011..000000000000 --- a/code/modules/unit_tests/wj_emotes.dm +++ /dev/null @@ -1,7 +0,0 @@ -/// Test that all working joe emotes have a category -/datum/unit_test/wj_emotes - -/datum/unit_test/wj_emotes/Run() - for(var/datum/emote/living/carbon/human/synthetic/working_joe/emote as anything in subtypesof(/datum/emote/living/carbon/human/synthetic/working_joe)) - if(!initial(emote.category)) - TEST_FAIL("Emote [emote] did not have a category!") diff --git a/colonialmarines.dme b/colonialmarines.dme index 44d7ab6db1d6..2b3b08984dfa 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -52,6 +52,7 @@ #include "code\__DEFINES\db_defs.dm" #include "code\__DEFINES\defenses.dm" #include "code\__DEFINES\dropships.dm" +#include "code\__DEFINES\emote_panels.dm" #include "code\__DEFINES\equipment.dm" #include "code\__DEFINES\events.dm" #include "code\__DEFINES\fire.dm" @@ -112,7 +113,6 @@ #include "code\__DEFINES\vv.dm" #include "code\__DEFINES\weapon_stats.dm" #include "code\__DEFINES\weather.dm" -#include "code\__DEFINES\wj_emotes.dm" #include "code\__DEFINES\xeno.dm" #include "code\__DEFINES\dcs\flags.dm" #include "code\__DEFINES\dcs\helpers.dm" @@ -1789,12 +1789,10 @@ #include "code\modules\mob\living\carbon\human\powers\human_powers.dm" #include "code\modules\mob\living\carbon\human\powers\issue_order.dm" #include "code\modules\mob\living\carbon\human\species\emote-monkey.dm" -#include "code\modules\mob\living\carbon\human\species\emote-yautja.dm" #include "code\modules\mob\living\carbon\human\species\human.dm" #include "code\modules\mob\living\carbon\human\species\monkey.dm" #include "code\modules\mob\living\carbon\human\species\species.dm" #include "code\modules\mob\living\carbon\human\species\synthetic.dm" -#include "code\modules\mob\living\carbon\human\species\yautja.dm" #include "code\modules\mob\living\carbon\human\species\zombie.dm" #include "code\modules\mob\living\carbon\human\species\working_joe\_emote.dm" #include "code\modules\mob\living\carbon\human\species\working_joe\_species.dm" @@ -1806,6 +1804,11 @@ #include "code\modules\mob\living\carbon\human\species\working_joe\restricted_area.dm" #include "code\modules\mob\living\carbon\human\species\working_joe\task_update.dm" #include "code\modules\mob\living\carbon\human\species\working_joe\warning.dm" +#include "code\modules\mob\living\carbon\human\species\yautja\_emote.dm" +#include "code\modules\mob\living\carbon\human\species\yautja\_species.dm" +#include "code\modules\mob\living\carbon\human\species\yautja\fake_sounds.dm" +#include "code\modules\mob\living\carbon\human\species\yautja\fake_voice.dm" +#include "code\modules\mob\living\carbon\human\species\yautja\yautja_sound.dm" #include "code\modules\mob\living\carbon\xenomorph\Abilities.dm" #include "code\modules\mob\living\carbon\xenomorph\attack_alien.dm" #include "code\modules\mob\living\carbon\xenomorph\damage_procs.dm" diff --git a/html/changelogs/AutoChangeLog-pr-3455.yml b/html/changelogs/AutoChangeLog-pr-3455.yml deleted file mode 100644 index c3189ad233bd..000000000000 --- a/html/changelogs/AutoChangeLog-pr-3455.yml +++ /dev/null @@ -1,7 +0,0 @@ -author: "realforest2001" -delete-after: True -changes: - - rscadd: "Adds a plasma breaching charge that detonates a plasma wave stunning those opposite it." - - rscadd: "Adds the name of the tracked item to the Yautja gear tracker." - - rscadd: "Added an alternate mode for the Plasma Pistol and moved the incendiary property to it." - - rscadd: "Added MINIMAP_FLAG_ALL to Yautja globe map." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-3757.yml b/html/changelogs/AutoChangeLog-pr-3757.yml deleted file mode 100644 index 4cc6cc928423..000000000000 --- a/html/changelogs/AutoChangeLog-pr-3757.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "realforest2001" -delete-after: True -changes: - - rscadd: "Made Yautja cloak cost no power to operate, and created multipliers for disabled duration based upon what caused the Yautja to decloak." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-3764.yml b/html/changelogs/AutoChangeLog-pr-3764.yml deleted file mode 100644 index ecb789daaf91..000000000000 --- a/html/changelogs/AutoChangeLog-pr-3764.yml +++ /dev/null @@ -1,7 +0,0 @@ -author: "ghostsheet" -delete-after: True -changes: - - rscadd: "Large General Pouch has stricter restriction against internal boxes." - - rscadd: "Large General Pouch no longer restricted to 1 medium item." - - rscadd: "Large General Pouch added to REQ." - - rscadd: "Shuffled REQ pouch order into Meds, Engi, Misc, Ammo." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-3783.yml b/html/changelogs/AutoChangeLog-pr-3783.yml deleted file mode 100644 index 1d995da56001..000000000000 --- a/html/changelogs/AutoChangeLog-pr-3783.yml +++ /dev/null @@ -1,16 +0,0 @@ -author: "realforest2001" -delete-after: True -changes: - - rscadd: "Adds functional maintenance ticket control to the Apollo Console" - - rscadd: "Adds a unique ID system for each ticket. Credit to Ben10083 for the idea." - - rscadd: "Adds procs for vents to spew gas within a radius. Not currently usable without proccall." - - code_imp: "Starts work on Access Tickets." - - code_imp: "START of contribs from Ben10083" - - rscadd: "ARES now announces when Bioscan fails." - - code_imp: "new procs to see if ARES can talk, or log something. Bioscan proc renamed for consistency." - - admin: "Admins can now force an ARES announcement or communication if subsystem is offline." - - rscadd: "new emergency protocol from ARES; call General Quarters, which sets the ship to immediate Red Alert." - - rscadd: "New APOLLO maintenance ticket categories; Janitorial and Support. Fire now a priority ticket" - - qol: "Claimed APOLLO tickets can be unclaimed" - - qol: "APOLLO tickets can be rejected/completed if unclaimed by any Working Joe" - - code_imp: "END of contribs from Ben10083" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-3868.yml b/html/changelogs/AutoChangeLog-pr-3868.yml deleted file mode 100644 index 4bd11e9a6b0e..000000000000 --- a/html/changelogs/AutoChangeLog-pr-3868.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: "MarpleJones, ihatethisengine2" -delete-after: True -changes: - - rscadd: "Added new sprites for the Eggsac Carrier. Includes an additional death sound for the eggsac bursting." - - rscadd: "Added a hive announcement for when a Carrier dies with eggs." - - bugfix: "Carrier egg drop chance upon death now works as intended." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-3877.yml b/html/changelogs/AutoChangeLog-pr-3877.yml deleted file mode 100644 index ba7f0a62e282..000000000000 --- a/html/changelogs/AutoChangeLog-pr-3877.yml +++ /dev/null @@ -1,12 +0,0 @@ -author: "realforest2001" -delete-after: True -changes: - - code_imp: "Changes /datum/rank to /datum/yautja_rank to be clearer on what it is used for." - - rscadd: "Added access defines for Yautja ship." - - rscadd: "Added rank identifiers on Yautja equipment presets to help set access levels on their bracer chips." - - maptweak: "Changed the doors on the Yautja ship to be their own subtypes, with certain ones being locked to Yautja or certain Yautja Ranks." - - code_imp: "Slightly modernised obj/proc/allowed, and also made it check for access on bracer chips if present." - - maptweak: "Replaced the unworthy prey section of the Yautja Ship with a secondary armory for plasma rifles, however the door is inaccessible to most Yautja. Intended to make it a bit less obvious admins are spawning them in for the rare times they're used/necessary." - - maptweak: "Above armory will automatically open if an Abomination is detected." - - maptweak: "Reduces amount of herbs on the Yautja Ship." - - maptweak: "Fixes the \"Consoles\" orientation in the Yautja flight deck." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-3902.yml b/html/changelogs/AutoChangeLog-pr-3902.yml deleted file mode 100644 index 2c487af71f24..000000000000 --- a/html/changelogs/AutoChangeLog-pr-3902.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Ben10083" -delete-after: True -changes: - - balance: "Xenomorphs lose their hiding ability for 2 seconds after a melee attack. 0.5 second cooldown applied to hide ability." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-3907.yml b/html/changelogs/AutoChangeLog-pr-3907.yml deleted file mode 100644 index 7c62f716ff1b..000000000000 --- a/html/changelogs/AutoChangeLog-pr-3907.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "realforest2001" -delete-after: True -changes: - - rscadd: "Added a toggle for Yautja bracer lock. This also works with the same mechanic of SDing another Yautja." - - rscadd: "Added a message to all Yautja if an SD is cancelled." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-3909.yml b/html/changelogs/AutoChangeLog-pr-3909.yml deleted file mode 100644 index 18da06c1cb45..000000000000 --- a/html/changelogs/AutoChangeLog-pr-3909.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "BraveMole, Zonespace" -delete-after: True -changes: - - bugfix: "Smartgunners can no longer shoot their smartgun while aghosted" - - balance: "The Uzi and Mac-15 now have full-auto" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-3917.yml b/html/changelogs/AutoChangeLog-pr-3917.yml new file mode 100644 index 000000000000..06c525a74669 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-3917.yml @@ -0,0 +1,5 @@ +author: "SpartanBobby" +delete-after: True +changes: + - rscadd: "Added a new survivor to LV522 the FORECON sniper he spawns alone his only company being the corpse of his dead battle buddy, good luck" + - maptweak: "Sweeping changes to LV522 including the reactor, north of engineering, LZ1, the entire central area of the map, and north of fitness in an attempt to see more of the colony used and to incentivize flanking" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-3918.yml b/html/changelogs/AutoChangeLog-pr-3918.yml deleted file mode 100644 index 521e80ec2ad5..000000000000 --- a/html/changelogs/AutoChangeLog-pr-3918.yml +++ /dev/null @@ -1,9 +0,0 @@ -author: "ghostsheet" -delete-after: True -changes: - - rscadd: "Tents can be destroyed with an E-tool." - - rscadd: "Tents are now in their respective department, Big tent is now in Bravo Bunks." - - rscadd: "You can no longer stand behind a tent." - - bugfix: "Xenos can now slash tents from the side." - - bugfix: "Tents no longer randomly block bullets." - - bugfix: "Staying inside a tent when it is destroyed no longer give your permanent see-through roof vision." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-3936.yml b/html/changelogs/AutoChangeLog-pr-3936.yml deleted file mode 100644 index b8b29e5efc20..000000000000 --- a/html/changelogs/AutoChangeLog-pr-3936.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Katskan" -delete-after: True -changes: - - bugfix: "Fixed synthetics getting an extra 45 points more than any previous who had used the gadget vendor" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-3939.yml b/html/changelogs/AutoChangeLog-pr-3939.yml deleted file mode 100644 index 97bac6e085de..000000000000 --- a/html/changelogs/AutoChangeLog-pr-3939.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Morrow" -delete-after: True -changes: - - rscadd: "Added lesser drones" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-3949.yml b/html/changelogs/AutoChangeLog-pr-3949.yml deleted file mode 100644 index eca0cae6dc4a..000000000000 --- a/html/changelogs/AutoChangeLog-pr-3949.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Morrow" -delete-after: True -changes: - - bugfix: "Stops multiple facehuggers spawning from one client" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-3962.yml b/html/changelogs/AutoChangeLog-pr-3962.yml new file mode 100644 index 000000000000..757a54e036d6 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-3962.yml @@ -0,0 +1,4 @@ +author: "spartanbobby" +delete-after: True +changes: + - maptweak: "heavy changes to the research department" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-3964.yml b/html/changelogs/AutoChangeLog-pr-3964.yml deleted file mode 100644 index ccd54d9eda5f..000000000000 --- a/html/changelogs/AutoChangeLog-pr-3964.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Drathek" -delete-after: True -changes: - - bugfix: "Fix bodybags not accepting warm (recent) dead bodies even if unreviveable" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-3974.yml b/html/changelogs/AutoChangeLog-pr-3974.yml deleted file mode 100644 index b74b0992d5f3..000000000000 --- a/html/changelogs/AutoChangeLog-pr-3974.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "ihatethisengine" -delete-after: True -changes: - - bugfix: "fixed behavior_immobile flag using wrong number" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-3975.yml b/html/changelogs/AutoChangeLog-pr-3975.yml deleted file mode 100644 index 6f871b20bbb6..000000000000 --- a/html/changelogs/AutoChangeLog-pr-3975.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "Drathek" -delete-after: True -changes: - - bugfix: "Fixed ability deactivation and late join current slot toggles not persisting." - - bugfix: "Toggle the Ability to Hurt Yourself now says On when you can hurt yourself." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-3990.yml b/html/changelogs/AutoChangeLog-pr-3990.yml new file mode 100644 index 000000000000..7f3a072608fc --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-3990.yml @@ -0,0 +1,5 @@ +author: "ihatethisengine" +delete-after: True +changes: + - rscadd: "Added announcements for xenos about forming and breaking alliances." + - rscadd: "Xenos with IFF tag now have a choice to stay loyal to USCM when Queen decides to betray." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-4006.yml b/html/changelogs/AutoChangeLog-pr-4006.yml new file mode 100644 index 000000000000..9e809782b95d --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4006.yml @@ -0,0 +1,5 @@ +author: "ghostsheet" +delete-after: True +changes: + - bugfix: "Advanced mini flamer can no longer nerf itself by changing mode." + - rscadd: "HG 37-12 pump shotgun's intergrated stock no longer give any stat change." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-4017.yml b/html/changelogs/AutoChangeLog-pr-4017.yml new file mode 100644 index 000000000000..0b825327160b --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4017.yml @@ -0,0 +1,4 @@ +author: "GoldenDarkness55" +delete-after: True +changes: + - balance: "Player controlled facehuggers apply the same knockout duration as regular ones." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-4019.yml b/html/changelogs/AutoChangeLog-pr-4019.yml new file mode 100644 index 000000000000..7fe31a5cb8b6 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4019.yml @@ -0,0 +1,4 @@ +author: "GoldenDarkness55" +delete-after: True +changes: + - balance: "Shaking people up shortens stun durations by 6 instead of 3." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-4021.yml b/html/changelogs/AutoChangeLog-pr-4021.yml new file mode 100644 index 000000000000..f4d657bb4ef4 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4021.yml @@ -0,0 +1,4 @@ +author: "Morrow" +delete-after: True +changes: + - balance: "2.5 squad marines per 1 larva latejoin" \ No newline at end of file diff --git a/html/changelogs/archive/2023-07.yml b/html/changelogs/archive/2023-07.yml index 99120b3a13c4..177089bf7c67 100644 --- a/html/changelogs/archive/2023-07.yml +++ b/html/changelogs/archive/2023-07.yml @@ -409,3 +409,167 @@ indestructible blast doors. Morrow: - bugfix: Fixes wood window numbering +2023-07-26: + BeagleGaming1: + - code_imp: Changed squad color code from a list to a variable + - rscadd: How long disarm stuns for depends on the difference in CQC skill between + the participants + - bugfix: CQC properly affects disarm chance again + Ben10083: + - rscadd: You can now petition High Command via ARES for a nuclear device, bypassing + techweb (If you can convince them, that is.) + - admin: Implemented Admin side of ARES Nuke request to allow for granting of different + nuke types, or denying the request. + - bugfix: Working Joes no longer spawn meat when butchered by Abominations + - bugfix: Synthetics now are butchered into synthflesh when butchered by Abominations + - rscadd: special meat subtype 'synthflesh' if Synthetics get butchered. Uses same + recipes as synthmeat + - imageadd: synthflesh sprite + - bugfix: Non-techweb nuke now works properly. + - ui: Nuke timers now use minutes instead of seconds + - spellcheck: Nukes renamed to 'Encrypted' and 'Decrypted' nuke respectively. + - admin: Ability to spawn nuke added to event panel + - rscadd: Infection gamemode announcement fixed and adjusts for each map, like Distress + Signal + - code_imp: elements of distress signal post_setup code moved to parent to be called + by all gamemodes + - balance: Xenomorphs lose their hiding ability for 2 seconds after a melee attack. + 0.5 second cooldown applied to hide ability. + - balance: Carriers with Eggsac strain can now place eggs on regular weeds. + - bugfix: Extra egg planting range now properly applied for Eggsac strain and Queen + on ovi + - qol: Eggsac Carriers now notified when they generate a egg. + - code_imp: new variable to xenomorphs to dictate egg planting distance, and removal + of unused procs + - balance: LVL-624 Robotics Dome operating table replaced with bioprinter. + BraveMole, Zonespace: + - bugfix: Smartgunners can no longer shoot their smartgun while aghosted + - balance: The Uzi and Mac-15 now have full-auto + Drathek: + - bugfix: Fixed xeno hide ability not checking for busy status. + - bugfix: Fix bodybags not accepting warm (recent) dead bodies even if unreviveable + - code_imp: Added additional lints to dmi/test.py to test for duplicate state names + and excessive quantity and added another type path to the missing_icons unit_test. + - imageadd: Renamed and moved some icons around to comply with new testing. + - bugfix: Fixed ability deactivation and late join current slot toggles not persisting. + - bugfix: Toggle the Ability to Hurt Yourself now says On when you can hurt yourself. + - bugfix: Fix huggers not retaining at least their old death value. + - rscadd: Added the debug verb Mass-Screenshot and a python script MapTileImageTool + to combine those images into a single full image map. + Hopek: + - rscadd: Changed the description flavortext of the fountain pen to match the new + lore. There is now a laser engraving of the owner on the pen itself. + - rscadd: Added a detailed lore description for the fountain pen. + Katskan: + - bugfix: Fixed synthetics getting an extra 45 points more than any previous who + had used the gadget vendor + MarpleJones, ihatethisengine2: + - rscadd: Added new sprites for the Eggsac Carrier. Includes an additional death + sound for the eggsac bursting. + - rscadd: Added a hive announcement for when a Carrier dies with eggs. + - bugfix: Carrier egg drop chance upon death now works as intended. + Morrow: + - bugfix: Stops multiple facehuggers spawning from one client + - rscadd: Added lesser drones + QuickLode: + - rscadd: Radio titles for W-Y prepositioned Synthetics + - qol: Swaps PMC Synthetic autocompressor for a crew monitor to facilitate search + and rescue. + - bugfix: fixes PMC Synthetic ID & removes redundant graft + Zonespace27: + - bugfix: Welding goggles are no longer marked as "mandatory" in comtech vendors + blackdragonTOW: + - rscadd: Added unique, faction dependent music to Round End in the event that Xenos + lose post hijack. + ghostsheet: + - rscadd: Large General Pouch has stricter restriction against internal boxes. + - rscadd: Large General Pouch no longer restricted to 1 medium item. + - rscadd: Large General Pouch added to REQ. + - rscadd: Shuffled REQ pouch order into Meds, Engi, Misc, Ammo. + - rscadd: Tents can be destroyed with an E-tool. + - rscadd: Tents are now in their respective department, Big tent is now in Bravo + Bunks. + - rscadd: You can no longer stand behind a tent. + - bugfix: Xenos can now slash tents from the side. + - bugfix: Tents no longer randomly block bullets. + - bugfix: Staying inside a tent when it is destroyed no longer give your permanent + see-through roof vision. + ihatethisengine: + - balance: early pod launch now has a 75% chance of crashing, launch after the timer + has a 25% chance. + - rscadd: CL's pod has a 25% chance of crashing on early launch and only 5% otherwise. + - rscadd: xenos can slash and melt manually locked pod's doors. + - bugfix: fixed behavior_immobile flag using wrong number + realforest2001: + - rscadd: Adds a plasma breaching charge that detonates a plasma wave stunning those + opposite it. + - rscadd: Adds the name of the tracked item to the Yautja gear tracker. + - rscadd: Added an alternate mode for the Plasma Pistol and moved the incendiary + property to it. + - rscadd: Added MINIMAP_FLAG_ALL to Yautja globe map. + - rscadd: Adds functional maintenance ticket control to the Apollo Console + - rscadd: Adds a unique ID system for each ticket. Credit to Ben10083 for the idea. + - rscadd: Adds procs for vents to spew gas within a radius. Not currently usable + without proccall. + - code_imp: Starts work on Access Tickets. + - code_imp: START of contribs from Ben10083 + - rscadd: ARES now announces when Bioscan fails. + - code_imp: new procs to see if ARES can talk, or log something. Bioscan proc renamed + for consistency. + - admin: Admins can now force an ARES announcement or communication if subsystem + is offline. + - rscadd: new emergency protocol from ARES; call General Quarters, which sets the + ship to immediate Red Alert. + - rscadd: New APOLLO maintenance ticket categories; Janitorial and Support. Fire + now a priority ticket + - qol: Claimed APOLLO tickets can be unclaimed + - qol: APOLLO tickets can be rejected/completed if unclaimed by any Working Joe + - code_imp: END of contribs from Ben10083 + - code_imp: Changes /datum/rank to /datum/yautja_rank to be clearer on what it is + used for. + - rscadd: Added access defines for Yautja ship. + - rscadd: Added rank identifiers on Yautja equipment presets to help set access + levels on their bracer chips. + - maptweak: Changed the doors on the Yautja ship to be their own subtypes, with + certain ones being locked to Yautja or certain Yautja Ranks. + - code_imp: Slightly modernised obj/proc/allowed, and also made it check for access + on bracer chips if present. + - maptweak: Replaced the unworthy prey section of the Yautja Ship with a secondary + armory for plasma rifles, however the door is inaccessible to most Yautja. Intended + to make it a bit less obvious admins are spawning them in for the rare times + they're used/necessary. + - maptweak: Above armory will automatically open if an Abomination is detected. + - maptweak: Reduces amount of herbs on the Yautja Ship. + - maptweak: Fixes the "Consoles" orientation in the Yautja flight deck. + - rscadd: Allowed Falcon Drones to relay speech back to their operators. + - rscadd: Made Yautja cloak cost no power to operate, and created multipliers for + disabled duration based upon what caused the Yautja to decloak. + - rscadd: Added a toggle for Yautja bracer lock. This also works with the same mechanic + of SDing another Yautja. + - rscadd: Added a message to all Yautja if an SD is cancelled. + - ui: Adds a UI panel for Yautja emotes, all credit to Zonespace. +2023-07-27: + Ben10083: + - bugfix: ARES security logs now are properly displayed + - ui: Xenos (and others) now see comms relays on minimap + Drathek: + - code_imp: Bump alternate 515 testing to byond 1610 +2023-07-28: + BeagleGaming1: + - rscadd: Added a new CO jacket to the CO vendor + Ben10083: + - bugfix: Speech problems such as lisping now applies when using megaphone + GoldenDarkness55: + - balance: Dropship machine gun cost lowered from 300 to 50. + - balance: Dropship rappel module cost lowered from 500 to 50. + - balance: Dropship spotlight cost lowered from 300 to 50. + - balance: Dropship LZ detector cost lowered from 400 to 50. + Khadd: + - bugfix: xenos now update their wound icon when getting up + Morrow: + - bugfix: Fixed sentries firing turning off their lights + - rscadd: Shovels can now be used to collapse tunnels + zzzmike: + - balance: when facehugged, more paralyze chance with a smaller paralyze duration + - ui: during hugged effects, changes messaging to encourage new players to seek + help diff --git a/icons/mob/hud/human_old.dmi b/icons/mob/hud/human_old.dmi index 194206d4de16..e8b682c7c831 100644 Binary files a/icons/mob/hud/human_old.dmi and b/icons/mob/hud/human_old.dmi differ diff --git a/icons/mob/humans/onmob/items_lefthand_0.dmi b/icons/mob/humans/onmob/items_lefthand_0.dmi index 676920e0bac0..1f154ef92396 100644 Binary files a/icons/mob/humans/onmob/items_lefthand_0.dmi and b/icons/mob/humans/onmob/items_lefthand_0.dmi differ diff --git a/icons/mob/humans/onmob/items_lefthand_1.dmi b/icons/mob/humans/onmob/items_lefthand_1.dmi index b149c4ea872b..d65bcccc02af 100644 Binary files a/icons/mob/humans/onmob/items_lefthand_1.dmi and b/icons/mob/humans/onmob/items_lefthand_1.dmi differ diff --git a/icons/mob/humans/onmob/items_righthand_0.dmi b/icons/mob/humans/onmob/items_righthand_0.dmi index a380e5eb73f4..858da88c29ed 100644 Binary files a/icons/mob/humans/onmob/items_righthand_0.dmi and b/icons/mob/humans/onmob/items_righthand_0.dmi differ diff --git a/icons/mob/humans/onmob/items_righthand_1.dmi b/icons/mob/humans/onmob/items_righthand_1.dmi index 70fa3a73fbc5..f9b5350d6a7b 100644 Binary files a/icons/mob/humans/onmob/items_righthand_1.dmi and b/icons/mob/humans/onmob/items_righthand_1.dmi differ diff --git a/icons/mob/humans/onmob/suit_1.dmi b/icons/mob/humans/onmob/suit_1.dmi index 39a91e225039..f0daf54e7ac9 100644 Binary files a/icons/mob/humans/onmob/suit_1.dmi and b/icons/mob/humans/onmob/suit_1.dmi differ diff --git a/icons/obj/items/clothing/cm_suits.dmi b/icons/obj/items/clothing/cm_suits.dmi index fc2e10114370..3a2ba038bef4 100644 Binary files a/icons/obj/items/clothing/cm_suits.dmi and b/icons/obj/items/clothing/cm_suits.dmi differ diff --git a/icons/obj/items/food.dmi b/icons/obj/items/food.dmi index 6e2c86aa4999..3c2e963e3804 100644 Binary files a/icons/obj/items/food.dmi and b/icons/obj/items/food.dmi differ diff --git a/icons/obj/structures/props/rocks.dmi b/icons/obj/structures/props/rocks.dmi index e494bdcba2f8..71ea709c771f 100644 Binary files a/icons/obj/structures/props/rocks.dmi and b/icons/obj/structures/props/rocks.dmi differ diff --git a/icons/rebase_icons.dmi b/icons/rebase_icons.dmi index 2d394cef793d..6b0a25a1f7e6 100644 Binary files a/icons/rebase_icons.dmi and b/icons/rebase_icons.dmi differ diff --git a/icons/turf/floors/desert_dirt.dmi b/icons/turf/floors/desert_dirt.dmi index e153917e708a..ed6c57cc1809 100644 Binary files a/icons/turf/floors/desert_dirt.dmi and b/icons/turf/floors/desert_dirt.dmi differ diff --git a/icons/turf/floors/desert_rock.dmi b/icons/turf/floors/desert_rock.dmi index 8cbd01e3cec1..79a33d83257f 100644 Binary files a/icons/turf/floors/desert_rock.dmi and b/icons/turf/floors/desert_rock.dmi differ diff --git a/maps/lv522_chances_claim.json b/maps/lv522_chances_claim.json index 077596d14eca..ac7dfa5f1dcd 100644 --- a/maps/lv522_chances_claim.json +++ b/maps/lv522_chances_claim.json @@ -22,7 +22,7 @@ 580, 0.0 ], - "survivor_message": "You are USCM Force Reconnaissance (FORECON) marine from the USS Hanyut, stranded on this planet after your team was wiped out while investigating the distress signal. With your pilot dead along with the majority of your unit, you and your team have been running and gunning to survive... until now.", + "survivor_message": "You are USCM Force Reconnaissance (FORECON) marine from the USS Hanyut, stranded on this planet after your team was wiped out while investigating the distress signal. With your pilot dead along with the majority of your unit, you and your team have been running and gunning to survive... but with supplies low and food running out maybe your only means of survival is to move west to the crashed dropship to salvage anything useful.", "announce_text": "Pan-Pan. This is the commanding officer of the USS Hanyut, USCMC FORECON. We are currently grounded on planet LV-522 in the immediate area of Chance's Claim. We are unable to contact the Hanyut and our dropships are unable to take off at this time. We are requesting assistance from any nearby vessels; this broadcast is set to repeat every 24 hours.", "map_item_type": "/obj/item/map/lv522_map", "monkey_types": [ diff --git a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm index cb5f023d59fa..a961b1aa6ddb 100644 --- a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm +++ b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm @@ -41,6 +41,18 @@ icon_state = "cement1" }, /area/lv522/outdoors/colony_streets/north_east_street) +"abL" = ( +/obj/structure/platform{ + dir = 1 + }, +/obj/structure/platform{ + dir = 4 + }, +/obj/structure/platform_decoration{ + dir = 9 + }, +/turf/open/gm/river, +/area/lv522/atmos/sewer) "abS" = ( /obj/effect/acid_hole, /turf/closed/wall/strata_ice/dirty, @@ -76,14 +88,33 @@ icon_state = "white_cyan2" }, /area/lv522/indoors/a_block/executive) -"acp" = ( -/turf/open/floor/corsat{ - icon_state = "marked" +"acn" = ( +/obj/structure/largecrate/random/secure, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, +/area/lv522/atmos/way_in_command_centre) +"acp" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison, /area/lv522/landing_zone_2/ceiling) "acq" = ( -/turf/open/asphalt/cement, -/area/lv522/outdoors/nw_rockies) +/obj/structure/largecrate/random{ + layer = 2.9 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor) +"acD" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/corsat, +/area/lv522/atmos/east_reactor/south) "acE" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk/prison, @@ -107,6 +138,17 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms) +"adl" = ( +/obj/item/storage/box/MRE{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/box/MRE{ + pixel_x = -1; + pixel_y = -6 + }, +/turf/closed/wall/strata_ice/dirty, +/area/lv522/oob) "adG" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/reagent_container/food/condiment/saltshaker, @@ -131,13 +173,17 @@ }, /turf/open/gm/river, /area/lv522/oob) +"aea" = ( +/obj/structure/largecrate/random, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv522/outdoors/n_rockies) "aee" = ( /obj/effect/decal/cleanable/dirt, /turf/closed/wall/strata_outpost, /area/lv522/indoors/b_block/bridge) -"aep" = ( -/turf/closed/wall/shiva/prefabricated, -/area/lv522/landing_zone_2/ceiling) "aeD" = ( /obj/structure/largecrate/random, /obj/effect/decal/cleanable/dirt, @@ -152,13 +198,14 @@ }, /area/lv522/indoors/c_block/mining) "afn" = ( -/obj/item/lightstick/red/spoke/planted{ - pixel_x = -10; - pixel_y = 5 +/obj/item/reagent_container/spray/cleaner/drone{ + pixel_x = -3; + pixel_y = 6 }, -/obj/structure/prop/ice_colony/ground_wire, -/turf/open/auto_turf/shale/layer1, -/area/lv522/outdoors/colony_streets/central_streets) +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor) "afp" = ( /obj/structure/platform, /turf/open/gm/river, @@ -170,14 +217,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/b_block/bridge) -"afs" = ( -/obj/structure/machinery/power/apc/weak{ - dir = 1 - }, -/turf/open/floor/corsat{ - icon_state = "plate" - }, -/area/lv522/atmos/filt) "aft" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 @@ -193,16 +232,6 @@ icon_state = "squares" }, /area/lv522/atmos/north_command_centre) -"afB" = ( -/obj/structure/barricade/handrail{ - dir = 1 - }, -/obj/effect/landmark/xeno_spawn, -/turf/open/floor/corsat{ - dir = 1; - icon_state = "brown" - }, -/area/lv522/atmos/east_reactor) "afI" = ( /obj/item/reagent_container/food/drinks/cans/beer{ pixel_x = -21; @@ -215,6 +244,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) +"afL" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_x = -1; + pixel_y = 2 + }, +/turf/closed/wall/mineral/bone_resin, +/area/lv522/oob) "afX" = ( /obj/effect/decal/cleanable/dirt, /turf/open/asphalt/cement{ @@ -226,7 +263,7 @@ icon_state = "E"; pixel_x = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_west_street) "agM" = ( /obj/effect/decal/cleanable/generic, @@ -234,17 +271,25 @@ icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/bridge) -"ahH" = ( -/obj/structure/machinery/door/poddoor/almayer{ - id = "E_B_Door"; - name = "\improper Emergency Blast Door"; - unacidable = 1 +"ahs" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + icon_state = "plate" }, -/obj/structure/blocker/invisible_wall, +/area/lv522/atmos/reactor_garage) +"ahH" = ( /turf/open/floor/corsat{ - icon_state = "marked" + dir = 9; + icon_state = "brown" }, /area/lv522/atmos/east_reactor/east) +"ahJ" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/lv522/atmos/cargo_intake) "ahP" = ( /turf/open/asphalt/cement, /area/lv522/outdoors/colony_streets/north_street) @@ -275,7 +320,7 @@ dir = 10; icon_state = "p_stair_full" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) "aio" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -295,6 +340,10 @@ /obj/structure/barricade/handrail/wire, /turf/open/floor/wood, /area/lv522/indoors/a_block/fitness/glass) +"aiO" = ( +/obj/structure/window_frame/corsat, +/turf/open/floor/corsat, +/area/lv522/atmos/east_reactor/south) "aiP" = ( /obj/structure/machinery/camera/autoname/lz_camera, /turf/open/floor/plating, @@ -302,9 +351,6 @@ "aiQ" = ( /turf/closed/wall/strata_outpost, /area/lv522/outdoors/colony_streets/central_streets) -"ajm" = ( -/turf/open/floor/plating/plating_catwalk/prison, -/area/lv522/outdoors/nw_rockies) "ajw" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 10 @@ -323,6 +369,13 @@ }, /turf/closed/wall/strata_outpost, /area/lv522/oob) +"ajY" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "brown" + }, +/area/lv522/atmos/east_reactor/south) "akh" = ( /obj/structure/foamed_metal, /obj/structure/pipes/standard/simple/hidden/green, @@ -340,6 +393,16 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/oob) +"akn" = ( +/obj/structure/machinery/door/airlock/almayer/maint, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/way_in_command_centre) +"akp" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/prison, +/area/lv522/atmos/outdoor) "akM" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/oob) @@ -347,6 +410,12 @@ /obj/structure/prop/invuln/ice_prefab, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/north_west_street) +"alx" = ( +/obj/structure/platform{ + dir = 1 + }, +/turf/open/asphalt/cement, +/area/lv522/outdoors/n_rockies) "alI" = ( /turf/closed/wall/strata_outpost/reinforced/hull, /area/lv522/oob) @@ -355,10 +424,33 @@ icon_state = "floor_plate" }, /area/lv522/oob) +"ama" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 10 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/sewer) "amc" = ( /obj/structure/cargo_container/kelland/left, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) +"ame" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/lv522/atmos/east_reactor) +"amy" = ( +/obj/item/toy/farwadoll{ + desc = "A Farwa plush doll. Once soft and comforting now just really wet."; + name = "Soaked farwa plush doll" + }, +/turf/open/gm/river, +/area/lv522/atmos/sewer) "amC" = ( /obj/structure/bed/roller, /obj/effect/landmark/objective_landmark/medium, @@ -380,13 +472,6 @@ }, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms/glass) -"amS" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/prop/ice_colony/ground_wire{ - dir = 8 - }, -/turf/open/auto_turf/shale/layer0, -/area/lv522/outdoors/colony_streets/central_streets) "amY" = ( /obj/structure/cargo_container/horizontal/blue/top, /obj/structure/flora/pottedplant{ @@ -406,6 +491,11 @@ icon_state = "brown" }, /area/lv522/atmos/east_reactor/east) +"anb" = ( +/turf/open/floor/prison{ + icon_state = "cell_stripe" + }, +/area/lv522/atmos/way_in_command_centre) "ann" = ( /obj/structure/barricade/wooden{ dir = 4 @@ -419,9 +509,6 @@ icon_state = "kitchen" }, /area/lv522/indoors/a_block/kitchen) -"ant" = ( -/turf/open/floor/plating/plating_catwalk/prison, -/area/lv522/outdoors/n_rockies) "anv" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/drinks/cans/souto/cranberry{ @@ -470,6 +557,19 @@ icon_state = "marked" }, /area/lv522/indoors/c_block/mining) +"aoi" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 1 + }, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/colony_streets/north_east_street) +"aox" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "brown" + }, +/area/lv522/atmos/east_reactor/south) "aoH" = ( /obj/structure/machinery/light, /obj/structure/machinery/disposal, @@ -485,6 +585,12 @@ icon_state = "cyan2" }, /area/lv522/indoors/a_block/medical) +"apd" = ( +/turf/open/floor/prison{ + dir = 4; + icon_state = "cell_stripe" + }, +/area/lv522/atmos/sewer) "ape" = ( /obj/structure/bed/chair{ dir = 4 @@ -492,12 +598,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/lv522/indoors/a_block/security) -"api" = ( -/turf/open/floor/prison{ - dir = 4; - icon_state = "cell_stripe" - }, -/area/lv522/outdoors/n_rockies) "apt" = ( /obj/structure/pipes/vents/pump, /obj/effect/decal/cleanable/dirt, @@ -512,6 +612,13 @@ }, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/south_east_street) +"aqo" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/east_reactor/south) "aqH" = ( /obj/structure/prop/vehicles/crawler{ icon_state = "crawler_crate_alt2"; @@ -519,12 +626,6 @@ }, /turf/open/floor/plating, /area/lv522/indoors/c_block/garage) -"aqI" = ( -/obj/structure/cargo_container/grant/left, -/turf/open/floor/corsat{ - icon_state = "plate" - }, -/area/lv522/atmos/north_command_centre) "aqT" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/corsat{ @@ -553,12 +654,20 @@ icon_state = "blue_plate" }, /area/lv522/indoors/a_block/bridges/op_centre) +"arN" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/surface/rack, +/obj/item/clothing/head/welding, +/turf/open/floor/strata{ + icon_state = "blue1" + }, +/area/lv522/outdoors/colony_streets/windbreaker/observation) "arP" = ( /obj/item/lightstick/red/spoke/planted{ pixel_x = -9; pixel_y = 25 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/central_streets) "arV" = ( /obj/structure/surface/table/almayer, @@ -581,6 +690,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/a_block/kitchen) +"asH" = ( +/obj/structure/machinery/vending/coffee, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "asI" = ( /obj/structure/prop/invuln/overhead_pipe{ dir = 4; @@ -613,6 +728,14 @@ icon_state = "blue_plate" }, /area/lv522/indoors/a_block/hallway) +"atz" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "atL" = ( /obj/structure/closet/crate, /obj/structure/machinery/light/double{ @@ -625,6 +748,19 @@ icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/storage_blocks) +"atO" = ( +/obj/structure/prop/vehicles/crawler{ + dir = 8; + layer = 3.1; + pixel_x = 5; + pixel_y = 7 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/reactor_garage) "atV" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/warning_stripes{ @@ -670,6 +806,12 @@ }, /turf/open/floor/plating, /area/lv522/landing_zone_1/tunnel) +"awI" = ( +/obj/item/explosive/plastic/breaching_charge{ + unacidable = 1 + }, +/turf/open/floor/prison, +/area/lv522/atmos/way_in_command_centre) "awK" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 @@ -699,6 +841,20 @@ /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/bridges/op_centre) +"axN" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/prison, +/area/lv522/outdoors/colony_streets/windbreaker/observation) +"axS" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/reactor_garage) "ayn" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -707,6 +863,12 @@ icon_state = "marked" }, /area/lv522/indoors/a_block/hallway) +"ayX" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "aza" = ( /obj/structure/platform{ dir = 1 @@ -724,6 +886,19 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat, /area/lv522/atmos/east_reactor) +"azE" = ( +/obj/structure/bed/chair, +/turf/open/floor/prison, +/area/lv522/outdoors/colony_streets/windbreaker/observation) +"azF" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/shiva{ + icon_state = "radiator_tile2" + }, +/area/lv522/indoors/a_block/corpo/glass) "azJ" = ( /obj/structure/surface/table/almayer, /obj/item/clothing/head/helmet/marine/grenadier{ @@ -751,7 +926,7 @@ /obj/structure/cargo_container/wy/mid{ health = 5000 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) "aAW" = ( /obj/effect/spawner/gibspawner/xeno, @@ -787,6 +962,12 @@ icon_state = "brown" }, /area/lv522/atmos/east_reactor) +"aCR" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/cargo_intake) "aCS" = ( /obj/structure/surface/rack, /obj/item/clothing/suit/storage/hazardvest, @@ -852,14 +1033,11 @@ /turf/open/floor/plating, /area/lv522/indoors/c_block/mining) "aEL" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/floor/corsat{ - dir = 1; - icon_state = "brown" + icon_state = "plate" }, -/area/lv522/atmos/north_command_centre) +/area/lv522/atmos/east_reactor) "aEM" = ( /obj/structure/machinery/atm{ name = "Weyland-Yutani Automatic Teller Machine"; @@ -926,8 +1104,7 @@ dir = 1 }, /turf/open/floor/corsat{ - dir = 1; - icon_state = "brown" + icon_state = "plate" }, /area/lv522/atmos/north_command_centre) "aGy" = ( @@ -949,14 +1126,12 @@ /turf/open/asphalt/cement, /area/lv522/outdoors/colony_streets/east_central_street) "aGI" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, +/obj/structure/largecrate/random/case/double, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/floor/corsat{ - dir = 1; - icon_state = "browncorner" + icon_state = "plate" }, -/area/lv522/atmos/north_command_centre) +/area/lv522/atmos/east_reactor) "aGQ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/drip, @@ -1019,6 +1194,14 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) +"aIM" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/lv522/atmos/reactor_garage) "aIY" = ( /obj/structure/prop/invuln/lattice_prop{ icon_state = "lattice3"; @@ -1030,32 +1213,43 @@ icon_state = "blue" }, /area/lv522/indoors/a_block/hallway) -"aJh" = ( -/obj/structure/barricade/handrail{ - dir = 8 +"aJg" = ( +/obj/structure/fence{ + layer = 2.9 }, -/obj/effect/landmark/xeno_spawn, -/turf/open/floor/corsat{ - dir = 8; - icon_state = "brown" +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/area/lv522/atmos/east_reactor) +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/lv522/outdoors/colony_streets/north_east_street) +"aJr" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "w-y2" + }, +/area/lv522/oob/w_y_vault) "aJS" = ( /obj/structure/surface/table/almayer, /obj/effect/landmark/objective_landmark/far, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/turf/open/floor/strata{ + icon_state = "blue1" }, /area/lv522/outdoors/colony_streets/windbreaker/observation) "aJT" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/floor/corsat{ - dir = 4; - icon_state = "browncorner" + icon_state = "plate" }, -/area/lv522/atmos/north_command_centre) +/area/lv522/atmos/east_reactor) "aKf" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/prison{ @@ -1080,8 +1274,7 @@ dir = 4 }, /turf/open/floor/corsat{ - dir = 1; - icon_state = "brown" + icon_state = "plate" }, /area/lv522/atmos/north_command_centre) "aKO" = ( @@ -1093,6 +1286,20 @@ icon_state = "blue" }, /area/lv522/indoors/a_block/admin) +"aKQ" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor/corsat{ + dir = 8; + icon_state = "browncorner" + }, +/area/lv522/atmos/cargo_intake) +"aLf" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/sewer) "aLy" = ( /obj/structure/machinery/light{ dir = 4 @@ -1105,15 +1312,16 @@ icon_state = "blue_plate" }, /area/lv522/indoors/a_block/hallway) -"aLJ" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/turf/open/floor/corsat{ - dir = 5; - icon_state = "brown" +"aLG" = ( +/turf/open/floor/almayer{ + dir = 1; + icon_state = "w-y0" }, -/area/lv522/atmos/north_command_centre) +/area/lv522/oob/w_y_vault) +"aLJ" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor/corsat, +/area/lv522/atmos/east_reactor) "aMI" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/bed{ @@ -1126,6 +1334,18 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) +"aNn" = ( +/obj/structure/transmitter/colony_net{ + phone_category = "LV522 Chances Claim"; + phone_color = "red"; + phone_id = "Colony Corporate"; + pixel_y = 26 + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "white_cyan1" + }, +/area/lv522/indoors/a_block/corpo) "aNr" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 9 @@ -1135,7 +1355,7 @@ /area/lv522/indoors/c_block/mining) "aNw" = ( /obj/item/prop/colony/used_flare, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/nw_rockies) "aNI" = ( /obj/structure/bed/chair{ @@ -1157,7 +1377,7 @@ /obj/item/lightstick/red/spoke/planted{ pixel_x = -14 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/central_streets) "aOP" = ( /obj/effect/spawner/gibspawner/xeno, @@ -1180,7 +1400,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "S" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_street) "aPu" = ( /obj/effect/decal/cleanable/dirt, @@ -1199,16 +1419,6 @@ }, /turf/open/floor/prison, /area/lv522/indoors/a_block/security/glass) -"aPP" = ( -/obj/structure/barricade/handrail{ - dir = 4 - }, -/obj/effect/landmark/xeno_spawn, -/turf/open/floor/corsat{ - dir = 4; - icon_state = "brown" - }, -/area/lv522/atmos/east_reactor) "aPS" = ( /obj/structure/stairs/perspective{ dir = 10; @@ -1244,14 +1454,15 @@ }, /area/lv522/landing_zone_1/tunnel) "aQU" = ( -/obj/structure/machinery/door/airlock/almayer/maint, -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 +/obj/structure/machinery/computer/cameras{ + dir = 4; + network = null; + pixel_x = -16 }, /turf/open/floor/corsat{ - icon_state = "marked" + icon_state = "plate" }, -/area/lv522/atmos/north_command_centre) +/area/lv522/atmos/east_reactor/north) "aRd" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, @@ -1270,7 +1481,7 @@ icon_state = "SE-out"; pixel_x = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/nw_rockies) "aRM" = ( /obj/structure/stairs/perspective{ @@ -1331,14 +1542,14 @@ /obj/effect/decal/warning_stripes{ icon_state = "S" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/nw_rockies) "aTK" = ( /obj/structure/prop/dam/truck/cargo{ layer = 3.1 }, /turf/open/floor/corsat{ - icon_state = "squares" + icon_state = "plate" }, /area/lv522/atmos/east_reactor/east) "aTP" = ( @@ -1396,8 +1607,18 @@ /obj/structure/platform{ dir = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_2) +"aVg" = ( +/obj/structure/platform/strata, +/turf/closed/wall/strata_ice/dirty, +/area/lv522/oob) +"aVj" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/open/floor/prison, +/area/lv522/atmos/way_in_command_centre) "aVo" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/prop/almayer/computer/PC, @@ -1414,6 +1635,9 @@ "aVt" = ( /obj/item/pamphlet/skill/powerloader, /obj/structure/surface/table/almayer, +/obj/structure/machinery/light{ + dir = 1 + }, /turf/open/floor/corsat{ icon_state = "plate" }, @@ -1510,6 +1734,13 @@ icon_state = "blue_plate" }, /area/lv522/indoors/c_block/mining) +"aWX" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor) "aXa" = ( /turf/open/floor/corsat{ dir = 6; @@ -1528,6 +1759,12 @@ icon_state = "marked" }, /area/lv522/indoors/c_block/mining) +"aYd" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/prison, +/area/lv522/atmos/way_in_command_centre) "aYg" = ( /obj/effect/decal/cleanable/blood/oil, /obj/structure/surface/rack, @@ -1537,6 +1774,40 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/security) +"aYF" = ( +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal8"; + pixel_x = -16; + pixel_y = -16 + }, +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal7"; + pixel_x = 16; + pixel_y = -16 + }, +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal6"; + pixel_x = 16; + pixel_y = 16 + }, +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal5"; + pixel_x = -16; + pixel_y = 16 + }, +/obj/structure/holohoop{ + density = 0; + pixel_y = 27 + }, +/obj/item/toy/beach_ball/holoball{ + pixel_x = 8; + pixel_y = 5 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, +/area/lv522/indoors/a_block/fitness) "aYO" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 @@ -1581,11 +1852,26 @@ icon_state = "white_cyan1" }, /area/lv522/indoors/a_block/corpo) +"bag" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/reactor_garage) "ban" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/blocker/invisible_wall, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) +"baG" = ( +/turf/open/floor/corsat{ + dir = 1; + icon_state = "browncorner" + }, +/area/lv522/atmos/east_reactor/south) "baN" = ( /obj/structure/surface/rack, /obj/item/stack/sheet/metal/large_stack, @@ -1659,14 +1945,14 @@ /area/lv522/oob) "bcf" = ( /obj/effect/spawner/gibspawner/xeno, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/n_rockies) "bcl" = ( /obj/structure/stairs/perspective{ dir = 6; icon_state = "p_stair_full" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) "bco" = ( /turf/open/floor/corsat{ @@ -1703,11 +1989,12 @@ }, /area/lv522/outdoors/colony_streets/north_west_street) "bdv" = ( +/obj/structure/largecrate/random/case, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/floor/corsat{ - dir = 4; - icon_state = "browncorner" + icon_state = "plate" }, -/area/lv522/atmos/north_command_centre) +/area/lv522/atmos/east_reactor) "bdH" = ( /obj/structure/bed/chair{ dir = 4 @@ -1748,8 +2035,8 @@ /area/lv522/outdoors/colony_streets/south_street) "bel" = ( /obj/structure/machinery/computer/crew/colony, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/turf/open/floor/strata{ + icon_state = "blue1" }, /area/lv522/outdoors/colony_streets/windbreaker/observation) "ben" = ( @@ -1774,6 +2061,12 @@ icon_state = "darkredfull2" }, /area/lv522/indoors/a_block/bridges/corpo) +"bet" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/west_reactor) "bex" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/prison, @@ -1795,9 +2088,7 @@ }, /area/lv522/atmos/east_reactor/north) "bgc" = ( -/turf/open/floor/corsat{ - icon_state = "browncorner" - }, +/turf/open/floor/plating, /area/lv522/atmos/cargo_intake) "bgg" = ( /turf/open/floor/corsat{ @@ -1830,14 +2121,15 @@ icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) -"bgS" = ( -/turf/open/auto_turf/shale/layer0, -/area/lv522/landing_zone_2/ceiling) "bgV" = ( /turf/open/asphalt/cement{ icon_state = "cement2" }, /area/lv522/outdoors/n_rockies) +"bha" = ( +/obj/item/stack/rods, +/turf/open/floor/prison, +/area/lv522/outdoors/colony_streets/windbreaker/observation) "bhd" = ( /turf/open/floor/corsat{ dir = 5; @@ -1921,6 +2213,15 @@ icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) +"bjd" = ( +/turf/closed/wall/strata_outpost/reinforced, +/area/lv522/atmos/sewer) +"bjC" = ( +/turf/open/floor/strata{ + dir = 4; + icon_state = "white_cyan1" + }, +/area/lv522/oob/w_y_vault) "bjF" = ( /obj/effect/decal/cleanable/blood/xeno, /obj/effect/decal/cleanable/liquid_fuel, @@ -1939,7 +2240,7 @@ icon_state = "SE-out"; pixel_x = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_street) "bka" = ( /obj/item/clothing/shoes/jackboots{ @@ -2039,21 +2340,24 @@ }, /turf/open/floor/prison, /area/lv522/indoors/a_block/security/glass) -"bnd" = ( -/obj/structure/prop/turbine_extras, -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/lv522/landing_zone_2/ceiling) "bnf" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/prison{ icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) +"bny" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/transmitter/colony_net{ + phone_category = "LV522 Chances Claim"; + phone_color = "red"; + phone_id = "Reactor Garage"; + pixel_y = 26 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/reactor_garage) "bnz" = ( /obj/structure/surface/table/almayer, /obj/structure/flora/pottedplant{ @@ -2091,7 +2395,7 @@ pixel_y = 1 }, /obj/item/prop/colony/used_flare, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/n_rockies) "bow" = ( /obj/structure/machinery/light, @@ -2137,6 +2441,15 @@ /obj/structure/cargo_container/grant/rightmid, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) +"bry" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, +/turf/open/asphalt/cement{ + icon_state = "cement4" + }, +/area/lv522/outdoors/colony_streets/north_west_street) "bsx" = ( /obj/structure/cargo_container/kelland/right, /turf/open/floor/corsat{ @@ -2149,7 +2462,7 @@ pixel_x = 1; pixel_y = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/nw_rockies) "bsG" = ( /turf/open/floor/plating/plating_catwalk/prison, @@ -2163,8 +2476,8 @@ "btP" = ( /obj/structure/closet/emcloset, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/turf/open/floor/strata{ + icon_state = "blue1" }, /area/lv522/outdoors/colony_streets/windbreaker/observation) "buD" = ( @@ -2180,6 +2493,16 @@ icon_state = "darkredfull2" }, /area/lv522/indoors/a_block/bridges/garden_bridge) +"bvI" = ( +/obj/structure/surface/table/almayer, +/obj/structure/prop/server_equipment/laptop, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/command_centre) "bvK" = ( /obj/structure/machinery/door/airlock/almayer/medical/glass{ dir = 1; @@ -2215,7 +2538,7 @@ pixel_x = -12; pixel_y = -4 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_street) "bwy" = ( /obj/structure/prop/ice_colony/dense/planter_box{ @@ -2231,6 +2554,10 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) +"bwF" = ( +/obj/item/stack/rods, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/south_street) "bwH" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/surface/rack, @@ -2248,7 +2575,7 @@ }, /area/lv522/indoors/c_block/t_comm) "bwU" = ( -/obj/structure/largecrate/random/case/double, +/obj/structure/largecrate/random, /turf/open/floor/corsat{ icon_state = "plate" }, @@ -2286,6 +2613,7 @@ /area/lv522/atmos/east_reactor) "bye" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/floor/corsat{ icon_state = "brown" }, @@ -2319,6 +2647,14 @@ icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/storage_blocks) +"bzv" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison{ + dir = 1; + icon_state = "cell_stripe" + }, +/area/lv522/atmos/reactor_garage) "bzC" = ( /turf/closed/wall/r_wall/biodome/biodome_unmeltable, /area/lv522/atmos/cargo_intake) @@ -2395,6 +2731,13 @@ }, /turf/open/floor/wood, /area/lv522/indoors/a_block/fitness/glass) +"bBB" = ( +/obj/structure/prop/invuln/ice_prefab/trim{ + dir = 8 + }, +/obj/structure/cargo_container/grant/left, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/w_rockies) "bBF" = ( /obj/item/ammo_box/magazine/misc/mre, /obj/item/prop/colony/usedbandage{ @@ -2418,6 +2761,28 @@ }, /turf/open/gm/river, /area/lv522/indoors/a_block/kitchen/damage) +"bBJ" = ( +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/lv522/atmos/reactor_garage) +"bBW" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/platform{ + dir = 4 + }, +/turf/open/asphalt/cement{ + icon_state = "cement3" + }, +/area/lv522/outdoors/colony_streets/north_east_street) +"bCd" = ( +/obj/structure/machinery/light, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor) "bCh" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ @@ -2440,6 +2805,16 @@ icon_state = "cement9" }, /area/lv522/outdoors/colony_streets/south_street) +"bCX" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "bDk" = ( /obj/structure/bed/chair/comfy{ dir = 8 @@ -2463,13 +2838,15 @@ /turf/open/floor/prison, /area/lv522/indoors/lone_buildings/storage_blocks) "bDw" = ( -/obj/structure/machinery/computer/cameras{ +/obj/vehicle/powerloader{ dir = 4; - network = null; - pixel_x = -16 + layer = 3.5 + }, +/obj/structure/machinery/light{ + dir = 8 }, /turf/open/floor/corsat{ - icon_state = "plate" + icon_state = "marked" }, /area/lv522/atmos/east_reactor/north) "bDI" = ( @@ -2562,6 +2939,9 @@ /obj/structure/machinery/cm_vending/sorted/tech/comp_storage{ req_access = list(7,23,27) }, +/obj/structure/machinery/light{ + dir = 4 + }, /turf/open/floor/corsat{ icon_state = "plate" }, @@ -2571,6 +2951,17 @@ icon_state = "white_cyan3" }, /area/lv522/indoors/a_block/medical) +"bHA" = ( +/obj/item/storage/backpack/marine/satchel{ + desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; + icon = 'icons/obj/janitor.dmi'; + icon_state = "trashbag3"; + name = "trash bag"; + pixel_x = -4; + pixel_y = 6 + }, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/colony_streets/north_west_street) "bHF" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 1 @@ -2589,7 +2980,7 @@ /area/lv522/indoors/c_block/t_comm) "bIe" = ( /obj/item/stack/sheet/metal, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/n_rockies) "bIh" = ( /obj/structure/surface/table/almayer, @@ -2634,11 +3025,23 @@ /turf/closed/wall/shiva/prefabricated/reinforced, /area/lv522/atmos/cargo_intake) "bIQ" = ( -/obj/structure/prop/invuln/overhead/flammable_pipe/fly{ - icon_state = "flammable_pipe_3" +/obj/structure/largecrate/random/case/double, +/turf/open/floor/corsat{ + icon_state = "plate" }, -/turf/open/floor/corsat, /area/lv522/atmos/east_reactor) +"bIY" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat{ + dir = 5; + icon_state = "brown" + }, +/area/lv522/atmos/west_reactor) +"bJa" = ( +/turf/open/floor/shiva{ + icon_state = "radiator_tile2" + }, +/area/lv522/indoors/a_block/corpo/glass) "bJp" = ( /obj/item/storage/backpack/marine/satchel{ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; @@ -2659,11 +3062,21 @@ icon_state = "kitchen" }, /area/lv522/indoors/a_block/kitchen) +"bJy" = ( +/obj/structure/surface/table/almayer, +/obj/effect/landmark/objective_landmark/far, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "bJE" = ( -/obj/structure/prop/invuln/overhead/flammable_pipe/fly{ - dir = 9 +/obj/structure/prop/vehicles/crawler{ + icon_state = "crawler_fuel"; + pixel_y = 5 + }, +/turf/open/floor/corsat{ + icon_state = "plate" }, -/turf/open/floor/corsat, /area/lv522/atmos/east_reactor) "bJG" = ( /obj/effect/decal/cleanable/dirt, @@ -2677,6 +3090,10 @@ icon_state = "darkyellowfull2" }, /area/lv522/indoors/c_block/t_comm) +"bJN" = ( +/obj/item/stack/folding_barricade, +/turf/open/floor/prison, +/area/lv522/atmos/way_in_command_centre) "bJZ" = ( /obj/structure/barricade/wooden{ dir = 4 @@ -2684,11 +3101,15 @@ /turf/open/floor/prison, /area/lv522/indoors/c_block/cargo) "bKb" = ( -/obj/structure/prop/invuln/overhead/flammable_pipe/fly{ - dir = 8 +/obj/structure/surface/rack, +/obj/item/clothing/head/hardhat/dblue{ + pixel_x = 6; + pixel_y = 11 + }, +/obj/item/clothing/head/hardhat/white, +/turf/open/floor/corsat{ + icon_state = "plate" }, -/obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor/corsat, /area/lv522/atmos/east_reactor) "bKk" = ( /turf/open/floor/corsat{ @@ -2696,6 +3117,21 @@ icon_state = "browncorner" }, /area/lv522/atmos/cargo_intake) +"bKn" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 4; + id = "Reactor_garage_1" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/reactor_garage) +"bKq" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 10 + }, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/w_rockies) "bKO" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -2706,16 +3142,24 @@ }, /area/lv522/outdoors/colony_streets/central_streets) "bLh" = ( -/obj/structure/largecrate/random{ - layer = 2.9 +/obj/structure/surface/table/almayer, +/obj/structure/prop/server_equipment/laptop/on{ + pixel_x = 1; + pixel_y = 6 + }, +/turf/open/floor/corsat{ + icon_state = "plate" }, -/turf/open/floor/corsat, /area/lv522/atmos/east_reactor) "bLk" = ( -/obj/item/reagent_container/spray/cleaner/drone{ - pixel_x = -3; +/obj/structure/surface/table/almayer, +/obj/item/tool/wirecutters{ pixel_y = 6 }, +/obj/item/weapon/wirerod{ + pixel_x = -3; + pixel_y = 3 + }, /turf/open/floor/corsat{ icon_state = "plate" }, @@ -2749,24 +3193,23 @@ }, /area/lv522/indoors/c_block/casino) "bMa" = ( -/obj/structure/largecrate/random/case/double, +/obj/structure/largecrate/random/case, /turf/open/floor/corsat{ - dir = 8; - icon_state = "brown" + icon_state = "plate" }, /area/lv522/atmos/east_reactor) "bMB" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_street) "bMN" = ( /obj/item/lightstick/red/spoke/planted{ pixel_x = 12; pixel_y = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/central_streets) "bMX" = ( /turf/closed/shuttle{ @@ -2803,10 +3246,18 @@ }, /area/lv522/indoors/a_block/dorms) "bNE" = ( -/obj/structure/largecrate/random/case, -/turf/open/floor/corsat{ - icon_state = "squares" +/obj/item/tank/oxygen{ + pixel_x = 4; + pixel_y = 19 }, +/obj/item/tool/mop{ + desc = "Unlock the power of Mop-Fu!"; + force = 35; + pixel_x = -12; + pixel_y = 24 + }, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor/corsat, /area/lv522/atmos/east_reactor) "bNJ" = ( /obj/structure/prop/invuln/lattice_prop{ @@ -2824,9 +3275,19 @@ }, /area/lv522/indoors/a_block/dorms) "bNT" = ( -/obj/structure/largecrate/random, +/obj/effect/landmark/xeno_spawn, /turf/open/floor/corsat{ - icon_state = "squares" + dir = 1; + icon_state = "brown" + }, +/area/lv522/atmos/east_reactor) +"bOv" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "marked" }, /area/lv522/atmos/east_reactor) "bOE" = ( @@ -2849,7 +3310,7 @@ /obj/structure/prop/invuln/ice_prefab/roof_greeble{ dir = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/north_street) "bPJ" = ( /turf/closed/wall/strata_outpost, @@ -2888,18 +3349,26 @@ icon_state = "marked" }, /area/lv522/indoors/a_block/fitness/glass) +"bQq" = ( +/obj/structure/cargo_container/wy/mid{ + layer = 5 + }, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/w_rockies) "bQC" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, -/obj/structure/prop/invuln/overhead/flammable_pipe/fly{ +/obj/structure/bed/chair{ dir = 1 }, -/turf/open/floor/corsat, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "brown" + }, /area/lv522/atmos/east_reactor) "bQG" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/nw_rockies) "bQN" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -2966,12 +3435,25 @@ icon_state = "radiator_tile2" }, /area/lv522/indoors/a_block/bridges/op_centre) +"bSM" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat{ + dir = 8; + icon_state = "brown" + }, +/area/lv522/atmos/west_reactor) +"bSU" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/asphalt/cement, +/area/lv522/outdoors/n_rockies) "bTo" = ( /obj/structure/stairs/perspective{ dir = 9; icon_state = "p_stair_full" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_1) "bTA" = ( /obj/structure/surface/table/gamblingtable, @@ -3060,7 +3542,7 @@ layer = 3.1; pixel_y = 24 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/central_streets) "bVA" = ( /obj/structure/bed/chair{ @@ -3083,6 +3565,14 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/oob) +"bVX" = ( +/obj/structure/machinery/door/airlock/almayer/engineering/colony{ + dir = 1 + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/filt) "bWd" = ( /obj/structure/flora/jungle/planttop1, /obj/structure/flora/bush/ausbushes/ppflowers, @@ -3103,6 +3593,10 @@ icon_state = "radiator_tile2" }, /area/lv522/oob) +"bWt" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/auto_turf/shale/layer2, +/area/lv522/outdoors/w_rockies) "bWA" = ( /obj/structure/prop/ice_colony/flamingo{ dir = 4; @@ -3114,6 +3608,15 @@ }, /turf/open/organic/grass, /area/lv522/indoors/a_block/garden) +"bWQ" = ( +/obj/structure/pipes/standard/manifold/hidden/green{ + dir = 8 + }, +/turf/open/floor/prison{ + dir = 8; + icon_state = "cell_stripe" + }, +/area/lv522/atmos/reactor_garage) "bWX" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 9 @@ -3166,7 +3669,7 @@ /obj/structure/pipes/standard/manifold/hidden/green{ dir = 8 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/central_streets) "bXU" = ( /obj/structure/machinery/door/airlock/almayer/generic{ @@ -3215,12 +3718,21 @@ pixel_x = 6; pixel_y = 6 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/central_streets) "bYV" = ( /obj/structure/platform, /turf/open/asphalt/cement, /area/lv522/outdoors/colony_streets/south_street) +"bYZ" = ( +/obj/structure/bookcase{ + density = 0; + icon_state = "book-5"; + pixel_y = 16 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood/ship, +/area/lv522/atmos/way_in_command_centre) "bZd" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, @@ -3231,6 +3743,10 @@ icon_state = "browncorner" }, /area/lv522/atmos/east_reactor/north) +"bZB" = ( +/obj/structure/girder/displaced, +/turf/open/floor/corsat, +/area/lv522/atmos/outdoor) "bZF" = ( /obj/structure/fence, /obj/effect/decal/warning_stripes{ @@ -3308,6 +3824,21 @@ icon_state = "plate" }, /area/lv522/atmos/east_reactor/north) +"caE" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood/ship, +/area/lv522/atmos/way_in_command_centre) +"caN" = ( +/obj/structure/pipes/standard/manifold/hidden/green{ + dir = 1 + }, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/lv522/atmos/east_reactor/west) "caP" = ( /obj/effect/decal/cleanable/blood/xeno{ icon_state = "xgibleg" @@ -3324,6 +3855,24 @@ icon_state = "darkredfull2" }, /area/lv522/indoors/a_block/kitchen/damage) +"caV" = ( +/obj/structure/pipes/standard/manifold/hidden/green{ + dir = 1 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/sewer) +"cbn" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + pixel_y = -1 + }, +/turf/open/floor{ + dir = 4; + icon_state = "whiteyellowfull" + }, +/area/lv522/oob/w_y_vault) "cbp" = ( /obj/structure/machinery/squeezer, /turf/open/floor{ @@ -3361,23 +3910,23 @@ dir = 8; icon_state = "flammable_pipe_3" }, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/floor/corsat{ icon_state = "plate" }, /area/lv522/atmos/east_reactor) "cce" = ( -/obj/structure/prop/invuln/overhead/flammable_pipe/fly{ - dir = 4; - icon_state = "flammable_pipe_3" +/obj/structure/surface/table/almayer, +/obj/item/device/analyzer{ + pixel_x = -9; + pixel_y = 3 }, -/turf/open/floor/corsat, -/area/lv522/atmos/east_reactor) -"ccg" = ( -/obj/structure/barricade/handrail{ - dir = 8 +/obj/item/clipboard{ + pixel_x = 5; + pixel_y = 3 }, /turf/open/floor/corsat{ - dir = 8; + dir = 1; icon_state = "brown" }, /area/lv522/atmos/east_reactor) @@ -3387,10 +3936,11 @@ /turf/open/floor/prison, /area/lv522/indoors/c_block/casino) "ccu" = ( -/obj/structure/prop/invuln/overhead/flammable_pipe/fly{ - icon_state = "flammable_pipe_2" +/obj/structure/largecrate/random/case, +/turf/open/floor/corsat{ + dir = 5; + icon_state = "brown" }, -/turf/open/floor/corsat, /area/lv522/atmos/east_reactor) "ccN" = ( /obj/item/reagent_container/glass/bucket, @@ -3408,19 +3958,19 @@ /turf/open/floor/corsat, /area/lv522/atmos/east_reactor) "cdj" = ( -/obj/structure/prop/invuln/overhead/flammable_pipe/fly{ - dir = 8; - icon_state = "flammable_pipe_3" - }, +/obj/structure/largecrate/random, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/floor/corsat, /area/lv522/atmos/east_reactor) "cdP" = ( -/obj/structure/prop/vehicles/crawler{ - icon_state = "crawler_fuel"; - pixel_y = 5 +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 }, -/turf/open/floor/corsat, -/area/lv522/atmos/east_reactor) +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/north_command_centre) "cem" = ( /obj/structure/bed/chair/comfy{ dir = 4 @@ -3448,15 +3998,12 @@ }, /area/lv522/indoors/lone_buildings/engineering) "cfg" = ( -/obj/item/clothing/head/hardhat/white, -/obj/structure/surface/rack, -/obj/item/clothing/head/hardhat/dblue{ - pixel_x = 6; - pixel_y = 11 +/obj/structure/prop/vehicles/crawler{ + dir = 8; + layer = 3.1 }, /turf/open/floor/corsat{ - dir = 8; - icon_state = "brown" + icon_state = "plate" }, /area/lv522/atmos/east_reactor) "cfv" = ( @@ -3476,8 +4023,14 @@ /obj/effect/decal/warning_stripes{ icon_state = "S" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_street) +"cgn" = ( +/obj/structure/platform_decoration{ + dir = 8 + }, +/turf/open/gm/river, +/area/lv522/atmos/sewer) "cgB" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 10 @@ -3494,15 +4047,9 @@ }, /area/lv522/indoors/c_block/bridge) "chm" = ( -/obj/structure/surface/table/almayer, -/obj/structure/prop/server_equipment/laptop/on{ - pixel_x = 1; - pixel_y = 6 - }, -/turf/open/floor/corsat{ - icon_state = "squares" - }, -/area/lv522/atmos/east_reactor) +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor/corsat, +/area/lv522/atmos/west_reactor) "cho" = ( /obj/item/weapon/gun/rifle/mar40/carbine, /turf/open/floor/plating{ @@ -3516,24 +4063,53 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/c_block/casino) +"chT" = ( +/obj/effect/spawner/gibspawner/xeno, +/obj/effect/decal/cleanable/blood/xeno{ + icon_state = "xgib3" + }, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor/corsat{ + dir = 5; + icon_state = "brown" + }, +/area/lv522/atmos/east_reactor/south) "cia" = ( /turf/open/floor/strata{ icon_state = "white_cyan1" }, /area/lv522/indoors/lone_buildings/chunk) "cil" = ( -/obj/structure/surface/table/almayer, -/obj/item/weapon/wirerod{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/tool/wirecutters{ - pixel_y = 6 - }, +/obj/effect/landmark/queen_spawn, /turf/open/floor/corsat{ icon_state = "squares" }, /area/lv522/atmos/east_reactor) +"cim" = ( +/obj/structure/pipes/vents/pump, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 2 + }, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) +"ciw" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/turf/open/asphalt/cement, +/area/lv522/outdoors/n_rockies) "ciA" = ( /obj/structure/cargo_container/kelland/right, /turf/open/asphalt/cement{ @@ -3552,7 +4128,7 @@ "ciL" = ( /obj/item/tool/pen/clicky, /turf/open/floor/corsat{ - icon_state = "squares" + icon_state = "marked" }, /area/lv522/atmos/east_reactor) "ciS" = ( @@ -3578,8 +4154,18 @@ icon_state = "NW-out"; pixel_y = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/nw_rockies) +"ckK" = ( +/obj/structure/prop/invuln/ice_prefab{ + dir = 1; + icon_state = "fab_2" + }, +/obj/structure/prop/invuln/ice_prefab{ + icon_state = "fab_2" + }, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/w_rockies) "ckT" = ( /obj/item/weapon/gun/revolver/cmb, /obj/structure/pipes/standard/simple/hidden/green{ @@ -3599,12 +4185,7 @@ }, /area/lv522/indoors/c_block/mining) "clf" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/structure/prop/invuln/overhead/flammable_pipe/fly{ - icon_state = "flammable_pipe_2" - }, +/obj/effect/landmark/xeno_spawn, /turf/open/floor/corsat, /area/lv522/atmos/east_reactor) "clR" = ( @@ -3641,6 +4222,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 10 }, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/floor/corsat, /area/lv522/atmos/east_reactor) "cmF" = ( @@ -3653,7 +4235,7 @@ dir = 8; layer = 2.9 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/central_streets) "cnw" = ( /obj/structure/bed/chair{ @@ -3664,6 +4246,13 @@ icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) +"cnA" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, +/obj/effect/landmark/xeno_spawn, +/turf/open/floor/corsat{ + icon_state = "brown" + }, +/area/lv522/atmos/east_reactor/south) "cnN" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -3769,6 +4358,14 @@ }, /turf/open/floor/prison, /area/lv522/indoors/b_block/bridge) +"cpZ" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "browncorner" + }, +/area/lv522/atmos/east_reactor/south) "cqb" = ( /obj/structure/stairs/perspective{ dir = 8; @@ -3776,6 +4373,12 @@ }, /turf/open/floor/prison, /area/lv522/indoors/c_block/cargo) +"cqe" = ( +/obj/structure/prop/invuln/ice_prefab{ + dir = 1 + }, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/w_rockies) "cqh" = ( /obj/structure/surface/table/almayer, /obj/item/newspaper, @@ -3863,18 +4466,12 @@ /turf/open/floor/prison, /area/lv522/indoors/c_block/mining) "crX" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/structure/machinery/door/poddoor/almayer/closed{ - dir = 8; - id = "Containers_west_LV522"; - name = "Emergency Lockdown" - }, +/obj/structure/prop/ice_colony/ground_wire, +/obj/effect/landmark/structure_spawner/xvx_hive/xeno_core, /turf/open/floor/corsat{ icon_state = "marked" }, -/area/lv522/atmos/cargo_intake) +/area/lv522/atmos/east_reactor) "csv" = ( /obj/structure/platform{ dir = 1 @@ -3884,6 +4481,14 @@ icon_state = "darkredfull2" }, /area/lv522/indoors/a_block/kitchen) +"csy" = ( +/obj/structure/surface/table/almayer, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "browncorner" + }, +/area/lv522/atmos/east_reactor/south) "csK" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 6 @@ -3892,6 +4497,16 @@ icon_state = "browncorner" }, /area/lv522/atmos/north_command_centre) +"csS" = ( +/obj/effect/spawner/gibspawner/xeno, +/obj/effect/decal/cleanable/blood/xeno{ + icon_state = "xgib3" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "csU" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out" @@ -3919,12 +4534,28 @@ icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_east_street) +"cuu" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, +/obj/effect/landmark/xeno_spawn, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "cuF" = ( -/obj/structure/machinery/door/airlock/almayer/maint, +/obj/item/tool/warning_cone{ + pixel_x = -10; + pixel_y = 11 + }, +/obj/structure/machinery/light{ + dir = 1 + }, /turf/open/floor/corsat{ - icon_state = "marked" + icon_state = "plate" }, -/area/lv522/atmos/north_command_centre) +/area/lv522/atmos/east_reactor/west) "cuY" = ( /obj/structure/machinery/cm_vending/sorted/tech/electronics_storage, /turf/open/floor/prison{ @@ -3959,22 +4590,34 @@ /area/lv522/indoors/c_block/mining) "cwq" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/floor/corsat{ icon_state = "plate" }, /area/lv522/atmos/east_reactor/north) -"cwL" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, +"cwr" = ( +/obj/structure/machinery/deployable/barrier, /obj/effect/decal/warning_stripes{ - icon_state = "W" + icon_state = "W"; + pixel_x = -1 }, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/lv522/landing_zone_2/ceiling) +/area/lv522/atmos/way_in_command_centre) +"cwE" = ( +/obj/structure/largecrate/random/secure, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/colony_streets/north_west_street) +"cwL" = ( +/turf/closed/wall/shiva/prefabricated, +/area/lv522/landing_zone_2) +"cwN" = ( +/obj/structure/prop/invuln/ice_prefab{ + dir = 10 + }, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/w_rockies) "cwO" = ( /obj/effect/decal/cleanable/blood/oil/streak, /turf/open/floor/corsat, @@ -4049,20 +4692,21 @@ icon_state = "white_cyan2" }, /area/lv522/indoors/a_block/medical/glass) -"cyv" = ( -/obj/item/tool/mop{ - desc = "Unlock the power of Mop-Fu!"; - force = 35; - pixel_x = -12; - pixel_y = 24 - }, -/obj/item/tank/oxygen{ - pixel_x = 4; - pixel_y = 19 +"cyu" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 }, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/obj/structure/machinery/light, /turf/open/floor/corsat{ icon_state = "plate" }, +/area/lv522/atmos/cargo_intake) +"cyv" = ( +/obj/effect/landmark/xeno_spawn, +/turf/open/floor/corsat{ + icon_state = "squares" + }, /area/lv522/atmos/east_reactor) "cyH" = ( /obj/structure/machinery/space_heater/radiator/red{ @@ -4072,6 +4716,13 @@ icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) +"cyO" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/lv522/atmos/west_reactor) "cyV" = ( /obj/structure/machinery/light{ dir = 1 @@ -4099,13 +4750,8 @@ }, /area/lv522/indoors/c_block/mining) "czC" = ( -/obj/structure/bed/chair{ - dir = 1 - }, -/turf/open/floor/corsat{ - icon_state = "squares" - }, -/area/lv522/atmos/east_reactor) +/turf/closed/wall/strata_outpost, +/area/lv522/atmos/east_reactor/east) "czG" = ( /obj/structure/sign/safety/radio_rad{ pixel_y = 26 @@ -4114,7 +4760,7 @@ icon_state = "N"; pixel_y = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_west_street) "czO" = ( /obj/structure/blocker/invisible_wall, @@ -4143,17 +4789,9 @@ /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/north_west_street) "cAp" = ( -/obj/structure/surface/table/almayer, -/obj/item/device/analyzer{ - pixel_x = -9; - pixel_y = 3 - }, -/obj/item/clipboard{ - pixel_x = 5; - pixel_y = 3 - }, +/obj/effect/landmark/xeno_spawn, /turf/open/floor/corsat{ - icon_state = "squares" + icon_state = "browncorner" }, /area/lv522/atmos/east_reactor) "cAx" = ( @@ -4217,6 +4855,10 @@ icon_state = "plate" }, /area/lv522/atmos/north_command_centre) +"cCH" = ( +/obj/effect/decal/cleanable/generic, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/north_east_street) "cCK" = ( /obj/structure/machinery/disposal, /turf/open/floor/prison{ @@ -4224,6 +4866,12 @@ icon_state = "blue_plate" }, /area/lv522/indoors/a_block/admin) +"cCL" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/way_in_command_centre) "cCN" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/generic, @@ -4249,7 +4897,7 @@ dir = 10; icon_state = "p_stair_full" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_2) "cDo" = ( /turf/open/floor/corsat{ @@ -4291,6 +4939,7 @@ /area/lv522/indoors/c_block/mining) "cEw" = ( /obj/structure/surface/table/almayer, +/obj/structure/machinery/light, /turf/open/floor/corsat{ icon_state = "brown" }, @@ -4352,13 +5001,11 @@ }, /area/lv522/indoors/b_block/bridge) "cGd" = ( -/obj/structure/surface/table/almayer, -/obj/structure/prop/server_equipment/laptop/on, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/turf/open/floor/corsat{ + dir = 5; + icon_state = "brown" }, -/area/lv522/outdoors/colony_streets/windbreaker/observation) +/area/lv522/atmos/east_reactor/east) "cGw" = ( /obj/structure/machinery/light{ dir = 8 @@ -4407,6 +5054,15 @@ }, /turf/open/floor/corsat, /area/lv522/atmos/east_reactor) +"cHu" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1; + welded = 1 + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/east_reactor/south) "cHw" = ( /obj/structure/largecrate/random, /turf/open/asphalt/cement{ @@ -4435,9 +5091,9 @@ }, /area/lv522/indoors/a_block/dorms) "cHL" = ( -/obj/structure/largecrate/random, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/floor/corsat{ - dir = 4; + dir = 8; icon_state = "brown" }, /area/lv522/atmos/east_reactor) @@ -4472,16 +5128,15 @@ }, /area/lv522/indoors/b_block/hydro) "cIm" = ( -/obj/structure/largecrate/random/case, -/turf/open/floor/corsat, -/area/lv522/atmos/east_reactor) +/turf/open/floor/corsat{ + dir = 8; + icon_state = "browncorner" + }, +/area/lv522/atmos/east_reactor/east) "cIr" = ( /obj/structure/bed/chair{ dir = 4 }, -/obj/structure/prop/invuln/overhead/flammable_pipe/fly{ - icon_state = "flammable_pipe_2" - }, /turf/open/floor/corsat, /area/lv522/atmos/east_reactor) "cIs" = ( @@ -4501,14 +5156,6 @@ }, /turf/open/floor/prison, /area/lv522/indoors/c_block/garage) -"cIC" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/turf/open/floor/corsat{ - icon_state = "brown" - }, -/area/lv522/atmos/cargo_intake) "cIQ" = ( /obj/structure/surface/table/almayer, /obj/item/trash/plate{ @@ -4577,6 +5224,12 @@ icon_state = "brown" }, /area/lv522/oob) +"cJm" = ( +/obj/structure/prop/invuln/ice_prefab{ + dir = 1 + }, +/turf/open/auto_turf/shale/layer2, +/area/lv522/outdoors/w_rockies) "cJo" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat{ @@ -4585,25 +5238,15 @@ /area/lv522/atmos/north_command_centre) "cJy" = ( /obj/effect/decal/cleanable/blood/xeno, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/nw_rockies) "cJA" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/structure/fence{ - layer = 2.9 - }, -/turf/open/floor/strata{ - dir = 4; - icon_state = "floor3" +/obj/item/device/flashlight/lamp/tripod{ + layer = 6; + pixel_y = 11 }, -/area/lv522/outdoors/nw_rockies) +/turf/closed/wall/strata_ice/dirty, +/area/lv522/oob) "cJW" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 10 @@ -4637,8 +5280,8 @@ /turf/open/asphalt/cement, /area/lv522/outdoors/colony_streets/east_central_street) "cKp" = ( -/obj/structure/window/framed/colony, -/turf/open/floor/corsat, +/obj/structure/window/framed/strata/reinforced, +/turf/open/floor/plating, /area/lv522/atmos/east_reactor/north) "cKw" = ( /obj/structure/girder, @@ -4646,18 +5289,24 @@ /area/lv522/atmos/east_reactor/west) "cKy" = ( /obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/floor/corsat, /area/lv522/atmos/east_reactor/west) "cKC" = ( /obj/structure/girder/displaced, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/floor/corsat, /area/lv522/atmos/east_reactor/west) "cKF" = ( -/obj/item/explosive/plastic/breaching_charge{ - unacidable = 1 +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, -/turf/open/auto_turf/shale/layer0, -/area/lv522/outdoors/n_rockies) +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/nw_rockies) "cKG" = ( /turf/closed/wall/strata_ice/dirty, /area/lv522/outdoors/nw_rockies) @@ -4681,12 +5330,11 @@ /turf/open/floor/corsat, /area/lv522/atmos/east_reactor) "cLb" = ( -/obj/structure/largecrate/random/case/double, -/obj/structure/prop/invuln/overhead/flammable_pipe/fly{ - icon_state = "flammable_pipe_2" +/turf/open/floor/corsat{ + dir = 4; + icon_state = "browncorner" }, -/turf/open/floor/corsat, -/area/lv522/atmos/east_reactor) +/area/lv522/atmos/east_reactor/east) "cLi" = ( /obj/structure/barricade/deployable{ dir = 8 @@ -4720,6 +5368,14 @@ }, /turf/open/floor/plating, /area/lv522/landing_zone_1/tunnel) +"cLH" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "cLQ" = ( /obj/structure/largecrate/random/secure, /turf/open/floor/prison{ @@ -4770,12 +5426,24 @@ icon_state = "white_cyan4" }, /area/lv522/indoors/a_block/medical/glass) -"cNB" = ( -/obj/structure/prop/invuln/overhead/flammable_pipe/fly{ +"cMW" = ( +/obj/structure/pipes/standard/manifold/hidden/green{ dir = 1 }, -/turf/open/floor/corsat, -/area/lv522/atmos/east_reactor) +/turf/open/floor/corsat{ + dir = 6; + icon_state = "brown" + }, +/area/lv522/atmos/reactor_garage) +"cNB" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + dir = 10; + icon_state = "brown" + }, +/area/lv522/atmos/east_reactor/east) "cNO" = ( /obj/structure/machinery/colony_floodlight_switch{ pixel_y = 30 @@ -4796,7 +5464,7 @@ /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/hallway/damage) "cNV" = ( -/turf/closed/wall, +/turf/closed/wall/strata_outpost, /area/lv522/atmos/north_command_centre) "cOA" = ( /obj/structure/machinery/light{ @@ -4807,8 +5475,17 @@ icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/storage_blocks) +"cOJ" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/cargo_intake) "cOZ" = ( /obj/structure/prop/invuln/overhead/flammable_pipe/fly, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/floor/corsat{ icon_state = "plate" }, @@ -4816,13 +5493,11 @@ "cPi" = ( /obj/effect/spawner/gibspawner/xeno, /obj/effect/decal/cleanable/blood/xeno, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/nw_rockies) "cPx" = ( -/obj/structure/blocker/forcefield/vehicles, -/turf/open/floor/corsat{ - icon_state = "marked" - }, +/obj/structure/window/framed/corsat, +/turf/open/floor/corsat, /area/lv522/atmos/filt) "cPy" = ( /turf/open/floor/corsat{ @@ -4830,13 +5505,6 @@ icon_state = "brown" }, /area/lv522/atmos/filt) -"cPH" = ( -/obj/structure/blocker/forcefield/vehicles, -/turf/open/floor/corsat{ - dir = 8; - icon_state = "brown" - }, -/area/lv522/atmos/filt) "cPN" = ( /obj/structure/prop/invuln/overhead/flammable_pipe/fly{ dir = 1; @@ -4945,6 +5613,13 @@ icon_state = "cement4" }, /area/lv522/outdoors/colony_streets/central_streets) +"cRD" = ( +/obj/structure/blocker/forcefield/vehicles, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/east_reactor/south) "cRG" = ( /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor/corsat{ @@ -4968,14 +5643,13 @@ }, /area/lv522/atmos/north_command_centre) "cRT" = ( -/obj/structure/prop/vehicles/crawler{ - dir = 8; - layer = 3.1 +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 }, /turf/open/floor/corsat{ - icon_state = "plate" + icon_state = "brown" }, -/area/lv522/atmos/east_reactor) +/area/lv522/atmos/east_reactor/east) "cSb" = ( /obj/structure/largecrate, /turf/open/floor/corsat{ @@ -5014,6 +5688,10 @@ icon_state = "darkredfull2" }, /area/lv522/indoors/a_block/kitchen/glass) +"cTU" = ( +/obj/structure/curtain/red, +/turf/open/floor/wood/ship, +/area/lv522/atmos/way_in_command_centre) "cTX" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/corsat, @@ -5044,11 +5722,11 @@ /obj/structure/prop/ice_colony/ground_wire{ dir = 8 }, -/obj/structure/pipes/standard/manifold/hidden/green{ - dir = 1 +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 }, /turf/open/floor/corsat{ - icon_state = "squares" + icon_state = "marked" }, /area/lv522/atmos/east_reactor) "cUl" = ( @@ -5066,6 +5744,26 @@ icon_state = "squares" }, /area/lv522/atmos/east_reactor/east) +"cUA" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/vents/pump, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_x = -1; + pixel_y = 2 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 2 + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "cUG" = ( /turf/closed/wall/strata_outpost, /area/lv522/indoors/c_block/garage) @@ -5123,14 +5821,8 @@ icon_state = "darkredfull2" }, /area/lv522/outdoors/colony_streets/north_street) -"cWc" = ( -/obj/structure/blocker/forcefield/vehicles, -/turf/open/floor/corsat{ - icon_state = "squares" - }, -/area/lv522/atmos/filt) "cWf" = ( -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/atmos/cargo_intake) "cWg" = ( /obj/item/clothing/shoes/jackboots{ @@ -5159,6 +5851,15 @@ icon_state = "darkredfull2" }, /area/lv522/indoors/a_block/security) +"cWH" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/lv522/atmos/east_reactor) "cWL" = ( /turf/open/floor/corsat{ dir = 8; @@ -5201,8 +5902,7 @@ "cWZ" = ( /obj/structure/blocker/forcefield/vehicles, /turf/open/floor/corsat{ - dir = 4; - icon_state = "brown" + icon_state = "marked" }, /area/lv522/atmos/filt) "cXf" = ( @@ -5210,6 +5910,14 @@ icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) +"cXi" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/obj/structure/machinery/photocopier, +/obj/structure/machinery/light, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "cXm" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ @@ -5230,6 +5938,14 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison, /area/lv522/indoors/a_block/security) +"cYe" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor) "cYf" = ( /obj/structure/closet/secure_closet/freezer/fridge/full, /obj/item/reagent_container/food/condiment/enzyme, @@ -5241,7 +5957,7 @@ /area/lv522/indoors/a_block/kitchen) "cYn" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) "cYE" = ( /obj/structure/surface/table/almayer, @@ -5306,6 +6022,10 @@ icon_state = "brown" }, /area/lv522/atmos/east_reactor/east) +"cZH" = ( +/obj/structure/blocker/invisible_wall, +/turf/open/floor/plating, +/area/lv522/atmos/sewer) "cZM" = ( /obj/structure/cargo_container/horizontal/blue/top, /turf/open/floor/prison{ @@ -5484,12 +6204,18 @@ icon_state = "brown" }, /area/lv522/oob) -"dcm" = ( -/obj/structure/largecrate/random/barrel/yellow, +"dck" = ( +/obj/structure/surface/table/almayer, +/obj/item/trash/ceramic_plate{ + pixel_y = 6 + }, +/obj/item/trash/ceramic_plate{ + pixel_y = 8 + }, /turf/open/floor/corsat{ icon_state = "plate" }, -/area/lv522/atmos/north_command_centre) +/area/lv522/atmos/east_reactor/south) "dco" = ( /obj/structure/cargo_container/grant/right, /turf/open/floor/plating, @@ -5502,13 +6228,8 @@ icon_state = "marked" }, /area/lv522/atmos/east_reactor/west) -"dcB" = ( -/obj/structure/cargo_container/grant/rightmid, -/turf/open/floor/corsat{ - icon_state = "plate" - }, -/area/lv522/atmos/north_command_centre) "dcD" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/floor/corsat{ dir = 9; icon_state = "brown" @@ -5536,6 +6257,13 @@ icon_state = "blue_plate" }, /area/lv522/indoors/a_block/admin) +"dcM" = ( +/obj/effect/decal/cleanable/blood, +/obj/effect/alien/resin/sticky, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "ddo" = ( /obj/structure/surface/rack, /obj/item/stack/sheet/metal{ @@ -5658,7 +6386,7 @@ pixel_x = 1 }, /obj/structure/cargo_container/ferret/right, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/nw_rockies) "del" = ( /turf/open/floor/corsat{ @@ -5677,7 +6405,7 @@ /obj/structure/prop/structure_lattice{ layer = 2.9 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/east_central_street) "dfk" = ( /obj/structure/pipes/standard/manifold/hidden/green{ @@ -5721,10 +6449,23 @@ icon_state = "kitchen" }, /area/lv522/indoors/a_block/kitchen) +"dfK" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 10 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/sewer) "dgb" = ( /obj/structure/cryofeed, /turf/open/floor/bluegrid, /area/lv522/atmos/east_reactor) +"dgd" = ( +/turf/open/asphalt/cement{ + icon_state = "cement15" + }, +/area/lv522/outdoors/colony_streets/north_east_street) "dgj" = ( /obj/structure/machinery/light{ dir = 1 @@ -5735,18 +6476,24 @@ }, /area/lv522/indoors/a_block/dorms) "dgq" = ( -/obj/structure/prop/invuln/overhead/flammable_pipe/fly{ - dir = 10 +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 }, -/obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor/corsat, -/area/lv522/atmos/east_reactor) +/turf/open/floor/corsat{ + dir = 8; + icon_state = "browncorner" + }, +/area/lv522/atmos/east_reactor/east) "dgI" = ( -/obj/structure/prop/invuln/overhead/flammable_pipe/fly{ - dir = 8 +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 }, -/turf/open/floor/corsat, -/area/lv522/atmos/east_reactor) +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "brown" + }, +/area/lv522/atmos/west_reactor) "dgJ" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ @@ -5784,6 +6531,11 @@ icon_state = "marked" }, /area/lv522/indoors/a_block/hallway) +"dhH" = ( +/turf/open/asphalt/cement{ + icon_state = "cement12" + }, +/area/lv522/landing_zone_2) "dhJ" = ( /turf/open/floor/corsat{ dir = 8; @@ -5807,9 +6559,8 @@ /obj/structure/prop/ice_colony/ground_wire{ dir = 8 }, -/obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat{ - icon_state = "squares" + icon_state = "marked" }, /area/lv522/atmos/east_reactor) "dhX" = ( @@ -5827,6 +6578,14 @@ icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Tornado) +"dio" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "dip" = ( /obj/structure/prop/ice_colony/ground_wire{ dir = 4 @@ -5869,6 +6628,12 @@ }, /turf/open/floor/prison, /area/lv522/indoors/lone_buildings/storage_blocks) +"djq" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor/corsat{ + icon_state = "brown" + }, +/area/lv522/atmos/filt) "djD" = ( /obj/structure/surface/table/almayer, /obj/item/device/flashlight/lamp/on{ @@ -5948,7 +6713,10 @@ /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/landing_zone_2/ceiling) "dkL" = ( -/turf/closed/wall/r_wall/biodome/biodome_unmeltable, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "brown" + }, /area/lv522/atmos/east_reactor/east) "dkP" = ( /obj/structure/prop/invuln/overhead/flammable_pipe/fly{ @@ -5962,8 +6730,15 @@ /area/lv522/oob) "dkX" = ( /obj/structure/platform_decoration, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_2) +"dli" = ( +/obj/structure/blocker/forcefield/vehicles, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/east_reactor/south) "dlC" = ( /obj/structure/prop/invuln/fire{ pixel_x = 8; @@ -6023,6 +6798,19 @@ icon_state = "plate" }, /area/lv522/indoors/c_block/mining) +"dmE" = ( +/obj/structure/surface/table/almayer, +/obj/structure/flora/pottedplant{ + desc = "It is made of Fiberbush(tm). It contains asbestos. Studies say that greenery calms the mind due to some sort evolved mechanism in the brain. This plant is not calming."; + icon_state = "pottedplant_21"; + layer = 3.1; + name = "synthethic potted plant"; + pixel_y = 12 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "dmG" = ( /obj/structure/barricade/deployable{ dir = 1 @@ -6082,10 +6870,6 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) -"dnA" = ( -/obj/structure/girder, -/turf/open/auto_turf/shale/layer0, -/area/lv522/outdoors/colony_streets/north_east_street) "dnB" = ( /obj/item/clothing/head/helmet/marine/pilot, /turf/open/floor/corsat{ @@ -6162,7 +6946,7 @@ /obj/structure/prop/invuln/ice_prefab{ dir = 9 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/north_street) "doC" = ( /obj/effect/landmark/xeno_spawn, @@ -6182,6 +6966,12 @@ icon_state = "browncorner" }, /area/lv522/atmos/west_reactor) +"dpg" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/west_reactor) "dpj" = ( /obj/structure/cargo_container/hd/mid/alt, /turf/open/floor/corsat{ @@ -6193,8 +6983,20 @@ dir = 1; icon_state = "fab_2" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) +"dpz" = ( +/obj/item/clothing/mask/facehugger{ + desc = "It has some sort of a tube at the end of its tail. What the hell is this thing?"; + icon_state = "facehugger_impregnated"; + layer = 3; + name = "????"; + stat = 2 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "dqn" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_full" @@ -6259,13 +7061,26 @@ }, /area/lv522/indoors/b_block/hydro) "dsa" = ( +/obj/structure/fence, /obj/effect/decal/warning_stripes{ - icon_state = "W" + icon_state = "N"; + pixel_y = 1 }, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" }, /area/lv522/landing_zone_2/ceiling) +"dsc" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "brown" + }, +/area/lv522/atmos/cargo_intake) "dsl" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -6367,6 +7182,12 @@ icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) +"dtR" = ( +/obj/structure/surface/table/almayer, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/reactor_garage) "dua" = ( /obj/effect/decal/cleanable/dirt, /obj/item/prop/colony/used_flare, @@ -6402,15 +7223,30 @@ /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/bridges/op_centre) "dvO" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, -/turf/open/floor/corsat, -/area/lv522/atmos/outdoor) +/obj/structure/platform_decoration/strata, +/turf/closed/wall/strata_ice/dirty, +/area/lv522/oob) +"dwd" = ( +/obj/item/lightstick/red/spoke/planted{ + pixel_x = -9; + pixel_y = 25 + }, +/obj/structure/prop/ice_colony/ground_wire{ + dir = 4 + }, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/central_streets) "dwG" = ( -/obj/structure/largecrate/random/barrel/yellow, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/floor/corsat{ - icon_state = "marked" + dir = 4; + icon_state = "browncorner" }, -/area/lv522/atmos/north_command_centre) +/area/lv522/atmos/west_reactor) +"dwI" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/turf/open/floor/prison, +/area/lv522/atmos/way_in_command_centre) "dwO" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/simple/hidden/green, @@ -6430,11 +7266,10 @@ /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/c_block/t_comm) "dwP" = ( -/obj/structure/cargo_container/grant/rightmid{ - layer = 3.1 - }, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/floor/corsat{ - icon_state = "plate" + dir = 1; + icon_state = "brown" }, /area/lv522/atmos/north_command_centre) "dwX" = ( @@ -6444,15 +7279,36 @@ icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) +"dxc" = ( +/obj/structure/prop/invuln/overhead_pipe{ + name = "overhead pipe"; + pixel_x = -20; + pixel_y = 13 + }, +/turf/closed/wall/mineral/bone_resin, +/area/lv522/atmos/east_reactor/south) "dxl" = ( /obj/effect/decal/cleanable/flour, /turf/open/floor/prison{ icon_state = "kitchen" }, /area/lv522/indoors/a_block/kitchen) +"dxJ" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/corsat{ + dir = 4; + icon_state = "brown" + }, +/area/lv522/atmos/east_reactor/south) "dxU" = ( -/turf/closed/wall, -/area/lv522/atmos/east_reactor/west) +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/lv522/atmos/west_reactor) "dxY" = ( /obj/structure/machinery/computer/telecomms/server{ pixel_y = 16 @@ -6465,7 +7321,7 @@ }, /area/lv522/indoors/c_block/mining) "dya" = ( -/obj/structure/largecrate/random/barrel, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/floor/corsat{ icon_state = "marked" }, @@ -6494,7 +7350,7 @@ /area/lv522/indoors/a_block/medical) "dyS" = ( /obj/item/stack/sheet/wood, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_street) "dzd" = ( /obj/structure/closet/secure_closet/marshal, @@ -6514,6 +7370,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/floor/corsat{ icon_state = "marked" }, @@ -6525,6 +7382,19 @@ icon_state = "marked" }, /area/lv522/indoors/c_block/casino) +"dAf" = ( +/obj/structure/surface/table/almayer, +/obj/item/paper_bin{ + pixel_y = 5 + }, +/obj/item/tool/pen/blue/clicky, +/obj/structure/machinery/power/apc/weak{ + dir = 1 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/command_centre) "dAm" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat{ @@ -6532,6 +7402,15 @@ icon_state = "brown" }, /area/lv522/atmos/north_command_centre) +"dAG" = ( +/obj/structure/pipes/vents/pump, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor) "dAQ" = ( /obj/structure/platform_decoration{ dir = 1 @@ -6586,6 +7465,15 @@ }, /turf/open/floor/plating, /area/lv522/outdoors/colony_streets/north_east_street) +"dBe" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor) "dBi" = ( /obj/structure/pipes/vents/pump, /obj/effect/decal/cleanable/dirt, @@ -6635,7 +7523,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) "dDp" = ( /obj/structure/surface/table/almayer, @@ -6650,16 +7538,7 @@ }, /area/lv522/indoors/c_block/mining) "dDq" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, +/turf/closed/wall/shiva/prefabricated, /area/lv522/landing_zone_2/ceiling) "dDC" = ( /turf/open/floor/corsat{ @@ -6667,6 +7546,12 @@ icon_state = "brown" }, /area/lv522/atmos/east_reactor/west) +"dDF" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat{ + icon_state = "brown" + }, +/area/lv522/atmos/filt) "dDS" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -6678,11 +7563,11 @@ /turf/open/floor/prison, /area/lv522/atmos/cargo_intake) "dEk" = ( -/obj/structure/closet/crate, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/floor/corsat{ - icon_state = "marked" + icon_state = "squares" }, -/area/lv522/atmos/east_reactor/west) +/area/lv522/atmos/north_command_centre) "dEm" = ( /obj/structure/closet, /turf/open/floor/prison, @@ -6757,7 +7642,7 @@ /area/lv522/indoors/a_block/admin) "dFg" = ( /obj/structure/cargo_container/horizontal/blue/bottom, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/central_streets) "dFn" = ( /obj/structure/bed, @@ -6788,7 +7673,7 @@ layer = 3.1; pixel_y = 6 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/central_streets) "dFR" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -6797,11 +7682,20 @@ /turf/open/floor/corsat, /area/lv522/atmos/east_reactor) "dFT" = ( -/obj/structure/largecrate, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor/corsat, +/area/lv522/atmos/east_reactor) +"dFY" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/prop/almayer/computer/PC{ + dir = 1 + }, +/obj/structure/machinery/light, /turf/open/floor/corsat{ - icon_state = "marked" + icon_state = "plate" }, -/area/lv522/atmos/east_reactor/west) +/area/lv522/atmos/command_centre) "dGp" = ( /obj/structure/cargo_container/horizontal/blue/middle{ layer = 3.1 @@ -6852,8 +7746,12 @@ /turf/open/floor/corsat, /area/lv522/atmos/east_reactor) "dHk" = ( -/obj/structure/prop/turbine_extras/left, -/turf/open/floor/corsat, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "browncorner" + }, /area/lv522/atmos/east_reactor) "dHx" = ( /obj/structure/largecrate/random/barrel/red, @@ -6896,7 +7794,7 @@ /obj/structure/cargo_container/horizontal/blue/top{ pixel_x = 16 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/nw_rockies) "dIi" = ( /obj/structure/cargo_container/horizontal/blue/middle, @@ -6957,14 +7855,9 @@ dir = 1 }, /turf/open/floor/corsat{ - icon_state = "squares" + icon_state = "marked" }, /area/lv522/atmos/east_reactor) -"dJn" = ( -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/lv522/outdoors/nw_rockies) "dJp" = ( /obj/structure/bed/chair/comfy{ dir = 1 @@ -6979,8 +7872,7 @@ /area/lv522/atmos/east_reactor) "dJt" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/girder, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) "dJB" = ( /obj/effect/decal/cleanable/dirt, @@ -6995,7 +7887,7 @@ /obj/structure/cargo_container/horizontal/blue/middle{ pixel_x = 16 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/nw_rockies) "dJN" = ( /turf/open/floor/corsat{ @@ -7042,10 +7934,6 @@ icon_state = "white_cyan1" }, /area/lv522/indoors/a_block/corpo/glass) -"dLh" = ( -/obj/structure/largecrate/random, -/turf/open/floor/prison, -/area/lv522/outdoors/nw_rockies) "dLq" = ( /obj/item/prop/colony/proptag{ desc = "A fallen marine's information dog tag. It reads, Staff Sergeant Thomas 'Dog' Smith" @@ -7117,6 +8005,13 @@ icon_state = "white_cyan2" }, /area/lv522/indoors/a_block/executive) +"dMu" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat{ + dir = 4; + icon_state = "brown" + }, +/area/lv522/atmos/west_reactor) "dMy" = ( /obj/structure/cargo_container/kelland/left, /turf/open/floor/prison{ @@ -7150,12 +8045,32 @@ icon_state = "marked" }, /area/lv522/atmos/north_command_centre) +"dNe" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + layer = 2.5; + pixel_x = -1; + pixel_y = 1 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "dNm" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/dorms) +"dNn" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 5 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "dNK" = ( /obj/structure/machinery/door/airlock/almayer/engineering{ name = "\improper Workshop Storage"; @@ -7178,8 +8093,17 @@ }, /area/lv522/indoors/a_block/security/glass) "dOa" = ( -/turf/closed/wall, +/turf/closed/wall/strata_outpost, /area/lv522/atmos/east_reactor/north) +"dOt" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/standard/manifold/hidden/green{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/sewer) "dOw" = ( /turf/open/floor/corsat{ dir = 4; @@ -7221,6 +8145,12 @@ icon_state = "plate" }, /area/lv522/atmos/east_reactor/north) +"dPl" = ( +/obj/structure/largecrate/random, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/reactor_garage) "dPq" = ( /turf/open/floor/corsat{ dir = 1; @@ -7273,11 +8203,11 @@ }, /area/lv522/indoors/a_block/medical/glass) "dQg" = ( -/obj/structure/closet/crate, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/floor/corsat{ - icon_state = "squares" + icon_state = "plate" }, -/area/lv522/atmos/east_reactor/west) +/area/lv522/atmos/east_reactor/north) "dQh" = ( /obj/structure/machinery/light{ dir = 1 @@ -7305,18 +8235,6 @@ }, /turf/open/floor/prison, /area/lv522/atmos/cargo_intake) -"dQv" = ( -/obj/structure/barricade/handrail{ - dir = 1 - }, -/obj/structure/barricade/handrail{ - dir = 8 - }, -/turf/open/floor/corsat{ - dir = 8; - icon_state = "brown" - }, -/area/lv522/atmos/east_reactor) "dQM" = ( /obj/structure/machinery/vending/dinnerware, /obj/effect/decal/cleanable/dirt, @@ -7341,12 +8259,6 @@ icon_state = "cement12" }, /area/lv522/outdoors/colony_streets/south_street) -"dRf" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/atmos/east_reactor) "dRn" = ( /obj/structure/machinery/door/airlock/almayer/secure/colony{ icon_state = "door_locked"; @@ -7361,24 +8273,30 @@ "dRy" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, /turf/open/floor/corsat{ - icon_state = "squares" + dir = 1; + icon_state = "brown" }, /area/lv522/atmos/east_reactor/south) -"dRD" = ( -/obj/structure/barricade/handrail{ - dir = 1 - }, -/obj/structure/barricade/handrail{ - dir = 4 +"dRK" = ( +/obj/structure/stairs/perspective{ + dir = 9; + icon_state = "p_stair_full" }, -/turf/open/floor/corsat{ - dir = 4; - icon_state = "brown" +/turf/open/asphalt/cement{ + icon_state = "cement4" }, -/area/lv522/atmos/east_reactor) +/area/lv522/outdoors/colony_streets/north_west_street) "dRL" = ( /turf/closed/wall/strata_outpost, /area/lv522/indoors/a_block/dorm_north) +"dRS" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/command_centre) "dSt" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat{ @@ -7389,7 +8307,7 @@ "dSy" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/corsat{ - icon_state = "squares" + icon_state = "brown" }, /area/lv522/atmos/east_reactor/east) "dSW" = ( @@ -7486,6 +8404,21 @@ /obj/structure/surface/table/almayer, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) +"dUY" = ( +/obj/effect/decal/cleanable/blood/oil, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/south_east_street) +"dVo" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + dir = 1; + name = "\improper Dormitories"; + welded = 1 + }, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/a_block/dorm_north) "dVD" = ( /obj/structure/surface/rack, /obj/item/tool/pickaxe, @@ -7493,6 +8426,10 @@ icon_state = "cement12" }, /area/lv522/outdoors/colony_streets/south_east_street) +"dVM" = ( +/obj/structure/curtain/red, +/turf/open/floor/prison, +/area/lv522/indoors/a_block/dorm_north) "dVU" = ( /obj/structure/machinery/power/apc/weak{ dir = 1 @@ -7502,6 +8439,10 @@ icon_state = "white_cyan1" }, /area/lv522/indoors/a_block/medical) +"dWc" = ( +/obj/structure/closet/crate/trashcart, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/colony_streets/north_west_street) "dWn" = ( /obj/effect/spawner/random/toolbox, /turf/open/floor/plating/plating_catwalk/prison, @@ -7513,7 +8454,7 @@ /area/lv522/landing_zone_forecon/UD6_Tornado) "dWD" = ( /obj/structure/cargo_container/kelland/left, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/south_east_street) "dWE" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, @@ -7555,6 +8496,16 @@ icon_state = "squares" }, /area/lv522/atmos/east_reactor) +"dXo" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, +/obj/effect/landmark/xeno_spawn, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "dXq" = ( /obj/effect/landmark/monkey_spawn, /obj/structure/pipes/standard/simple/hidden/green, @@ -7567,6 +8518,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/a_block/security) +"dXB" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/obj/structure/surface/table/almayer, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "dXI" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/reagent_container/food/drinks/flask/detflask{ @@ -7584,6 +8543,13 @@ icon_state = "brown" }, /area/lv522/atmos/east_reactor/east) +"dXX" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/belt/utility, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/sewer) "dYb" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 9 @@ -7607,16 +8573,25 @@ /turf/open/floor/prison, /area/lv522/atmos/cargo_intake) "dYX" = ( -/obj/structure/prop/invuln/overhead/flammable_pipe/fly{ - dir = 6 +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "brown" }, -/turf/open/floor/corsat, /area/lv522/atmos/east_reactor) "dZd" = ( -/obj/structure/prop/invuln/overhead/flammable_pipe{ - dir = 6 +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/corsat{ + dir = 8; + icon_state = "browncorner" }, -/turf/open/floor/corsat, /area/lv522/atmos/east_reactor) "dZr" = ( /obj/structure/ore_box, @@ -7629,6 +8604,7 @@ }, /area/lv522/indoors/c_block/mining) "dZs" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/floor/corsat, /area/lv522/atmos/east_reactor/west) "dZw" = ( @@ -7653,12 +8629,15 @@ }, /turf/open/floor/prison, /area/lv522/indoors/a_block/security) -"dZA" = ( -/obj/structure/largecrate/random/barrel/yellow, +"dZG" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, /turf/open/floor/corsat{ - icon_state = "squares" + dir = 6; + icon_state = "brown" }, -/area/lv522/atmos/east_reactor/west) +/area/lv522/atmos/east_reactor/south) "dZM" = ( /obj/item/ammo_magazine/rifle/heap{ current_rounds = 0 @@ -7701,13 +8680,6 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) -"eai" = ( -/obj/structure/largecrate/random/case/double, -/turf/open/floor/prison{ - dir = 10; - icon_state = "floor_marked" - }, -/area/lv522/atmos/outdoor) "eam" = ( /obj/structure/blocker/forcefield/vehicles, /turf/open/floor/corsat{ @@ -7715,7 +8687,7 @@ }, /area/lv522/atmos/command_centre) "ear" = ( -/obj/structure/largecrate, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/floor/corsat{ icon_state = "squares" }, @@ -7734,15 +8706,6 @@ icon_state = "darkredfull2" }, /area/lv522/indoors/a_block/security/glass) -"ebr" = ( -/obj/structure/barricade/handrail{ - dir = 4 - }, -/turf/open/floor/corsat{ - dir = 4; - icon_state = "brown" - }, -/area/lv522/atmos/east_reactor) "ebt" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/asphalt/cement{ @@ -7761,7 +8724,13 @@ /area/lv522/oob) "ebR" = ( /obj/structure/surface/table/almayer, -/obj/effect/landmark/objective_landmark/close, +/obj/structure/transmitter/colony_net{ + dir = 1; + phone_category = "LV522 Chances Claim"; + phone_color = "red"; + phone_id = "Colony Engineering"; + pixel_y = -6 + }, /turf/open/floor/prison{ dir = 4; icon_state = "darkyellowfull2" @@ -7787,11 +8756,27 @@ icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_east_street) +"ecK" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "ecP" = ( /turf/closed/shuttle/dropship2/tornado{ icon_state = "25" }, /area/lv522/landing_zone_forecon/UD6_Tornado) +"ecU" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor/corsat{ + dir = 5; + icon_state = "brown" + }, +/area/lv522/atmos/east_reactor/south) "edk" = ( /turf/open/floor/corsat{ dir = 8; @@ -7826,7 +8811,7 @@ /obj/structure/prop/invuln/ice_prefab{ dir = 10 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) "eeb" = ( /obj/structure/prop/invuln/overhead_pipe{ @@ -7856,7 +8841,7 @@ /area/lv522/indoors/b_block/bridge) "eeY" = ( /obj/structure/pipes/standard/manifold/hidden/green, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/n_rockies) "efk" = ( /obj/structure/machinery/light, @@ -7877,9 +8862,6 @@ icon_state = "marked" }, /area/lv522/atmos/east_reactor) -"efH" = ( -/turf/open/auto_turf/shale/layer0, -/area/lv522/outdoors/w_rockies) "efK" = ( /obj/item/stack/tile/plasteel{ name = "ceiling tile"; @@ -7895,6 +8877,17 @@ }, /turf/open/gm/river, /area/lv522/indoors/a_block/kitchen/damage) +"efM" = ( +/obj/structure/platform, +/obj/structure/platform{ + dir = 8 + }, +/obj/structure/platform_decoration{ + dir = 10; + layer = 3.51 + }, +/turf/open/gm/river, +/area/lv522/atmos/sewer) "efR" = ( /obj/effect/decal/hefa_cult_decals/d32{ desc = "You think you can make out the iconography of a Xenomorph." @@ -7906,12 +8899,12 @@ }, /area/lv522/oob) "efS" = ( -/obj/structure/barricade/handrail{ - dir = 1 +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 10 }, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/floor/corsat{ - dir = 9; - icon_state = "brown" + icon_state = "marked" }, /area/lv522/atmos/east_reactor) "efT" = ( @@ -7966,9 +8959,6 @@ }, /area/lv522/indoors/a_block/kitchen) "egd" = ( -/obj/structure/barricade/handrail{ - dir = 1 - }, /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat{ dir = 1; @@ -7976,9 +8966,6 @@ }, /area/lv522/atmos/east_reactor) "egt" = ( -/obj/structure/barricade/handrail{ - dir = 1 - }, /obj/structure/powerloader_wreckage, /turf/open/floor/corsat{ dir = 1; @@ -8023,6 +9010,13 @@ icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) +"egK" = ( +/obj/structure/bed/chair/comfy, +/turf/open/floor/corsat{ + dir = 10; + icon_state = "brown" + }, +/area/lv522/atmos/east_reactor/south) "egP" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ dir = 1 @@ -8067,6 +9061,21 @@ /obj/effect/acid_hole, /turf/closed/wall/strata_outpost, /area/lv522/indoors/a_block/hallway) +"ehM" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/alien/resin/sticky, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) +"ehO" = ( +/obj/effect/alien/resin/sticky, +/turf/open/floor/corsat, +/area/lv522/atmos/east_reactor/south) "eil" = ( /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor/corsat{ @@ -8097,6 +9106,13 @@ "eiZ" = ( /turf/open/floor/prison, /area/lv522/outdoors/colony_streets/north_west_street) +"ejo" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat{ + dir = 4; + icon_state = "brown" + }, +/area/lv522/atmos/north_command_centre) "eju" = ( /obj/item/storage/backpack/marine/satchel{ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; @@ -8126,8 +9142,8 @@ }, /area/lv522/indoors/a_block/dorms) "ejN" = ( -/obj/structure/pipes/standard/manifold/hidden/green{ - dir = 4 +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 9 }, /turf/open/floor/corsat{ icon_state = "squares" @@ -8184,14 +9200,14 @@ pixel_x = 6; pixel_y = 7 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) "elx" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 5 +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + icon_state = "marked" }, -/turf/open/floor/prison, -/area/lv522/indoors/a_block/dorm_north) +/area/lv522/atmos/east_reactor) "elS" = ( /obj/item/stack/rods, /turf/open/floor/prison{ @@ -8202,8 +9218,8 @@ "elX" = ( /obj/structure/surface/table/almayer, /obj/item/clothing/suit/storage/CMB, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/turf/open/floor/strata{ + icon_state = "blue1" }, /area/lv522/outdoors/colony_streets/windbreaker/observation) "emb" = ( @@ -8226,6 +9242,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, +/obj/structure/machinery/light, /turf/open/floor/corsat{ icon_state = "plate" }, @@ -8260,12 +9277,6 @@ icon_state = "cement3" }, /area/lv522/outdoors/colony_streets/north_street) -"emW" = ( -/obj/effect/landmark/queen_spawn, -/turf/open/floor/corsat{ - icon_state = "plate" - }, -/area/lv522/atmos/east_reactor) "ene" = ( /turf/open/floor/shiva{ icon_state = "radiator_tile2" @@ -8278,11 +9289,21 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/b_block/bridge) -"enr" = ( -/obj/structure/pipes/standard/manifold/hidden/green, +"enk" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/light{ + dir = 1 + }, /turf/open/floor/corsat{ icon_state = "plate" }, +/area/lv522/atmos/east_reactor/south) +"enr" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + icon_state = "marked" + }, /area/lv522/atmos/east_reactor) "enD" = ( /obj/structure/curtain/red, @@ -8315,7 +9336,10 @@ /turf/open/floor/prison, /area/lv522/atmos/cargo_intake) "enT" = ( -/obj/vehicle/powerloader{ +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/vehicle/powerloader/ft{ dir = 4 }, /turf/open/floor/corsat{ @@ -8350,6 +9374,13 @@ name = "\improper Secure Blast Door"; unacidable = 1 }, +/obj/structure/machinery/door/poddoor/almayer{ + id = "Marked_6"; + indestructible = 1; + layer = 3.3; + name = "\improper Secure Blast Door"; + unacidable = 1 + }, /turf/open/floor/corsat{ icon_state = "marked" }, @@ -8363,6 +9394,27 @@ icon_state = "marked" }, /area/lv522/atmos/west_reactor) +"eoA" = ( +/obj/item/prop/colony/used_flare, +/obj/item/clothing/mask/facehugger{ + desc = "It has some sort of a tube at the end of its tail. What the hell is this thing?"; + icon_state = "facehugger_impregnated"; + layer = 3; + name = "????"; + stat = 2 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "eoH" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat{ @@ -8393,6 +9445,15 @@ icon_state = "greenfull" }, /area/lv522/indoors/b_block/bridge) +"ept" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/corsat{ + dir = 9; + icon_state = "brown" + }, +/area/lv522/atmos/east_reactor) "epI" = ( /turf/open/floor/corsat{ dir = 8; @@ -8405,9 +9466,13 @@ /turf/open/floor/plating, /area/lv522/landing_zone_1/tunnel) "epS" = ( -/obj/structure/prop/dam/truck/cargo, -/turf/open/floor/plating/plating_catwalk/prison, -/area/lv522/atmos/north_command_centre) +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/east) "epX" = ( /obj/item/storage/firstaid/toxin/empty, /obj/effect/decal/cleanable/dirt, @@ -8453,6 +9518,13 @@ icon_state = "squares" }, /area/lv522/atmos/east_reactor) +"eqD" = ( +/obj/effect/decal/cleanable/blood/drip, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/filt) "eqE" = ( /turf/open/floor/prison{ dir = 10; @@ -8509,6 +9581,13 @@ "eso" = ( /turf/open/floor/prison, /area/lv522/indoors/c_block/mining) +"esw" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/box/matches{ + pixel_y = 8 + }, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/colony_streets/north_west_street) "esx" = ( /obj/structure/platform_decoration{ dir = 8 @@ -8519,10 +9598,8 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 6 }, -/turf/open/floor/corsat{ - icon_state = "squares" - }, -/area/lv522/atmos/north_command_centre) +/turf/closed/wall/mineral/bone_resin, +/area/lv522/oob) "esF" = ( /obj/structure/surface/rack, /turf/open/floor/prison{ @@ -8593,10 +9670,8 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 9 }, -/turf/open/floor/corsat{ - icon_state = "squares" - }, -/area/lv522/atmos/north_command_centre) +/turf/closed/wall/mineral/bone_resin, +/area/lv522/oob) "evu" = ( /obj/structure/prop/maintenance_hatch{ pixel_y = 6 @@ -8631,6 +9706,15 @@ icon_state = "plate" }, /area/lv522/atmos/east_reactor) +"evN" = ( +/obj/structure/window/framed/strata/reinforced, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/a_block/corpo/glass) "evS" = ( /obj/structure/platform, /obj/structure/platform{ @@ -8655,7 +9739,9 @@ /area/lv522/oob) "ewf" = ( /obj/structure/platform, -/turf/open/auto_turf/shale/layer0, +/turf/open/asphalt/cement{ + icon_state = "cement4" + }, /area/lv522/outdoors/colony_streets/south_east_street) "ewm" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -8697,14 +9783,8 @@ dir = 1; icon_state = "p_stair_full" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_2) -"ewY" = ( -/obj/structure/pipes/standard/manifold/hidden/green, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/atmos/east_reactor) "exu" = ( /obj/structure/surface/rack, /obj/item/tool/minihoe{ @@ -8767,6 +9847,18 @@ icon_state = "marked" }, /area/lv522/atmos/north_command_centre) +"eym" = ( +/obj/structure/surface/rack, +/obj/item/storage/toolbox/mechanical/green{ + pixel_y = 13 + }, +/obj/item/storage/toolbox/mechanical/green{ + pixel_y = -3 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/reactor_garage) "eyn" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/asphalt/cement{ @@ -8782,7 +9874,7 @@ /obj/item/stack/tile/wood{ layer = 2.5 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) "eyY" = ( /obj/structure/stairs/perspective{ @@ -8827,6 +9919,12 @@ /obj/structure/pipes/vents/pump, /turf/open/floor/corsat, /area/lv522/atmos/east_reactor/east) +"ezB" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "ezC" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, @@ -8849,8 +9947,10 @@ /obj/structure/prop/ice_colony/ground_wire{ dir = 8 }, +/obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/corsat{ - icon_state = "squares" + icon_state = "marked" }, /area/lv522/atmos/east_reactor) "eAg" = ( @@ -8894,12 +9994,11 @@ }, /area/lv522/indoors/a_block/fitness/glass) "eAF" = ( -/obj/structure/prop/invuln/overhead/flammable_pipe/fly{ - dir = 1; - icon_state = "flammable_pipe_3" +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + icon_state = "brown" }, -/turf/open/floor/corsat, -/area/lv522/atmos/east_reactor) +/area/lv522/atmos/east_reactor/east) "eAX" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/glass/fertilizer, @@ -8916,6 +10015,12 @@ /obj/item/stack/cable_coil/cut, /turf/open/floor/plating, /area/lv522/atmos/east_reactor) +"eBm" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor/corsat{ + icon_state = "browncorner" + }, +/area/lv522/atmos/east_reactor/south) "eBu" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/prop/almayer/computer/PC{ @@ -8927,12 +10032,6 @@ icon_state = "blue_plate" }, /area/lv522/indoors/c_block/mining) -"eBy" = ( -/obj/effect/landmark/xeno_spawn, -/turf/open/floor/corsat{ - icon_state = "plate" - }, -/area/lv522/atmos/east_reactor) "eBA" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -8952,7 +10051,7 @@ /area/lv522/atmos/east_reactor) "eCe" = ( /obj/effect/alien/resin/sticky, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) "eCO" = ( /obj/structure/largecrate/random, @@ -8966,12 +10065,6 @@ }, /turf/open/floor/corsat, /area/lv522/atmos/cargo_intake) -"eCP" = ( -/obj/effect/landmark/structure_spawner/xvx_hive/xeno_core, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/atmos/east_reactor) "eDc" = ( /obj/structure/bed/chair, /obj/structure/machinery/space_heater/radiator/red{ @@ -9008,6 +10101,18 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison, /area/lv522/indoors/c_block/cargo) +"eDD" = ( +/obj/structure/bed/chair/comfy{ + dir = 4 + }, +/obj/structure/pipes/standard/manifold/hidden/green{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/reactor_garage) "eDI" = ( /obj/structure/machinery/light, /turf/open/floor/prison{ @@ -9025,6 +10130,12 @@ icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) +"eDS" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/auto_turf/shale/layer2, +/area/lv522/outdoors/n_rockies) "eEv" = ( /turf/open/floor/prison{ icon_state = "kitchen" @@ -9057,12 +10168,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/c_block/mining) -"eFk" = ( -/obj/effect/landmark/xeno_spawn, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/atmos/east_reactor) "eFt" = ( /obj/vehicle/train/cargo/engine, /turf/open/floor/prison, @@ -9078,7 +10183,7 @@ /area/lv522/indoors/a_block/medical/glass) "eFP" = ( /obj/structure/pipes/standard/simple/hidden/green, -/turf/closed/wall, +/turf/closed/wall/strata_outpost, /area/lv522/atmos/east_reactor) "eFT" = ( /obj/item/stack/tile/plasteel{ @@ -9086,10 +10191,10 @@ pixel_x = -2; pixel_y = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/n_rockies) "eGs" = ( -/obj/structure/cargo_container/grant/right, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/floor/corsat{ icon_state = "plate" }, @@ -9111,6 +10216,12 @@ icon_state = "whiteyellowfull" }, /area/lv522/indoors/a_block/corpo/glass) +"eHp" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/lv522/atmos/east_reactor) "eHu" = ( /obj/structure/closet/secure_closet/miner, /turf/open/floor/prison{ @@ -9134,6 +10245,11 @@ icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) +"eHE" = ( +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/outdoors/n_rockies) "eHF" = ( /obj/structure/cargo_container/kelland/right, /turf/open/floor/plating, @@ -9195,6 +10311,13 @@ icon_state = "greenfull" }, /area/lv522/indoors/a_block/fitness) +"eIT" = ( +/obj/structure/bed/chair/comfy, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/corsat{ + icon_state = "brown" + }, +/area/lv522/atmos/east_reactor/south) "eJc" = ( /obj/structure/surface/table/almayer, /obj/effect/landmark/objective_landmark/close, @@ -9229,6 +10352,16 @@ /obj/item/prop/alien/hugger, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms) +"eJq" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/prop/almayer/computer/PC{ + dir = 8; + pixel_y = 4 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "eJw" = ( /obj/item/clothing/mask/rebreather{ pixel_x = -7; @@ -9279,12 +10412,30 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/b_block/bar) +"eKK" = ( +/obj/structure/blocker/forcefield/vehicles, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/east_reactor/south) "eKL" = ( /obj/structure/bed/chair{ dir = 1 }, /turf/open/floor/prison, /area/lv522/indoors/b_block/hydro) +"eLf" = ( +/turf/open/asphalt/cement{ + icon_state = "cement4" + }, +/area/lv522/landing_zone_2) +"eLx" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/east_reactor) "eLG" = ( /obj/item/lightstick/red/spoke/planted{ pixel_x = -19; @@ -9299,15 +10450,15 @@ icon_state = "whiteyellowfull" }, /area/lv522/indoors/a_block/corpo/glass) +"eLU" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv522/atmos/reactor_garage) "eLV" = ( -/obj/structure/barricade/handrail{ - dir = 1 - }, -/turf/open/floor/corsat{ - dir = 5; - icon_state = "brown" - }, -/area/lv522/atmos/east_reactor) +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor/corsat, +/area/lv522/oob) "eLZ" = ( /obj/structure/machinery/door/airlock/almayer/engineering{ name = "\improper Cargo Bay Quartermaster" @@ -9342,10 +10493,11 @@ }, /area/lv522/atmos/east_reactor) "eMm" = ( -/obj/structure/largecrate/random/case, +/obj/structure/prop/invuln/fusion_reactor, +/obj/structure/prop/turbine_extras, +/obj/structure/prop/turbine_extras, /turf/open/floor/corsat{ - dir = 8; - icon_state = "brown" + icon_state = "plate" }, /area/lv522/atmos/east_reactor) "eMz" = ( @@ -9412,9 +10564,6 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/obj/structure/prop/invuln/overhead/flammable_pipe/fly{ - icon_state = "flammable_pipe_2" - }, /turf/open/floor/corsat, /area/lv522/atmos/east_reactor) "eOj" = ( @@ -9453,8 +10602,19 @@ /obj/effect/decal/warning_stripes{ icon_state = "W" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/central_streets) +"eOT" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/machinery/power/apc/weak{ + dir = 1 + }, +/turf/open/floor/strata{ + icon_state = "blue1" + }, +/area/lv522/outdoors/colony_streets/windbreaker/observation) "eOU" = ( /obj/structure/machinery/light{ dir = 4 @@ -9488,7 +10648,7 @@ /obj/structure/prop/invuln/ice_prefab{ dir = 5 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) "ePK" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -9547,13 +10707,12 @@ }, /area/lv522/indoors/a_block/hallway) "eRg" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, -/obj/structure/prop/invuln/overhead/flammable_pipe/fly{ - dir = 1; - icon_state = "flammable_pipe_3" +/obj/structure/prop/turbine, +/obj/structure/prop/turbine_extras/border, +/turf/open/floor/corsat{ + icon_state = "plate" }, -/turf/open/floor/corsat, -/area/lv522/atmos/east_reactor) +/area/lv522/oob) "eRI" = ( /obj/structure/barricade/deployable{ dir = 8 @@ -9613,6 +10772,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/c_block/cargo) +"eTn" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/reactor_garage) "eTu" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_full" @@ -9636,6 +10801,12 @@ }, /turf/open/floor/plating, /area/lv522/landing_zone_forecon/UD6_Tornado) +"eTQ" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 10 + }, +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv522/atmos/sewer) "eTZ" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -9668,6 +10839,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/floor/corsat{ icon_state = "plate" }, @@ -9714,12 +10886,11 @@ }, /area/lv522/atmos/north_command_centre) "eVi" = ( -/obj/structure/barricade/handrail, -/obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/floor/corsat{ - icon_state = "plate" + icon_state = "brown" }, -/area/lv522/atmos/east_reactor) +/area/lv522/atmos/east_reactor/north) "eVW" = ( /obj/effect/landmark/monkey_spawn, /turf/open/floor/corsat{ @@ -9731,6 +10902,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/floor/corsat{ icon_state = "marked" }, @@ -9763,10 +10935,16 @@ dir = 4 }, /turf/open/floor/corsat{ - dir = 8; + dir = 10; icon_state = "brown" }, /area/lv522/atmos/east_reactor/east) +"eWR" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/landing_zone_2) "eWW" = ( /obj/structure/window_frame/strata, /obj/structure/pipes/standard/simple/hidden/green{ @@ -9792,13 +10970,11 @@ }, /area/lv522/indoors/a_block/kitchen) "eXe" = ( -/obj/structure/cargo_container/grant/right{ - layer = 3.1 - }, -/turf/closed/wall/mineral/bone_resin, -/area/lv522/atmos/north_command_centre) +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat, +/area/lv522/atmos/east_reactor/west) "eXG" = ( -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_2) "eXO" = ( /obj/structure/prop/invuln/ice_prefab{ @@ -9828,7 +11004,7 @@ /obj/structure/cargo_container/horizontal/blue/bottom{ pixel_x = 16 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/nw_rockies) "eYh" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -9841,9 +11017,6 @@ }, /area/lv522/indoors/a_block/medical/glass) "eYA" = ( -/obj/item/weapon/gun/rifle/sniper/M42A{ - current_mag = null - }, /obj/item/clothing/head/headband/tan{ pixel_x = -10; pixel_y = 13 @@ -9854,25 +11027,29 @@ /turf/closed/wall/strata_outpost/reinforced, /area/lv522/landing_zone_1/tunnel) "eYT" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 10 - }, /obj/structure/prop/ice_colony/ground_wire{ dir = 8 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/central_streets) +"eZb" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/lv522/atmos/reactor_garage) "eZe" = ( /turf/open/asphalt/cement{ icon_state = "cement14" }, /area/lv522/outdoors/colony_streets/south_east_street) "eZq" = ( -/obj/structure/cargo_container/kelland/left, +/obj/structure/prop/turbine_extras/left, +/obj/structure/prop/invuln/fusion_reactor, /turf/open/floor/corsat{ icon_state = "plate" }, -/area/lv522/atmos/cargo_intake) +/area/lv522/oob) "eZv" = ( /obj/structure/fence, /obj/effect/decal/warning_stripes{ @@ -9882,6 +11059,14 @@ icon_state = "floor_plate" }, /area/lv522/outdoors/n_rockies) +"eZF" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/sewer) "eZK" = ( /turf/open/floor/prison{ icon_state = "floor_plate" @@ -9941,7 +11126,7 @@ dir = 8; pixel_x = 6 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/central_streets) "faZ" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -9968,7 +11153,6 @@ /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/north_east_street) "fbC" = ( -/obj/structure/barricade/handrail, /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat{ icon_state = "brown" @@ -9989,7 +11173,9 @@ /obj/structure/platform{ dir = 4 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/asphalt/cement{ + icon_state = "cement3" + }, /area/lv522/outdoors/colony_streets/south_east_street) "fbY" = ( /obj/structure/stairs/perspective{ @@ -10037,6 +11223,11 @@ icon_state = "brown" }, /area/lv522/atmos/north_command_centre) +"fdf" = ( +/turf/open/asphalt/cement{ + icon_state = "cement15" + }, +/area/lv522/landing_zone_2) "fdh" = ( /obj/item/lightstick/red/spoke/planted{ pixel_x = 11; @@ -10055,10 +11246,22 @@ }, /turf/open/floor/plating, /area/shuttle/drop2/lv522) +"fdC" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/filt) "fdE" = ( -/obj/structure/blocker/invisible_wall, -/turf/closed/wall/mineral/bone_resin, -/area/lv522/oob) +/obj/item/ammo_magazine/rifle/heap{ + current_rounds = 0 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "fdR" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 @@ -10067,6 +11270,11 @@ icon_state = "plate" }, /area/lv522/atmos/north_command_centre) +"fdS" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/obj/item/stack/rods, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/north_east_street) "fdT" = ( /obj/structure/closet/crate, /turf/open/floor/prison{ @@ -10099,6 +11307,20 @@ icon_state = "plate" }, /area/lv522/atmos/east_reactor/west) +"feS" = ( +/obj/item/prop/colony/used_flare, +/turf/open/floor/corsat{ + icon_state = "brown" + }, +/area/lv522/atmos/east_reactor/south) +"feZ" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/east) "ffb" = ( /turf/open/floor/prison{ icon_state = "darkbrownfull2" @@ -10124,6 +11346,18 @@ icon_state = "floor3" }, /area/lv522/outdoors/colony_streets/south_street) +"ffr" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/lv522/atmos/east_reactor/west) +"ffG" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/obj/structure/girder, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/north_east_street) "ffL" = ( /obj/item/clothing/mask/facehugger{ desc = "It has some sort of a tube at the end of its tail. What the hell is this thing?"; @@ -10134,6 +11368,20 @@ }, /turf/open/floor/prison, /area/lv522/landing_zone_2) +"ffO" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/transmitter/colony_net{ + dir = 8; + phone_category = "LV522 Chances Claim"; + phone_color = "red"; + phone_id = "Colony Medical"; + pixel_x = 16 + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "white_cyan1" + }, +/area/lv522/indoors/a_block/medical/glass) "fgf" = ( /obj/item/ammo_magazine/m2c{ current_rounds = 0; @@ -10154,7 +11402,7 @@ pixel_x = 1; pixel_y = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_west_street) "fgB" = ( /obj/item/lightstick/red/spoke/planted{ @@ -10206,10 +11454,8 @@ }, /area/lv522/atmos/cargo_intake) "fib" = ( -/obj/structure/barricade/handrail, -/turf/open/floor/corsat{ - icon_state = "plate" - }, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat, /area/lv522/atmos/east_reactor) "fiu" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -10219,12 +11465,20 @@ /turf/open/floor/prison, /area/lv522/indoors/c_block/cargo) "fiA" = ( -/obj/structure/barricade/handrail, +/obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat{ - dir = 10; - icon_state = "brown" + icon_state = "plate" }, -/area/lv522/atmos/east_reactor) +/area/lv522/atmos/east_reactor/east) +"fiB" = ( +/obj/structure/prop/invuln/ice_prefab{ + dir = 9 + }, +/obj/structure/prop/invuln/ice_prefab/roof_greeble{ + icon_state = "solarpanel1" + }, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/w_rockies) "fiG" = ( /obj/effect/decal/cleanable/blood/gibs, /obj/effect/decal/cleanable/dirt, @@ -10302,24 +11556,15 @@ /obj/structure/window, /turf/open/floor/prison, /area/lv522/indoors/c_block/casino) -"fkq" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, -/turf/open/floor/corsat{ - icon_state = "browncorner" - }, -/area/lv522/atmos/east_reactor) "fkB" = ( /obj/structure/barricade/deployable, /obj/effect/decal/cleanable/blood, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/nw_rockies) -"fkL" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, -/turf/open/floor/corsat, -/area/lv522/atmos/east_reactor/south) +"fkD" = ( +/obj/structure/largecrate/random/barrel/blue, +/turf/open/auto_turf/shale/layer2, +/area/lv522/outdoors/colony_streets/north_west_street) "fkP" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -10331,21 +11576,12 @@ }, /area/lv522/indoors/b_block/bridge) "fkW" = ( -/obj/structure/barricade/handrail, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/corsat{ - dir = 6; + dir = 1; icon_state = "brown" }, /area/lv522/atmos/east_reactor) -"fla" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 5 - }, -/turf/open/floor/corsat{ - dir = 8; - icon_state = "brown" - }, -/area/lv522/atmos/east_reactor/east) "fld" = ( /mob/living/simple_animal/mouse, /turf/open/floor/prison, @@ -10402,15 +11638,15 @@ dir = 10 }, /turf/open/floor/corsat{ - icon_state = "squares" + icon_state = "plate" }, /area/lv522/atmos/east_reactor/east) "fmB" = ( -/obj/structure/cargo_container/kelland/right, /turf/open/floor/corsat{ - icon_state = "plate" + dir = 1; + icon_state = "brown" }, -/area/lv522/atmos/cargo_intake) +/area/lv522/oob) "fmH" = ( /obj/structure/pipes/vents/pump, /obj/effect/decal/cleanable/dirt, @@ -10442,7 +11678,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "S" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_west_street) "fnm" = ( /obj/structure/surface/table/almayer, @@ -10456,19 +11692,31 @@ "fnA" = ( /turf/open/asphalt/cement, /area/lv522/outdoors/colony_streets/south_west_street) +"fnF" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/surface/table/almayer, +/obj/item/toy/beach_ball, +/obj/item/reagent_container/food/drinks/bottle/sake{ + pixel_x = 9; + pixel_y = 17 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, +/area/lv522/indoors/a_block/fitness) "fol" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 6 + }, /turf/open/floor/corsat{ dir = 9; icon_state = "brown" }, /area/lv522/atmos/filt) "fop" = ( -/obj/item/clipboard, -/obj/structure/prop/invuln/overhead/flammable_pipe/fly{ - icon_state = "flammable_pipe_2" - }, /turf/open/floor/corsat, -/area/lv522/atmos/east_reactor) +/area/lv522/atmos/west_reactor) "foO" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/corsat, @@ -10513,6 +11761,12 @@ icon_state = "kitchen" }, /area/lv522/indoors/a_block/kitchen) +"fpm" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/lv522/atmos/east_reactor/south) "fpn" = ( /obj/item/device/analyzer, /turf/open/floor/corsat, @@ -10573,6 +11827,16 @@ icon_state = "floor_plate" }, /area/lv522/indoors/a_block/dorms/glass) +"fqU" = ( +/obj/item/ammo_magazine/rifle/heap{ + current_rounds = 0 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "frc" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic, /obj/structure/pipes/standard/simple/hidden/green, @@ -10602,8 +11866,8 @@ }, /area/lv522/atmos/east_reactor/west) "frZ" = ( -/obj/structure/pipes/standard/manifold/hidden/green{ - dir = 4 +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 9 }, /turf/open/floor/corsat{ icon_state = "squares" @@ -10621,6 +11885,7 @@ /obj/structure/machinery/power/apc/weak{ dir = 1 }, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/floor/corsat{ icon_state = "plate" }, @@ -10655,15 +11920,19 @@ /turf/open/floor/prison, /area/lv522/atmos/cargo_intake) "fsV" = ( -/obj/structure/surface/table/almayer, +/obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/floor/corsat{ - icon_state = "plate" + icon_state = "marked" }, -/area/lv522/atmos/east_reactor) +/area/lv522/atmos/north_command_centre) "ftd" = ( /obj/structure/bed/chair{ dir = 1 }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 6 + }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/outdoors/colony_streets/windbreaker/observation) "ftl" = ( @@ -10675,8 +11944,21 @@ /obj/structure/barricade/wooden{ dir = 8 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/central_streets) +"fts" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/effect/decal/cleanable/dirt, +/obj/item/paper_bin{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/tool/pen/blue/clicky, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/wood/ship, +/area/lv522/atmos/way_in_command_centre) "ftA" = ( /obj/structure/surface/table/almayer, /obj/structure/platform{ @@ -10703,7 +11985,7 @@ dir = 5 }, /turf/open/floor/corsat{ - icon_state = "squares" + icon_state = "plate" }, /area/lv522/atmos/east_reactor/east) "ful" = ( @@ -10723,7 +12005,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "W" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) "fuQ" = ( /obj/structure/pipes/standard/manifold/hidden/green{ @@ -10771,17 +12053,18 @@ /turf/open/floor/prison, /area/lv522/indoors/c_block/cargo) "fvQ" = ( -/obj/structure/prop/invuln/overhead/flammable_pipe/fly{ - dir = 5 +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "browncorner" }, -/turf/open/floor/corsat, /area/lv522/atmos/east_reactor) "fvV" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; pixel_y = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) "fvX" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ @@ -10856,11 +12139,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, -/obj/effect/landmark/xeno_spawn, -/turf/open/floor/corsat{ - icon_state = "squares" - }, +/turf/open/floor/plating/plating_catwalk/prison, /area/lv522/atmos/east_reactor/south) "fxl" = ( /obj/vehicle/train/cargo/engine, @@ -10869,9 +12148,9 @@ }, /area/lv522/indoors/c_block/cargo) "fxq" = ( -/obj/structure/closet/crate/radiation, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/floor/corsat{ - icon_state = "marked" + icon_state = "plate" }, /area/lv522/atmos/east_reactor/west) "fxZ" = ( @@ -10955,31 +12234,33 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/b_block/bridge) -"fzx" = ( -/obj/structure/barricade/handrail{ - dir = 8 - }, -/obj/structure/barricade/handrail, +"fzu" = ( /turf/open/floor/corsat{ - dir = 10; - icon_state = "brown" - }, -/area/lv522/atmos/east_reactor) -"fzz" = ( -/obj/structure/barricade/handrail{ - dir = 4 - }, -/obj/structure/barricade/handrail, -/turf/open/floor/corsat{ - dir = 6; + dir = 9; icon_state = "brown" }, -/area/lv522/atmos/east_reactor) +/area/lv522/atmos/reactor_garage) "fzC" = ( /turf/closed/shuttle/dropship2/tornado{ icon_state = "28" }, /area/lv522/landing_zone_forecon/UD6_Tornado) +"fzE" = ( +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv522/indoors/a_block/dorm_north) +"fzK" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, +/obj/structure/platform{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "fzL" = ( /turf/open/floor/corsat{ dir = 4; @@ -11000,6 +12281,12 @@ }, /turf/open/asphalt/cement, /area/lv522/outdoors/colony_streets/north_east_street) +"fAt" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/way_in_command_centre) "fAx" = ( /obj/structure/filingcabinet{ density = 0; @@ -11041,6 +12328,11 @@ icon_state = "blue" }, /area/lv522/indoors/a_block/admin) +"fBg" = ( +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/reactor_garage) "fBp" = ( /turf/open/asphalt/cement{ icon_state = "cement15" @@ -11064,10 +12356,19 @@ icon_state = "fake_wood" }, /area/lv522/atmos/east_reactor/east) +"fBR" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/colony_streets/south_east_street) "fBU" = ( -/obj/structure/cargo_container/kelland/right, +/obj/structure/cargo_container/horizontal/blue/top, +/obj/structure/machinery/light{ + dir = 1 + }, /turf/open/floor/corsat{ - icon_state = "squares" + icon_state = "plate" }, /area/lv522/atmos/cargo_intake) "fCb" = ( @@ -11185,11 +12486,11 @@ }, /area/lv522/indoors/b_block/hydro) "fDC" = ( -/obj/structure/prop/server_equipment/laptop/on{ - layer = 3.1; - pixel_y = 10 +/obj/structure/prop/ice_colony/ground_wire, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + icon_state = "squares" }, -/turf/open/floor/corsat, /area/lv522/atmos/east_reactor) "fDF" = ( /obj/structure/surface/rack, @@ -11213,14 +12514,18 @@ }, /area/lv522/atmos/east_reactor) "fDS" = ( -/obj/structure/machinery/power/apc/weak{ - dir = 1 +/obj/structure/machinery/conveyor{ + dir = 5; + id = "cargo_container" + }, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/obj/structure/machinery/light{ + dir = 8 }, /turf/open/floor/corsat{ - dir = 1; - icon_state = "brown" + icon_state = "plate" }, -/area/lv522/atmos/west_reactor) +/area/lv522/atmos/cargo_intake) "fEe" = ( /obj/structure/platform, /obj/effect/decal/cleanable/dirt, @@ -11253,6 +12558,7 @@ /area/lv522/outdoors/colony_streets/south_east_street) "fFp" = ( /obj/item/clothing/gloves/yellow, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/floor/corsat, /area/lv522/atmos/east_reactor) "fFw" = ( @@ -11334,6 +12640,16 @@ icon_state = "plate" }, /area/lv522/atmos/north_command_centre) +"fHf" = ( +/obj/structure/platform, +/obj/structure/reagent_dispensers/watertank{ + layer = 2.9 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/way_in_command_centre) "fHy" = ( /obj/structure/barricade/wooden{ dir = 4 @@ -11358,6 +12674,16 @@ icon_state = "white_cyan2" }, /area/lv522/indoors/a_block/executive) +"fHH" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "fIa" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 6 @@ -11399,6 +12725,7 @@ /area/lv522/indoors/a_block/kitchen/glass) "fIQ" = ( /obj/structure/blocker/forcefield/vehicles, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/floor/corsat{ icon_state = "marked" }, @@ -11409,35 +12736,38 @@ icon_state = "brown" }, /area/lv522/atmos/north_command_centre) +"fJg" = ( +/obj/structure/pipes/standard/manifold/hidden/green{ + dir = 8 + }, +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv522/indoors/a_block/corpo/glass) "fJq" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/a_block/kitchen) "fKf" = ( +/obj/structure/platform{ + dir = 1 + }, /turf/open/asphalt/cement{ icon_state = "cement12" }, /area/lv522/outdoors/colony_streets/north_east_street) "fKt" = ( -/obj/structure/largecrate/random/barrel, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/floor/corsat{ icon_state = "marked" }, /area/lv522/atmos/east_reactor/west) "fKu" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/barricade/handrail/wire{ - layer = 3.1 - }, -/turf/open/floor/prison{ - dir = 4; - icon_state = "greenfull" +/obj/structure/largecrate, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "brown" }, -/area/lv522/indoors/a_block/fitness) +/area/lv522/atmos/cargo_intake) "fLa" = ( /turf/closed/shuttle/dropship2/tornado{ icon_state = "47" @@ -11456,9 +12786,13 @@ }, /area/lv522/indoors/a_block/admin) "fLi" = ( +/obj/item/tool/warning_cone{ + pixel_x = -10; + pixel_y = 11 + }, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/floor/corsat{ - dir = 4; - icon_state = "browncorner" + icon_state = "plate" }, /area/lv522/atmos/east_reactor/west) "fLz" = ( @@ -11482,6 +12816,12 @@ }, /turf/closed/wall/strata_ice/dirty, /area/lv522/oob) +"fLA" = ( +/obj/structure/surface/table/almayer, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor) "fLF" = ( /obj/structure/machinery/door/poddoor/almayer/closed{ dir = 4; @@ -11510,9 +12850,7 @@ /turf/open/floor/plating, /area/lv522/landing_zone_1/tunnel) "fLP" = ( -/obj/structure/barricade/handrail{ - dir = 1 - }, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/floor/corsat{ dir = 1; icon_state = "brown" @@ -11527,7 +12865,9 @@ dir = 8; pixel_x = -20 }, -/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/pipes/standard/manifold/hidden/green{ + dir = 8 + }, /turf/open/floor/corsat{ icon_state = "plate" }, @@ -11538,6 +12878,9 @@ icon_state = "flammable_pipe_3"; pixel_x = -20 }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, /turf/open/floor/corsat{ icon_state = "squares" }, @@ -11592,6 +12935,16 @@ icon_state = "browncorner" }, /area/lv522/atmos/east_reactor) +"fNk" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/bed/chair, +/turf/open/floor/corsat{ + dir = 10; + icon_state = "brown" + }, +/area/lv522/atmos/reactor_garage) "fNm" = ( /obj/effect/landmark/monkey_spawn, /turf/open/floor/carpet, @@ -11694,6 +13047,24 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) +"fQi" = ( +/obj/item/prop/colony/canister{ + dir = 8; + layer = 3.1; + pixel_y = 16 + }, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/lv522/atmos/reactor_garage) +"fQD" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/strata{ + icon_state = "blue1" + }, +/area/lv522/outdoors/colony_streets/windbreaker/observation) "fRc" = ( /obj/structure/machinery/mill, /turf/open/floor/prison{ @@ -11733,7 +13104,7 @@ desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it..."; dir = 8 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/central_streets) "fRS" = ( /obj/effect/decal/cleanable/dirt, @@ -11751,6 +13122,18 @@ icon_state = "squares" }, /area/lv522/atmos/east_reactor/east) +"fSf" = ( +/obj/structure/blocker/invisible_wall, +/turf/closed/wall/strata_outpost/reinforced, +/area/lv522/atmos/sewer) +"fSj" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 6 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/sewer) "fSo" = ( /obj/effect/landmark/lv624/fog_blocker/short, /obj/structure/machinery/landinglight/ds1, @@ -11910,6 +13293,16 @@ icon_state = "cement3" }, /area/lv522/outdoors/colony_streets/central_streets) +"fWD" = ( +/obj/item/stack/folding_barricade, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "fWG" = ( /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/south_east_street) @@ -11925,7 +13318,7 @@ pixel_x = 7; pixel_y = 17 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) "fXa" = ( /obj/structure/machinery/vending/snack, @@ -11939,6 +13332,13 @@ icon_state = "19" }, /area/lv522/landing_zone_forecon/UD6_Tornado) +"fXs" = ( +/obj/structure/blocker/forcefield/vehicles, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/filt) "fXv" = ( /obj/structure/prop/ice_colony/ground_wire{ dir = 8 @@ -11983,11 +13383,12 @@ }, /area/lv522/atmos/cargo_intake) "fXU" = ( -/turf/open/floor/corsat{ - dir = 10; - icon_state = "brown" +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 }, -/area/lv522/atmos/east_reactor/west) +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat, +/area/lv522/atmos/east_reactor) "fXZ" = ( /obj/structure/curtain/medical, /turf/open/floor/strata{ @@ -12032,7 +13433,7 @@ /turf/open/gm/river, /area/lv522/landing_zone_1/tunnel) "fYP" = ( -/obj/structure/largecrate/random/barrel, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/floor/corsat{ icon_state = "brown" }, @@ -12049,11 +13450,26 @@ icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/t_comm) +"fZl" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/cameras/wooden_tv{ + desc = "An old TV hooked up to a video cassette recorder, you can even use it to time shift WOW."; + layer = 3.2; + name = "Television set"; + network = null; + pixel_x = -3; + pixel_y = 6 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, +/area/lv522/indoors/a_block/fitness) "fZy" = ( /obj/structure/prop/invuln/ice_prefab{ dir = 10 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/north_street) "fZA" = ( /obj/structure/largecrate/random/barrel/red, @@ -12071,9 +13487,12 @@ }, /area/lv522/indoors/c_block/mining) "gat" = ( -/obj/structure/prop/invuln/overhead/flammable_pipe/fly, -/turf/open/floor/corsat, -/area/lv522/atmos/east_reactor) +/obj/structure/cargo_container/horizontal/blue/middle, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "brown" + }, +/area/lv522/atmos/cargo_intake) "gaw" = ( /obj/structure/barricade/deployable{ dir = 1 @@ -12135,6 +13554,13 @@ }, /turf/open/floor/prison, /area/lv522/indoors/c_block/casino) +"gbo" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "brown" + }, +/area/lv522/atmos/reactor_garage) "gbq" = ( /obj/structure/stairs/perspective{ dir = 10; @@ -12166,11 +13592,12 @@ /turf/open/floor/prison, /area/lv522/atmos/cargo_intake) "gbQ" = ( -/obj/structure/largecrate, -/turf/open/floor/corsat{ - icon_state = "brown" +/obj/structure/pipes/standard/manifold/hidden/green{ + dir = 1 }, -/area/lv522/atmos/east_reactor/west) +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat, +/area/lv522/atmos/east_reactor) "gbR" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/strata{ @@ -12187,7 +13614,7 @@ pixel_x = -2; pixel_y = 16 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_street) "gck" = ( /obj/structure/pipes/standard/manifold/hidden/green, @@ -12209,6 +13636,12 @@ icon_state = "marked" }, /area/lv522/atmos/north_command_centre) +"gcr" = ( +/obj/structure/closet/toolcloset, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/reactor_garage) "gcv" = ( /obj/structure/foamed_metal, /obj/structure/pipes/standard/simple/hidden/green, @@ -12232,7 +13665,7 @@ /area/lv522/indoors/lone_buildings/engineering) "gcY" = ( /obj/structure/cargo_container/ferret/left, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/nw_rockies) "gdk" = ( /obj/structure/surface/table/almayer, @@ -12250,8 +13683,9 @@ /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms) "gdJ" = ( -/obj/structure/largecrate/guns/merc, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/floor/corsat{ + dir = 1; icon_state = "brown" }, /area/lv522/atmos/east_reactor/west) @@ -12270,11 +13704,12 @@ }, /area/lv522/indoors/a_block/admin) "gdX" = ( -/obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/obj/structure/machinery/light, /turf/open/floor/corsat{ - icon_state = "brown" + icon_state = "squares" }, -/area/lv522/atmos/east_reactor/west) +/area/lv522/atmos/east_reactor) "gej" = ( /obj/structure/platform, /obj/effect/landmark/lv624/fog_blocker/short, @@ -12297,6 +13732,13 @@ icon_state = "cement2" }, /area/lv522/outdoors/colony_streets/central_streets) +"gem" = ( +/obj/structure/surface/rack, +/obj/item/clothing/head/welding, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/reactor_garage) "geq" = ( /obj/structure/prop/invuln/overhead/flammable_pipe/fly{ dir = 4; @@ -12342,6 +13784,14 @@ }, /turf/open/floor/carpet, /area/lv522/indoors/b_block/bar) +"geP" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/reactor_garage) "geT" = ( /obj/structure/prop/invuln/overhead_pipe{ dir = 8; @@ -12357,7 +13807,7 @@ /obj/item/prop/alien/hugger{ pixel_y = 14 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) "gfu" = ( /obj/structure/surface/table/woodentable/fancy, @@ -12373,7 +13823,7 @@ pixel_y = 1 }, /obj/structure/cargo_container/ferret/mid, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/nw_rockies) "gfU" = ( /obj/effect/decal/cleanable/dirt, @@ -12437,6 +13887,12 @@ }, /turf/open/floor/prison, /area/lv522/indoors/c_block/mining) +"gha" = ( +/turf/open/floor/prison{ + dir = 1; + icon_state = "cell_stripe" + }, +/area/lv522/atmos/way_in_command_centre) "ghr" = ( /obj/structure/machinery/door/airlock/almayer/engineering, /turf/open/floor/corsat{ @@ -12475,6 +13931,19 @@ icon_state = "squares" }, /area/lv522/atmos/east_reactor/east) +"gib" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, +/obj/structure/platform{ + dir = 8 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/sewer) "gif" = ( /obj/item/stack/sheet/metal, /turf/open/floor/prison{ @@ -12492,6 +13961,16 @@ icon_state = "marked" }, /area/lv522/atmos/west_reactor) +"giV" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "giX" = ( /obj/structure/curtain/red, /turf/open/floor/wood, @@ -12513,8 +13992,21 @@ "gjA" = ( /obj/item/prop/alien/hugger, /obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 9 + }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/outdoors/colony_streets/windbreaker/observation) +"gjB" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/prop/almayer/computer/PC{ + dir = 1; + pixel_y = 2 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "gjF" = ( /obj/effect/decal/cleanable/dirt, /obj/item/prop/colony/used_flare, @@ -12580,18 +14072,29 @@ /obj/structure/closet/bombcloset, /turf/open/asphalt/cement, /area/lv522/outdoors/colony_streets/south_east_street) +"glj" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/cargo_intake) "gll" = ( -/obj/structure/largecrate, +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/structure/machinery/light{ + dir = 1 + }, /turf/open/floor/corsat{ icon_state = "plate" }, -/area/lv522/atmos/command_centre) +/area/lv522/atmos/cargo_intake) "glO" = ( /obj/item/stack/sheet/wood, /obj/effect/decal/warning_stripes{ icon_state = "S" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_street) "glQ" = ( /obj/structure/stairs/perspective{ @@ -12610,11 +14113,19 @@ icon_state = "cement12" }, /area/lv522/outdoors/colony_streets/south_street) +"gmb" = ( +/obj/structure/prop/vehicles/crawler{ + layer = 2.9 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/reactor_garage) "gme" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 6 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) "gmt" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -12631,11 +14142,11 @@ /turf/open/gm/river, /area/lv522/outdoors/colony_streets/south_street) "gnd" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/obj/structure/machinery/light, /turf/open/floor/corsat{ - icon_state = "plate" + icon_state = "squares" }, -/area/lv522/atmos/east_reactor/west) +/area/lv522/atmos/east_reactor) "gnf" = ( /obj/structure/machinery/landinglight/ds1/delaythree{ dir = 1 @@ -12657,6 +14168,13 @@ icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) +"gnx" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/lv522/atmos/cargo_intake) "gny" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ @@ -12681,7 +14199,7 @@ icon_state = "N"; pixel_y = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_west_street) "gou" = ( /turf/open/floor/prison{ @@ -12733,8 +14251,12 @@ dir = 10; icon_state = "p_stair_full" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_2) +"goY" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/w_rockies) "gpi" = ( /obj/structure/reagent_dispensers/fueltank, /obj/effect/decal/cleanable/dirt, @@ -12767,10 +14289,6 @@ icon_state = "cement12" }, /area/lv522/outdoors/colony_streets/south_west_street) -"gpM" = ( -/obj/structure/girder/displaced, -/turf/open/auto_turf/shale/layer0, -/area/lv522/outdoors/colony_streets/north_east_street) "gpN" = ( /obj/effect/spawner/gibspawner/xeno, /turf/open/auto_turf/shale/layer1, @@ -12814,6 +14332,12 @@ icon_state = "white_cyan1" }, /area/lv522/indoors/a_block/medical) +"grq" = ( +/obj/structure/barricade/wooden{ + dir = 4 + }, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/central_streets) "grw" = ( /obj/effect/decal/cleanable/dirt, /obj/item/shard{ @@ -12873,15 +14397,15 @@ icon_state = "SE-out"; pixel_x = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/central_streets) "gsS" = ( /obj/effect/decal/cleanable/blood/drip, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) "gsZ" = ( /obj/structure/cargo_container/horizontal/blue/top, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/nw_rockies) "gtr" = ( /obj/structure/machinery/light{ @@ -12896,7 +14420,7 @@ /area/lv522/indoors/c_block/t_comm) "gts" = ( /obj/structure/tunnel, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/east_central_street) "gtt" = ( /obj/structure/filingcabinet{ @@ -12913,6 +14437,29 @@ icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) +"gtH" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/machinery/disposal, +/turf/open/floor/strata{ + icon_state = "blue1" + }, +/area/lv522/indoors/a_block/dorm_north) +"gtS" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/auto_turf/shale/layer2, +/area/lv522/outdoors/n_rockies) +"gtX" = ( +/obj/effect/decal/cleanable/blood, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "gug" = ( /obj/structure/cargo_container/horizontal/blue/bottom, /turf/open/floor/plating{ @@ -12946,6 +14493,18 @@ icon_state = "kitchen" }, /area/lv522/indoors/b_block/bar) +"guE" = ( +/obj/structure/platform{ + dir = 1 + }, +/obj/structure/platform{ + dir = 4 + }, +/obj/structure/platform_decoration{ + dir = 9 + }, +/turf/open/asphalt/cement, +/area/lv522/outdoors/colony_streets/north_east_street) "guH" = ( /obj/structure/machinery/light{ dir = 4 @@ -12967,6 +14526,16 @@ }, /turf/open/floor/prison, /area/lv522/indoors/a_block/kitchen) +"gvk" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "gvr" = ( /obj/structure/closet/bodybag, /obj/structure/curtain/medical, @@ -12976,18 +14545,18 @@ }, /area/lv522/indoors/a_block/medical/glass) "gvs" = ( -/obj/structure/prop/invuln/overhead/flammable_pipe/fly{ - dir = 1; - pixel_y = 6 +/obj/structure/machinery/space_heater, +/obj/item/reagent_container/food/drinks/coffee{ + pixel_x = 5; + pixel_y = 9 }, /turf/open/floor/corsat{ - dir = 8; - icon_state = "brown" + icon_state = "plate" }, -/area/lv522/atmos/east_reactor) +/area/lv522/atmos/cargo_intake) "gvG" = ( /obj/item/toy/beach_ball/holoball, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_street) "gvH" = ( /obj/structure/machinery/door/poddoor/shutters/almayer/open{ @@ -13017,18 +14586,20 @@ }, /area/lv522/indoors/b_block/bridge) "gwk" = ( -/obj/structure/prop/invuln/overhead/flammable_pipe/fly{ - pixel_y = 6 - }, -/turf/open/floor/corsat{ - dir = 4; - icon_state = "brown" +/obj/structure/cable/heavyduty{ + icon_state = "4-8" }, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/plating, /area/lv522/atmos/east_reactor) "gwt" = ( /obj/structure/cargo_container/wy/right, /turf/open/floor/prison, /area/lv522/atmos/cargo_intake) +"gwC" = ( +/obj/effect/alien/resin/sticky, +/turf/closed/wall/strata_ice/dirty, +/area/lv522/oob) "gwK" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat{ @@ -13056,6 +14627,17 @@ icon_state = "marked" }, /area/lv522/indoors/a_block/security) +"gxb" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/prop/almayer/computer/PC{ + dir = 8; + pixel_y = 3 + }, +/obj/structure/pipes/vents/pump, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/reactor_garage) "gxc" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/snacks/cheeseburger, @@ -13113,7 +14695,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 6 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/nw_rockies) "gyb" = ( /obj/effect/decal/cleanable/dirt, @@ -13129,6 +14711,31 @@ icon_state = "plate" }, /area/lv522/atmos/command_centre) +"gyB" = ( +/obj/item/prop/colony/used_flare, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) +"gyC" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + dir = 9; + icon_state = "brown" + }, +/area/lv522/atmos/east_reactor/south) +"gyK" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat{ + icon_state = "brown" + }, +/area/lv522/atmos/north_command_centre) "gzk" = ( /obj/structure/prop/almayer/computers/sensor_computer2, /turf/open/floor/corsat{ @@ -13142,6 +14749,18 @@ /obj/structure/barricade/deployable, /turf/open/floor/prison, /area/lv522/atmos/cargo_intake) +"gzw" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1; + pixel_y = -1 + }, +/obj/effect/landmark/corpsespawner/wy/manager, +/turf/open/floor{ + dir = 4; + icon_state = "whiteyellowfull" + }, +/area/lv522/oob/w_y_vault) "gzD" = ( /obj/structure/prop/almayer/computers/sensor_computer3, /turf/open/floor/corsat{ @@ -13173,6 +14792,12 @@ icon_state = "cement4" }, /area/lv522/outdoors/colony_streets/north_east_street) +"gzY" = ( +/obj/structure/largecrate/random, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/sewer) "gAa" = ( /obj/structure/prop/ice_colony/ground_wire{ dir = 4 @@ -13181,7 +14806,7 @@ pixel_x = -9; pixel_y = 25 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/central_streets) "gAJ" = ( /obj/structure/surface/table/almayer, @@ -13194,8 +14819,15 @@ /obj/structure/prop/invuln/ice_prefab{ dir = 10 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) +"gAS" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "gAU" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, @@ -13226,7 +14858,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/central_streets) "gBi" = ( /obj/structure/cargo_container/watatsumi/right, @@ -13236,7 +14868,7 @@ /obj/item/seeds/riceseed, /obj/structure/closet/crate, /obj/item/seeds/riceseed, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_west_street) "gBy" = ( /obj/effect/decal/warning_stripes{ @@ -13286,14 +14918,14 @@ /turf/open/floor/wood, /area/lv522/indoors/a_block/executive) "gCV" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 +/obj/structure/machinery/conveyor{ + dir = 10; + id = "cargo_container" }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor/corsat{ + icon_state = "plate" }, -/turf/open/floor/corsat, /area/lv522/atmos/cargo_intake) "gDz" = ( /obj/structure/barricade/wooden{ @@ -13356,7 +14988,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/nw_rockies) "gEQ" = ( /obj/structure/surface/table/almayer, @@ -13451,6 +15083,13 @@ icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) +"gGg" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/corsat{ + dir = 5; + icon_state = "brown" + }, +/area/lv522/atmos/east_reactor/south) "gGk" = ( /obj/structure/prop/server_equipment/yutani_server, /turf/open/floor/corsat{ @@ -13513,6 +15152,14 @@ icon_state = "cement2" }, /area/lv522/outdoors/colony_streets/north_west_street) +"gHD" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 5 + }, +/turf/open/asphalt/cement{ + icon_state = "cement1" + }, +/area/lv522/outdoors/colony_streets/north_street) "gHF" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_full" @@ -13556,7 +15203,9 @@ /area/lv522/outdoors/colony_streets/south_east_street) "gIr" = ( /obj/structure/platform_decoration, -/turf/open/auto_turf/shale/layer0, +/turf/open/asphalt/cement{ + icon_state = "cement2" + }, /area/lv522/outdoors/colony_streets/south_east_street) "gIv" = ( /obj/structure/cargo_container/ferret/left, @@ -13571,6 +15220,15 @@ icon_state = "brown" }, /area/lv522/atmos/cargo_intake) +"gIZ" = ( +/obj/structure/bed/chair/comfy{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "gJm" = ( /obj/structure/cargo_container/ferret/mid, /turf/open/floor/prison, @@ -13595,6 +15253,13 @@ icon_state = "cement3" }, /area/lv522/outdoors/nw_rockies) +"gJK" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/reactor_garage) "gJL" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spider/spiderling/nogrow, @@ -13634,6 +15299,15 @@ icon_state = "brown" }, /area/lv522/atmos/east_reactor) +"gKM" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/corsat{ + icon_state = "browncorner" + }, +/area/lv522/atmos/east_reactor) "gKO" = ( /obj/structure/machinery/colony_floodlight{ layer = 4.3 @@ -13714,7 +15388,19 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/n_rockies) +"gMe" = ( +/obj/structure/platform{ + dir = 1 + }, +/obj/structure/platform{ + dir = 4 + }, +/obj/structure/platform_decoration{ + dir = 9 + }, +/turf/open/asphalt/cement, /area/lv522/outdoors/n_rockies) "gMy" = ( /obj/structure/stairs/perspective{ @@ -13756,6 +15442,9 @@ /area/lv522/indoors/a_block/dorms) "gNe" = ( /obj/structure/prop/server_equipment/yutani_server/off, +/obj/structure/machinery/light{ + dir = 8 + }, /turf/open/floor/corsat{ icon_state = "plate" }, @@ -13774,12 +15463,30 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/bridges/op_centre) +"gNs" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/corsat{ + dir = 4; + icon_state = "brown" + }, +/area/lv522/atmos/reactor_garage) "gNJ" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, /turf/open/floor/plating, /area/lv522/indoors/a_block/bridges/op_centre) +"gNN" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "white_cyan1" + }, +/area/lv522/oob/w_y_vault) "gOb" = ( /obj/structure/closet/emcloset, /obj/effect/decal/cleanable/dirt, @@ -13790,7 +15497,7 @@ /area/lv522/indoors/b_block/hydro) "gOj" = ( /obj/structure/cargo_container/horizontal/blue/middle, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/nw_rockies) "gOo" = ( /obj/structure/prop/invuln/fusion_reactor, @@ -13831,6 +15538,13 @@ icon_state = "plate" }, /area/lv522/atmos/east_reactor) +"gOJ" = ( +/obj/item/tool/wirecutters{ + pixel_x = -1; + pixel_y = -6 + }, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/nw_rockies) "gOS" = ( /obj/structure/largecrate/random, /obj/structure/largecrate/random{ @@ -13841,10 +15555,6 @@ /obj/effect/decal/cleanable/cobweb, /turf/open/floor/prison, /area/lv522/indoors/c_block/cargo) -"gOX" = ( -/obj/structure/girder/reinforced, -/turf/open/auto_turf/shale/layer0, -/area/lv522/outdoors/colony_streets/north_east_street) "gOZ" = ( /obj/structure/platform_decoration{ dir = 8 @@ -13878,7 +15588,7 @@ /obj/structure/platform_decoration{ dir = 5 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_1) "gPw" = ( /obj/effect/decal/cleanable/dirt, @@ -13890,12 +15600,22 @@ }, /area/lv522/indoors/lone_buildings/outdoor_bot) "gPQ" = ( -/obj/structure/prop/turbine_extras, -/obj/structure/prop/invuln/fusion_reactor, +/obj/structure/machinery/conveyor{ + dir = 5; + id = "cargo_container" + }, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/floor/corsat{ - icon_state = "plate" + dir = 9; + icon_state = "brown" }, -/area/lv522/atmos/east_reactor) +/area/lv522/atmos/cargo_intake) +"gQu" = ( +/mob/living/simple_animal/cat/kitten{ + dir = 8 + }, +/turf/open/floor/prison, +/area/lv522/indoors/a_block/dorm_north) "gQy" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/cameras/wooden_tv{ @@ -13908,9 +15628,6 @@ icon_state = "greenfull" }, /area/lv522/landing_zone_1/ceiling) -"gQN" = ( -/turf/open/auto_turf/shale/layer0_plate, -/area/lv522/outdoors/w_rockies) "gQV" = ( /obj/structure/platform{ dir = 4 @@ -13933,7 +15650,7 @@ dir = 4 }, /obj/item/prop/colony/used_flare, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) "gRp" = ( /obj/structure/machinery/floodlight/landing, @@ -13943,7 +15660,7 @@ /area/lv522/landing_zone_2) "gRs" = ( /obj/structure/cargo_container/watatsumi/leftmid, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) "gRw" = ( /obj/structure/pipes/standard/manifold/hidden/green{ @@ -13955,8 +15672,16 @@ /obj/structure/platform_decoration{ dir = 8 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) +"gRJ" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 10 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "gRK" = ( /obj/structure/bed/chair/comfy, /turf/open/floor/prison{ @@ -13998,18 +15723,20 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) +"gTc" = ( +/obj/structure/platform_decoration{ + dir = 1 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "gTw" = ( /turf/open/floor/corsat{ dir = 6; icon_state = "brown" }, /area/lv522/atmos/north_command_centre) -"gTJ" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 10 - }, -/turf/open/auto_turf/shale/layer0, -/area/lv522/outdoors/n_rockies) "gTM" = ( /obj/structure/girder, /turf/open/floor/plating, @@ -14092,6 +15819,11 @@ }, /turf/closed/wall/shiva/prefabricated/reinforced, /area/lv522/atmos/cargo_intake) +"gVf" = ( +/obj/structure/machinery/landinglight/ds2, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/lv522/landing_zone_2) "gVg" = ( /obj/effect/decal/cleanable/blood/drip, /obj/effect/decal/cleanable/dirt, @@ -14101,7 +15833,7 @@ /obj/structure/platform_decoration{ dir = 4 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_1) "gVr" = ( /obj/effect/decal/cleanable/dirt, @@ -14120,7 +15852,10 @@ /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/north_west_street) "gVA" = ( -/turf/closed/wall/solaris/reinforced/hull/lv522, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_marked" + }, /area/lv522/landing_zone_2/ceiling) "gWb" = ( /obj/structure/surface/table/almayer, @@ -14134,6 +15869,14 @@ }, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) +"gWg" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, +/obj/effect/landmark/xeno_spawn, +/turf/open/floor/corsat{ + dir = 6; + icon_state = "brown" + }, +/area/lv522/atmos/east_reactor/south) "gWh" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ @@ -14148,6 +15891,13 @@ icon_state = "white_cyan1" }, /area/lv522/indoors/a_block/medical) +"gWu" = ( +/obj/effect/spawner/gibspawner/xeno, +/turf/open/floor/prison{ + dir = 8; + icon_state = "cell_stripe" + }, +/area/lv522/atmos/way_in_command_centre) "gWx" = ( /obj/structure/closet/secure_closet/miner{ pixel_x = 4 @@ -14214,6 +15964,13 @@ }, /turf/closed/wall/shiva/prefabricated/reinforced, /area/lv522/atmos/cargo_intake) +"gXI" = ( +/obj/structure/pipes/vents/pump, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison{ + icon_state = "cell_stripe" + }, +/area/lv522/atmos/reactor_garage) "gXL" = ( /obj/item/prop/alien/hugger, /obj/effect/decal/cleanable/dirt, @@ -14222,10 +15979,11 @@ }, /area/lv522/indoors/lone_buildings/chunk) "gXR" = ( +/obj/structure/cargo_container/horizontal/blue/bottom, /turf/open/floor/corsat{ - icon_state = "browncorner" + icon_state = "squares" }, -/area/lv522/atmos/east_reactor/east) +/area/lv522/atmos/cargo_intake) "gXT" = ( /obj/item/shard{ icon_state = "medium" @@ -14246,6 +16004,10 @@ icon_state = "blue_plate" }, /area/lv522/indoors/a_block/admin) +"gYc" = ( +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/corsat, +/area/lv522/atmos/reactor_garage) "gYs" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/door_control/brbutton/alt{ @@ -14265,12 +16027,21 @@ icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) +"gYK" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "gYM" = ( -/obj/structure/blocker/forcefield/vehicles, /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/floor/corsat, +/turf/closed/wall/strata_outpost/reinforced, /area/lv522/atmos/cargo_intake) "gYO" = ( /turf/open/floor/prison{ @@ -14293,7 +16064,7 @@ }, /area/lv522/indoors/a_block/kitchen/glass) "gZd" = ( -/obj/structure/machinery/power/apc/weak{ +/obj/structure/machinery/light{ dir = 1 }, /turf/open/floor/corsat{ @@ -14367,15 +16138,30 @@ icon_state = "plate" }, /area/lv522/atmos/command_centre) +"ham" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/corsat{ + dir = 6; + icon_state = "brown" + }, +/area/lv522/atmos/reactor_garage) "han" = ( /obj/structure/cargo_container/horizontal/blue/bottom, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/nw_rockies) +"hao" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/corsat, +/area/lv522/atmos/cargo_intake) "haq" = ( /turf/open/floor/strata{ icon_state = "white_cyan3" }, /area/lv522/indoors/a_block/medical/glass) +"har" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison, +/area/lv522/atmos/way_in_command_centre) "hat" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 @@ -14410,6 +16196,16 @@ /obj/structure/largecrate/random/barrel/blue, /turf/open/floor/plating, /area/lv522/indoors/c_block/mining) +"haG" = ( +/obj/effect/spawner/gibspawner/xeno, +/obj/effect/decal/cleanable/blood/xeno{ + icon_state = "xgib3" + }, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "haR" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -14423,6 +16219,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) +"hbj" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/filt) "hbk" = ( /obj/effect/spawner/gibspawner/robot, /turf/open/floor/corsat{ @@ -14501,16 +16303,17 @@ /turf/open/floor/plating, /area/lv522/indoors/c_block/mining) "hcv" = ( +/obj/structure/fence, /obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 + icon_state = "W" }, /obj/effect/decal/warning_stripes{ icon_state = "E"; pixel_x = 1 }, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" }, /area/lv522/landing_zone_2/ceiling) "hcx" = ( @@ -14519,6 +16322,11 @@ icon_state = "brown" }, /area/lv522/atmos/command_centre) +"hcE" = ( +/obj/item/stack/sheet/metal, +/obj/effect/decal/cleanable/generic, +/turf/open/floor/prison, +/area/lv522/outdoors/colony_streets/windbreaker/observation) "hcG" = ( /obj/structure/stairs/perspective{ dir = 10; @@ -14541,7 +16349,7 @@ /obj/structure/pipes/standard/manifold/hidden/green{ dir = 8 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_street) "hcZ" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -14551,6 +16359,9 @@ /area/lv522/atmos/command_centre) "hdd" = ( /obj/item/prop/alien/hugger, +/obj/structure/machinery/light{ + dir = 1 + }, /turf/open/floor/corsat{ icon_state = "plate" }, @@ -14578,6 +16389,12 @@ icon_state = "wood" }, /area/lv522/indoors/b_block/bar) +"hdu" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 10 + }, +/turf/open/auto_turf/shale/layer2, +/area/lv522/outdoors/n_rockies) "hdG" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -14602,10 +16419,13 @@ }, /area/lv522/atmos/east_reactor/south) "hdR" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 6 +/obj/structure/bed/chair{ + dir = 1 + }, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "brown" }, -/turf/open/floor/corsat, /area/lv522/atmos/cargo_intake) "hef" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -14671,6 +16491,10 @@ /area/lv522/indoors/a_block/bridges/op_centre) "hfi" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/obj/structure/prop/server_equipment/laptop/on{ + layer = 3.1; + pixel_y = 10 + }, /turf/open/floor/corsat{ dir = 1; icon_state = "brown" @@ -14729,7 +16553,7 @@ /area/lv522/indoors/b_block/hydro) "hgr" = ( /obj/structure/girder/reinforced, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/central_streets) "hgy" = ( /obj/structure/surface/rack, @@ -14762,15 +16586,32 @@ }, /area/lv522/atmos/east_reactor/west) "hgQ" = ( -/obj/structure/largecrate/random/case/double, -/turf/open/floor/corsat, +/obj/structure/prop/ice_colony/ground_wire{ + dir = 1 + }, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + icon_state = "brown" + }, /area/lv522/atmos/east_reactor) +"hhb" = ( +/obj/structure/platform{ + dir = 4 + }, +/turf/open/asphalt/cement{ + icon_state = "cement12" + }, +/area/lv522/landing_zone_2) "hhu" = ( -/turf/open/floor/corsat{ +/obj/structure/machinery/conveyor{ dir = 8; - icon_state = "browncorner" + id = "cargo_container" }, -/area/lv522/atmos/east_reactor/east) +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/cargo_intake) "hhD" = ( /turf/open/asphalt/cement{ icon_state = "cement1" @@ -14782,12 +16623,50 @@ icon_state = "greenfull" }, /area/lv522/indoors/b_block/bridge) +"hhJ" = ( +/obj/structure/surface/rack, +/obj/item/tool/crowbar, +/turf/open/floor/strata{ + icon_state = "blue1" + }, +/area/lv522/outdoors/colony_streets/windbreaker/observation) +"hhK" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 4; + id = "Reactor_entry_2" + }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/way_in_command_centre) +"hhQ" = ( +/obj/structure/closet/radiation, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/east_reactor/south) "hig" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/floor/corsat{ icon_state = "marked" }, /area/lv522/atmos/east_reactor/east) +"hij" = ( +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "brown" + }, +/area/lv522/atmos/reactor_garage) +"hip" = ( +/obj/structure/pipes/vents/pump, +/turf/open/asphalt/cement{ + icon_state = "cement4" + }, +/area/lv522/outdoors/colony_streets/north_west_street) "hix" = ( /obj/structure/platform{ dir = 4 @@ -15006,10 +16885,22 @@ "hll" = ( /obj/structure/surface/table/almayer, /obj/item/device/binoculars, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/turf/open/floor/strata{ + icon_state = "blue1" }, /area/lv522/outdoors/colony_streets/windbreaker/observation) +"hlp" = ( +/obj/structure/machinery/conveyor{ + dir = 8; + id = "cargo_container" + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/cargo_intake) "hlH" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/handcuffs/cable/white, @@ -15098,6 +16989,15 @@ icon_state = "brown" }, /area/lv522/atmos/west_reactor) +"hnG" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper Corporation Dome"; + req_access_txt = "100" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/way_in_command_centre) "hnX" = ( /obj/structure/machinery/door/airlock/almayer/generic{ dir = 2 @@ -15117,7 +17017,7 @@ icon_state = "N"; pixel_y = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/nw_rockies) "hov" = ( /obj/effect/decal/warning_stripes{ @@ -15194,6 +17094,14 @@ icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) +"hpI" = ( +/obj/item/ammo_magazine/rifle/heap{ + current_rounds = 0 + }, +/turf/open/floor/corsat{ + icon_state = "brown" + }, +/area/lv522/atmos/east_reactor/south) "hpO" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ dir = 1; @@ -15248,6 +17156,23 @@ icon_state = "cement2" }, /area/lv522/outdoors/colony_streets/east_central_street) +"hrl" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/vending/coffee, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) +"hrw" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/surface/table/almayer, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/strata{ + icon_state = "blue1" + }, +/area/lv522/outdoors/colony_streets/windbreaker/observation) "hrx" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/prop/almayer/computer/PC{ @@ -15259,14 +17184,25 @@ }, /area/lv522/indoors/a_block/dorms) "hry" = ( -/obj/effect/decal/cleanable/blood/oil, -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 5 +/obj/structure/machinery/conveyor{ + dir = 10; + id = "cargo_container" }, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/floor/corsat{ - icon_state = "squares" + dir = 1; + icon_state = "browncorner" }, /area/lv522/atmos/cargo_intake) +"hrH" = ( +/obj/structure/platform_decoration, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "hrU" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/prison{ @@ -15313,7 +17249,7 @@ icon_state = "N"; pixel_y = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/nw_rockies) "htA" = ( /obj/structure/barricade/wooden{ @@ -15376,10 +17312,21 @@ "huX" = ( /obj/structure/surface/table/almayer, /obj/effect/decal/cleanable/dirt, +/obj/structure/transmitter/colony_net{ + dir = 1; + phone_category = "LV522 Chances Claim"; + phone_color = "red"; + phone_id = "Colony Kitchen"; + pixel_y = -6 + }, /turf/open/floor/prison{ icon_state = "kitchen" }, /area/lv522/indoors/a_block/kitchen) +"hvh" = ( +/obj/structure/platform, +/turf/open/gm/river, +/area/lv522/atmos/sewer) "hvD" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 1 @@ -15387,6 +17334,22 @@ /obj/structure/bed/chair, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/c_block/mining) +"hvE" = ( +/obj/structure/fence, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/outdoors/nw_rockies) "hwa" = ( /obj/structure/platform/stair_cut{ icon_state = "platform_stair_alt" @@ -15436,7 +17399,7 @@ pixel_x = -3; pixel_y = -10 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) "hwG" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, @@ -15448,29 +17411,21 @@ icon_state = "squares" }, /area/lv522/atmos/east_reactor/south) -"hxh" = ( -/turf/closed/wall, -/area/lv522/atmos/east_reactor/south) "hxn" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/central_streets) "hxt" = ( /obj/structure/surface/table/almayer, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/dorms) -"hxu" = ( -/turf/open/asphalt/cement{ - icon_state = "cement4" - }, -/area/lv522/outdoors/n_rockies) "hxy" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 6 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/north_street) "hxV" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -15542,9 +17497,6 @@ }, /area/lv522/indoors/c_block/mining) "hzk" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /turf/closed/wall/strata_outpost, /area/lv522/indoors/a_block/fitness) @@ -15563,11 +17515,21 @@ icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) +"hzw" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/barricade/deployable{ + dir = 1 + }, +/turf/open/floor/prison{ + dir = 1; + icon_state = "cell_stripe" + }, +/area/lv522/atmos/way_in_command_centre) "hzA" = ( /obj/item/ammo_magazine/rifle/heap{ current_rounds = 0 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/n_rockies) "hzM" = ( /obj/structure/fence{ @@ -15599,11 +17561,25 @@ icon_state = "kitchen" }, /area/lv522/indoors/a_block/kitchen) +"hzV" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/ammo_magazine/rifle/heap{ + current_rounds = 0 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_x = -1; + pixel_y = 2 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "hAg" = ( /obj/structure/prop/invuln/ice_prefab{ dir = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/north_street) "hAi" = ( /obj/structure/surface/table/almayer, @@ -15637,7 +17613,7 @@ /obj/structure/bed/chair{ dir = 4 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) "hAw" = ( /obj/structure/prop/invuln/ice_prefab/standalone{ @@ -15663,6 +17639,13 @@ icon_state = "blue" }, /area/lv522/indoors/a_block/admin) +"hAD" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/corsat{ + dir = 9; + icon_state = "brown" + }, +/area/lv522/atmos/reactor_garage) "hAE" = ( /obj/structure/fence{ layer = 2.9 @@ -15697,11 +17680,10 @@ }, /area/lv522/atmos/command_centre) "hBg" = ( -/obj/structure/prop/dam/truck/damaged, -/turf/open/floor/corsat{ - icon_state = "plate" - }, -/area/lv522/atmos/north_command_centre) +/obj/structure/cryofeed, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor/bluegrid, +/area/lv522/atmos/east_reactor) "hBp" = ( /obj/structure/dispenser/oxygen, /obj/effect/decal/cleanable/dirt, @@ -15754,6 +17736,10 @@ icon_state = "browncorner" }, /area/lv522/atmos/command_centre) +"hCH" = ( +/obj/structure/surface/table/almayer, +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv522/atmos/way_in_command_centre) "hCU" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /obj/structure/pipes/standard/simple/hidden/green, @@ -15777,7 +17763,7 @@ }, /area/lv522/atmos/command_centre) "hDy" = ( -/turf/closed/wall, +/turf/closed/wall/strata_outpost, /area/lv522/atmos/command_centre) "hDE" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -15811,6 +17797,12 @@ icon_state = "marked" }, /area/lv522/indoors/a_block/admin) +"hEJ" = ( +/obj/structure/closet/secure_closet/engineering_electrical, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/way_in_command_centre) "hES" = ( /obj/structure/bed/chair{ dir = 4 @@ -15842,6 +17834,12 @@ icon_state = "browncorner" }, /area/lv522/atmos/command_centre) +"hFA" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/sewer) "hFG" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ @@ -15852,6 +17850,9 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, +/obj/structure/platform{ + dir = 8 + }, /turf/open/asphalt/cement{ icon_state = "cement1" }, @@ -15862,6 +17863,9 @@ icon_state = "brown" }, /area/lv522/atmos/command_centre) +"hFX" = ( +/turf/open/auto_turf/shale/layer2, +/area/lv522/outdoors/colony_streets/south_street) "hGg" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/bed/sofa/vert/white, @@ -15870,6 +17874,18 @@ icon_state = "whiteyellowfull" }, /area/lv522/indoors/a_block/corpo/glass) +"hGm" = ( +/obj/structure/closet/firecloset/full, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/way_in_command_centre) +"hGJ" = ( +/obj/structure/platform_decoration/strata{ + dir = 1 + }, +/turf/closed/wall/strata_ice/dirty, +/area/lv522/oob) "hGU" = ( /obj/effect/landmark/monkey_spawn, /turf/open/floor/corsat{ @@ -15887,6 +17903,10 @@ }, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms) +"hHd" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison, +/area/lv522/atmos/outdoor) "hHh" = ( /obj/structure/machinery/colony_floodlight{ layer = 4.3 @@ -15896,14 +17916,11 @@ }, /area/lv522/outdoors/colony_streets/north_east_street) "hHj" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/obj/structure/largecrate, +/turf/open/floor/corsat{ + icon_state = "squares" }, -/area/lv522/outdoors/colony_streets/windbreaker/observation) +/area/lv522/atmos/cargo_intake) "hHN" = ( /obj/structure/bed/chair/comfy, /turf/open/floor/corsat{ @@ -15926,7 +17943,7 @@ /obj/item/weapon/gun/rifle/m41a{ current_mag = null }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/n_rockies) "hIx" = ( /obj/structure/machinery/light{ @@ -15966,7 +17983,7 @@ /area/lv522/atmos/command_centre) "hIZ" = ( /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/nw_rockies) "hJp" = ( /obj/structure/machinery/light{ @@ -15978,25 +17995,12 @@ }, /area/lv522/indoors/a_block/dorms/glass) "hJq" = ( -/obj/structure/fence{ - layer = 2.9 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/strata{ - dir = 4; - icon_state = "floor3" +/obj/structure/platform/strata, +/obj/structure/platform/strata{ + dir = 4 }, -/area/lv522/outdoors/nw_rockies) +/turf/closed/wall/strata_ice/dirty, +/area/lv522/oob) "hJB" = ( /turf/open/floor/corsat{ icon_state = "brown" @@ -16017,7 +18021,7 @@ }, /area/lv522/indoors/lone_buildings/storage_blocks) "hJZ" = ( -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) "hKj" = ( /obj/effect/decal/cleanable/dirt, @@ -16032,8 +18036,8 @@ /obj/structure/surface/table/almayer, /obj/item/trash/ceramic_plate, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/turf/open/floor/strata{ + icon_state = "blue1" }, /area/lv522/outdoors/colony_streets/windbreaker/observation) "hKy" = ( @@ -16054,18 +18058,34 @@ /obj/structure/prop/ice_colony/ground_wire{ dir = 4 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/w_rockies) "hKG" = ( /obj/structure/prop/invuln/ice_prefab/standalone, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/nw_rockies) +"hKI" = ( +/obj/structure/closet/firecloset/full, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/sewer) "hKJ" = ( /turf/open/floor/prison{ dir = 5; icon_state = "blue" }, /area/lv522/indoors/a_block/admin) +"hKK" = ( +/obj/item/clothing/mask/facehugger{ + desc = "It has some sort of a tube at the end of its tail. What the hell is this thing?"; + icon_state = "facehugger_impregnated"; + layer = 3; + name = "????"; + stat = 2 + }, +/turf/open/floor/corsat, +/area/lv522/atmos/east_reactor/south) "hKO" = ( /obj/structure/prop/invuln/lattice_prop{ icon_state = "lattice3"; @@ -16137,6 +18157,12 @@ icon_state = "darkredfull2" }, /area/lv522/indoors/a_block/kitchen/glass) +"hLT" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/cargo_intake) "hLY" = ( /turf/open/floor/corsat{ icon_state = "brown" @@ -16185,7 +18211,7 @@ /area/lv522/outdoors/colony_streets/north_east_street) "hMN" = ( /obj/structure/cargo_container/kelland/right, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/south_east_street) "hMR" = ( /obj/effect/decal/cleanable/dirt, @@ -16201,8 +18227,16 @@ }, /turf/open/floor/prison, /area/lv522/indoors/c_block/casino) +"hNf" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "hNj" = ( /obj/item/stack/sheet/metal, +/obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat, /area/lv522/atmos/east_reactor) "hNk" = ( @@ -16232,11 +18266,17 @@ icon_state = "marked" }, /area/lv522/indoors/a_block/dorms) +"hNP" = ( +/obj/structure/platform{ + dir = 8 + }, +/turf/open/gm/river, +/area/lv522/atmos/sewer) "hNR" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_street) "hNV" = ( /obj/item/stack/rods, @@ -16291,6 +18331,7 @@ "hOI" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /obj/structure/blocker/forcefield/vehicles, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/floor/corsat{ icon_state = "marked" }, @@ -16353,7 +18394,7 @@ /area/lv522/indoors/b_block/bar) "hPM" = ( /obj/item/stack/sheet/metal, -/turf/open/auto_turf/shale/layer0_plate, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/w_rockies) "hPO" = ( /obj/item/ammo_magazine/rifle/heap{ @@ -16362,6 +18403,21 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison, /area/lv522/atmos/cargo_intake) +"hPQ" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/transmitter/colony_net/rotary{ + phone_category = "LV522 Chances Claim"; + phone_id = "Chief Engineer Office"; + pixel_x = -2; + pixel_y = 6 + }, +/obj/item/reagent_container/food/drinks/coffeecup/wy{ + pixel_x = 3; + pixel_y = -1 + }, +/turf/open/floor/wood/ship, +/area/lv522/atmos/way_in_command_centre) "hPT" = ( /obj/structure/machinery/door/airlock/almayer/generic{ dir = 2 @@ -16418,7 +18474,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/w_rockies) "hRy" = ( /obj/structure/prop/invuln/fusion_reactor, @@ -16451,7 +18507,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/nw_rockies) "hSs" = ( /obj/structure/cargo_container/kelland/left{ @@ -16469,6 +18525,13 @@ icon_state = "brown" }, /area/lv522/atmos/command_centre) +"hSQ" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/prison{ + dir = 1; + icon_state = "cell_stripe" + }, +/area/lv522/atmos/way_in_command_centre) "hTd" = ( /obj/structure/window/reinforced{ dir = 1; @@ -16482,6 +18545,10 @@ "hTe" = ( /turf/open/gm/river, /area/lv522/landing_zone_1/tunnel) +"hTf" = ( +/obj/structure/platform_decoration, +/turf/open/asphalt/cement, +/area/lv522/outdoors/n_rockies) "hTg" = ( /obj/structure/surface/table/almayer, /turf/open/floor/corsat{ @@ -16529,7 +18596,7 @@ "hTW" = ( /obj/structure/largecrate/random/secure, /obj/effect/landmark/lv624/fog_blocker/short, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_1) "hTX" = ( /obj/structure/machinery/light{ @@ -16645,6 +18712,17 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/lv522/indoors/c_block/garage) +"hWC" = ( +/obj/structure/platform{ + dir = 8 + }, +/obj/structure/prop/almayer/computers/sensor_computer2{ + layer = 2.0 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "hWD" = ( /obj/structure/barricade/deployable, /turf/open/floor/prison{ @@ -16653,10 +18731,10 @@ }, /area/lv522/indoors/a_block/admin) "hWI" = ( -/obj/structure/pipes/standard/manifold/hidden/green{ - dir = 4 +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 9 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/central_streets) "hWJ" = ( /obj/structure/machinery/light{ @@ -16676,44 +18754,17 @@ /turf/open/floor/prison, /area/lv522/atmos/cargo_intake) "hXt" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 10 - }, -/turf/open/floor/corsat{ - icon_state = "plate" - }, -/area/lv522/atmos/cargo_intake) -"hXy" = ( -/obj/structure/window/reinforced{ - dir = 4; - pixel_x = -2; - pixel_y = 4 - }, -/obj/structure/window/reinforced{ - dir = 8; - layer = 3.3; - pixel_y = 4 - }, -/obj/structure/bed{ - can_buckle = 0 - }, -/obj/structure/bed{ - buckling_y = 13; - layer = 3.5; - pixel_y = 13 - }, -/obj/item/bedsheet/brown{ - pixel_y = 13 - }, -/obj/item/bedsheet/brown{ - layer = 3.1 - }, -/turf/open/floor/strata{ - icon_state = "blue1" +/obj/effect/decal/cleanable/blood, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_x = -1; + pixel_y = 2 }, -/area/lv522/indoors/a_block/dorm_north) +/turf/closed/wall/mineral/bone_resin, +/area/lv522/oob) "hXA" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat{ dir = 9; icon_state = "brown" @@ -16764,6 +18815,13 @@ icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/storage_blocks) +"hYg" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/obj/structure/surface/table/almayer, +/turf/open/floor/corsat{ + icon_state = "browncorner" + }, +/area/lv522/atmos/east_reactor/south) "hYk" = ( /obj/structure/window/reinforced{ dir = 4 @@ -16820,6 +18878,14 @@ }, /turf/open/floor/bluegrid, /area/lv522/indoors/a_block/corpo/glass) +"hZg" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/prop/server_equipment/laptop/closed, +/obj/structure/surface/table/almayer, +/turf/open/floor/strata{ + icon_state = "blue1" + }, +/area/lv522/outdoors/colony_streets/windbreaker/observation) "hZn" = ( /obj/structure/prop/server_equipment/yutani_server{ pixel_x = -4 @@ -16848,6 +18914,13 @@ }, /turf/open/floor/prison, /area/lv522/indoors/c_block/casino) +"hZO" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/reactor_garage) "hZR" = ( /obj/structure/closet/firecloset/full, /obj/effect/decal/cleanable/dirt, @@ -16887,6 +18960,11 @@ icon_state = "plate" }, /area/lv522/atmos/filt) +"iaM" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/stack/rods, +/turf/open/floor/plating, +/area/lv522/outdoors/colony_streets/windbreaker/observation) "iaY" = ( /obj/item/prop/alien/hugger, /obj/structure/pipes/standard/simple/hidden/green{ @@ -16906,6 +18984,17 @@ /obj/effect/decal/cleanable/blood/xeno, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/nw_rockies) +"iby" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + dir = 1 + }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/reactor_garage) "ibE" = ( /turf/closed/shuttle/dropship2/tornado{ icon_state = "23" @@ -16965,6 +19054,25 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/lone_buildings/storage_blocks) +"icM" = ( +/obj/structure/machinery/door_control{ + id = "Marked_6"; + name = "Cargo Shutter Control"; + pixel_y = 10 + }, +/obj/structure/surface/table/almayer, +/obj/item/prop{ + desc = "The first page reads. 'Classified Weyland Bio-Weapons Division level eight clearance required.' The rest talks about some sort of XX-121 combat stim?"; + icon = 'icons/obj/items/paper.dmi'; + icon_state = "folder_black"; + name = "Weyland classified intelligence folder"; + pixel_y = -2 + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "white_cyan1" + }, +/area/lv522/oob/w_y_vault) "icT" = ( /obj/structure/machinery/light{ dir = 1 @@ -16984,6 +19092,18 @@ icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/bridge) +"idk" = ( +/turf/open/floor/corsat{ + dir = 4; + icon_state = "brown" + }, +/area/lv522/atmos/reactor_garage) +"idn" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + icon_state = "brown" + }, +/area/lv522/atmos/east_reactor/west) "idq" = ( /obj/structure/machinery/power/apc/weak{ dir = 1 @@ -17002,25 +19122,22 @@ }, /area/lv522/indoors/a_block/medical) "idH" = ( -/obj/structure/fence{ - layer = 2.9 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor/strata{ - dir = 4; - icon_state = "floor3" +/obj/item/device/flashlight/flare/on, +/obj/effect/decal/cleanable/blood, +/obj/item/ammo_magazine/rifle/extended{ + current_rounds = 0; + pixel_x = 6; + pixel_y = 17 }, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/nw_rockies) "idL" = ( /turf/closed/wall/shiva/prefabricated/reinforced/hull, /area/lv522/oob) +"idX" = ( +/obj/structure/window/framed/corsat, +/turf/open/floor/plating, +/area/lv522/atmos/east_reactor/south) "iee" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -17058,13 +19175,13 @@ layer = 2.0; pixel_y = -13 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/nw_rockies) "iff" = ( /obj/structure/prop/invuln/ice_prefab/trim{ dir = 4 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/nw_rockies) "ifh" = ( /obj/structure/prop/invuln/overhead/flammable_pipe/fly{ @@ -17176,6 +19293,13 @@ icon_state = "blue" }, /area/lv522/indoors/a_block/hallway) +"ihf" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat{ + dir = 6; + icon_state = "brown" + }, +/area/lv522/atmos/east_reactor/south) "ihs" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -17186,7 +19310,7 @@ /area/lv522/indoors/a_block/dorms) "ihy" = ( /obj/structure/barricade/deployable, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/n_rockies) "ihI" = ( /obj/structure/fence, @@ -17228,7 +19352,7 @@ dir = 8; icon_state = "p_stair_full" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/indoors/a_block/bridges/dorms_fitness) "iiL" = ( /obj/structure/machinery/light{ @@ -17243,14 +19367,14 @@ icon_state = "SE-out"; pixel_x = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_west_street) "ijv" = ( /obj/structure/barricade/deployable{ dir = 4 }, /obj/structure/barricade/deployable, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/n_rockies) "ijB" = ( /obj/structure/machinery/shower{ @@ -17304,14 +19428,27 @@ /obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/plating, /area/lv522/landing_zone_1/tunnel) +"ike" = ( +/obj/item/prop/alien/hugger, +/obj/structure/transmitter/colony_net{ + dir = 4; + phone_category = "LV522 Chances Claim"; + phone_color = "red"; + phone_id = "Colony Bar & Grill"; + pixel_x = -16 + }, +/turf/open/floor{ + icon_state = "wood" + }, +/area/lv522/indoors/b_block/bar) "ikr" = ( -/obj/structure/prop/turbine_extras, -/obj/structure/prop/invuln/overhead/flammable_pipe/fly{ - dir = 8; - icon_state = "flammable_pipe_3" +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 5 }, -/turf/open/floor/corsat, -/area/lv522/atmos/east_reactor) +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/lv522/atmos/cargo_intake) "ikw" = ( /obj/item/stack/sheet/metal, /turf/open/asphalt/cement{ @@ -17352,7 +19489,7 @@ /area/lv522/indoors/b_block/hydro) "ilK" = ( /obj/item/stack/sheet/metal, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/nw_rockies) "ilR" = ( /obj/effect/decal/cleanable/dirt, @@ -17398,16 +19535,6 @@ icon_state = "marked" }, /area/lv522/indoors/c_block/mining) -"imA" = ( -/obj/structure/pipes/vents/pump, -/obj/structure/machinery/camera/autoname, -/obj/structure/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/strata{ - icon_state = "blue1" - }, -/area/lv522/indoors/a_block/dorm_north) "imJ" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -17438,7 +19565,7 @@ /area/lv522/landing_zone_1/ceiling) "inp" = ( /obj/item/prop/colony/used_flare, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/n_rockies) "inA" = ( /obj/effect/decal/cleanable/dirt, @@ -17455,11 +19582,11 @@ /area/lv522/outdoors/n_rockies) "iod" = ( /obj/structure/cargo_container/ferret/mid, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/nw_rockies) "ioA" = ( /obj/structure/cargo_container/ferret/right, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/nw_rockies) "ioD" = ( /obj/structure/prop/structure_lattice, @@ -17476,10 +19603,9 @@ }, /area/lv522/indoors/c_block/t_comm) "ipf" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/machinery/disposal, +/obj/structure/pipes/standard/simple/hidden/green, +/obj/item/tool/weldingtool/simple, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/strata{ icon_state = "blue1" }, @@ -17497,10 +19623,11 @@ /turf/open/auto_turf/sand/layer1, /area/lv522/indoors/b_block/bridge) "ipB" = ( -/obj/structure/prop/turbine_extras/border, -/obj/structure/prop/turbine, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, /turf/open/floor/corsat, -/area/lv522/atmos/east_reactor) +/area/lv522/atmos/cargo_intake) "ipC" = ( /obj/structure/toilet{ pixel_y = 16 @@ -17518,6 +19645,21 @@ icon_state = "white_cyan2" }, /area/lv522/indoors/toilet) +"ipH" = ( +/obj/structure/surface/table/almayer, +/obj/item/stack/sheet/mineral/gold{ + amount = 60; + pixel_y = 6 + }, +/obj/item/stack/sheet/mineral/gold{ + amount = 60; + pixel_y = 12 + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "white_cyan1" + }, +/area/lv522/oob/w_y_vault) "ipN" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 8 @@ -17560,17 +19702,33 @@ /obj/effect/decal/cleanable/generic, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) +"iqz" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "iqQ" = ( /obj/structure/prop/invuln/ice_prefab{ icon_state = "fab_2" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/central_streets) "iqV" = ( /obj/structure/prop/invuln/minecart_tracks, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/c_block/mining) +"iqX" = ( +/obj/structure/machinery/landinglight/ds2{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/lv522/landing_zone_2) "iqZ" = ( /obj/structure/machinery/light, /turf/open/floor/prison{ @@ -17584,9 +19742,6 @@ icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) -"irx" = ( -/turf/closed/wall, -/area/lv522/atmos/cargo_intake) "irH" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/reagent_container/food/drinks/drinkingglass{ @@ -17667,6 +19822,23 @@ icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/storage_blocks) +"isL" = ( +/obj/structure/surface/table/almayer, +/obj/item/spacecash/c1000, +/obj/item/spacecash/c1000, +/obj/item/spacecash/c1000, +/obj/item/spacecash/c1000, +/obj/item/spacecash/c1000, +/obj/item/spacecash/c1000, +/obj/item/spacecash/c1000, +/obj/item/spacecash/c1000, +/obj/item/spacecash/c1000, +/obj/item/spacecash/c1000, +/turf/open/floor/strata{ + dir = 4; + icon_state = "white_cyan1" + }, +/area/lv522/oob/w_y_vault) "iti" = ( /obj/structure/machinery/power/monitor{ name = "Main Power Grid Monitoring" @@ -17684,12 +19856,11 @@ }, /area/lv522/indoors/a_block/corpo/glass) "itp" = ( -/obj/structure/prop/turbine_extras/left, -/obj/structure/prop/invuln/fusion_reactor, +/obj/structure/pipes/standard/manifold/fourway/hidden/green, /turf/open/floor/corsat{ - icon_state = "plate" + icon_state = "squares" }, -/area/lv522/atmos/east_reactor) +/area/lv522/atmos/cargo_intake) "its" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/corsat{ @@ -17757,6 +19928,14 @@ icon_state = "blue" }, /area/lv522/indoors/a_block/hallway) +"iuC" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "brown" + }, +/area/lv522/atmos/reactor_garage) "iuK" = ( /obj/effect/landmark/survivor_spawner, /obj/effect/decal/cleanable/dirt, @@ -17811,7 +19990,7 @@ icon_state = "N"; pixel_y = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) "ivz" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -17851,7 +20030,7 @@ dir = 8; icon_state = "p_stair_full" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_1) "iwF" = ( /obj/structure/machinery/conveyor{ @@ -17874,7 +20053,7 @@ pixel_x = -6; pixel_y = 7 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) "ixf" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -17882,6 +20061,16 @@ icon_state = "marked" }, /area/lv522/atmos/command_centre) +"ixs" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/indoors/a_block/corpo/glass) +"ixD" = ( +/turf/open/floor/corsat, +/area/lv522/atmos/north_command_centre) "ixO" = ( /obj/structure/prop/invuln/minecart_tracks/bumper{ dir = 1 @@ -17890,7 +20079,7 @@ /area/lv522/indoors/c_block/mining) "ixP" = ( /obj/structure/prop/ice_colony/ground_wire, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) "ixQ" = ( /obj/structure/pipes/standard/manifold/hidden/green{ @@ -17946,6 +20135,29 @@ icon_state = "plate" }, /area/lv522/atmos/cargo_intake) +"iyE" = ( +/obj/structure/largecrate/random, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/reactor_garage) +"iyQ" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor/corsat{ + icon_state = "brown" + }, +/area/lv522/atmos/east_reactor/south) +"iyS" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/corsat{ + icon_state = "brown" + }, +/area/lv522/atmos/reactor_garage) "iyT" = ( /obj/structure/platform_decoration, /obj/effect/decal/cleanable/dirt, @@ -18018,6 +20230,9 @@ icon_state = "plate" }, /area/lv522/atmos/cargo_intake) +"iAv" = ( +/turf/closed/wall/strata_outpost/reinforced, +/area/lv522/atmos/reactor_garage) "iAU" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 6 @@ -18055,8 +20270,11 @@ }, /area/lv522/indoors/c_block/mining) "iBl" = ( -/obj/structure/largecrate/supply/supplies/metal, -/turf/open/auto_turf/shale/layer0, +/obj/structure/largecrate/random, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/lv522/landing_zone_2/ceiling) "iBo" = ( /obj/structure/surface/rack, @@ -18105,14 +20323,14 @@ dir = 8; pixel_y = 29 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/central_streets) "iCb" = ( /obj/item/lightstick/red/spoke/planted{ pixel_x = -9; pixel_y = 25 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_street) "iCk" = ( /obj/structure/surface/table/almayer, @@ -18173,19 +20391,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/outdoors/colony_streets/windbreaker/observation) -"iDO" = ( -/obj/item/reagent_container/food/drinks/cans/waterbottle{ - pixel_x = 10; - pixel_y = 5 - }, -/obj/item/reagent_container/food/snacks/wishsoup{ - pixel_x = -4; - pixel_y = -7 - }, -/turf/open/floor/strata{ - icon_state = "blue1" +"iEn" = ( +/turf/open/floor/corsat{ + dir = 1; + icon_state = "brown" }, -/area/lv522/indoors/a_block/dorm_north) +/area/lv522/atmos/reactor_garage) "iEq" = ( /obj/structure/cargo_container/lockmart/mid, /turf/open/floor/prison{ @@ -18193,6 +20404,15 @@ icon_state = "floor_marked" }, /area/lv522/atmos/cargo_intake) +"iFk" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 9 + }, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "brown" + }, +/area/lv522/atmos/east_reactor/south) "iFB" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/prop/almayer/computer/PC, @@ -18225,11 +20445,12 @@ }, /area/lv522/atmos/east_reactor/south) "iGc" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /obj/structure/pipes/standard/simple/hidden/green{ - dir = 5 + dir = 4 }, /turf/open/floor/corsat{ - icon_state = "brown" + icon_state = "squares" }, /area/lv522/atmos/cargo_intake) "iGl" = ( @@ -18344,6 +20565,7 @@ /area/lv522/indoors/c_block/mining) "iHD" = ( /obj/item/prop/alien/hugger, +/obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison, /area/lv522/outdoors/colony_streets/windbreaker/observation) "iIa" = ( @@ -18375,7 +20597,7 @@ dir = 4; icon_state = "p_stair_full" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/indoors/a_block/bridges/dorms_fitness) "iIG" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -18401,7 +20623,7 @@ /obj/structure/stairs/perspective{ icon_state = "p_stair_full" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_2) "iIY" = ( /obj/item/shard{ @@ -18470,6 +20692,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/c_block/mining) +"iKo" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 9 + }, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/colony_streets/north_street) "iKw" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -18484,6 +20712,10 @@ icon_state = "squares" }, /area/lv522/atmos/command_centre) +"iKF" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/colony_streets/north_street) "iKJ" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, @@ -18505,7 +20737,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "S" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_west_street) "iLc" = ( /obj/structure/closet/secure_closet/freezer/fridge/full, @@ -18524,6 +20756,15 @@ icon_state = "white_cyan1" }, /area/lv522/indoors/a_block/corpo) +"iLn" = ( +/obj/structure/pipes/standard/manifold/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + dir = 5; + icon_state = "brown" + }, +/area/lv522/atmos/reactor_garage) "iLq" = ( /obj/structure/surface/table/almayer{ dir = 1; @@ -18567,7 +20808,6 @@ }, /area/lv522/atmos/west_reactor) "iMC" = ( -/obj/structure/largecrate/random, /obj/effect/decal/warning_stripes{ icon_state = "N"; pixel_y = 1 @@ -18590,8 +20830,8 @@ "iMQ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/space_heater/radiator/red, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/turf/open/floor/strata{ + icon_state = "blue1" }, /area/lv522/outdoors/colony_streets/windbreaker/observation) "iMS" = ( @@ -18643,7 +20883,7 @@ /obj/structure/prop/invuln/ice_prefab{ dir = 5 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/nw_rockies) "iOl" = ( /turf/open/floor/corsat{ @@ -18651,10 +20891,35 @@ icon_state = "browncorner" }, /area/lv522/atmos/cargo_intake) +"iOt" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/obj/structure/machinery/light, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor) +"iOw" = ( +/obj/item/storage/toolbox/electrical{ + pixel_y = -6 + }, +/obj/item/storage/toolbox/mechanical/green{ + pixel_x = -11; + pixel_y = 9 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/reactor_garage) "iOx" = ( -/obj/structure/girder, -/turf/open/floor/corsat, -/area/lv522/atmos/north_command_centre) +/obj/effect/landmark/xeno_spawn, +/turf/open/floor/corsat{ + dir = 8; + icon_state = "browncorner" + }, +/area/lv522/atmos/east_reactor) "iOG" = ( /turf/open/floor/corsat{ dir = 5; @@ -18686,7 +20951,7 @@ layer = 4.1; pixel_x = 15 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/nw_rockies) "iPb" = ( /obj/structure/cargo_container/lockmart/right, @@ -18699,7 +20964,7 @@ /obj/structure/pipes/standard/manifold/hidden/green{ dir = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) "iPD" = ( /obj/structure/machinery/door/poddoor/almayer/closed{ @@ -18736,13 +21001,11 @@ }, /area/lv522/indoors/a_block/corpo) "iQb" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 5 - }, -/turf/open/floor/corsat{ - icon_state = "plate" +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/shiva{ + icon_state = "radiator_tile2" }, -/area/lv522/atmos/cargo_intake) +/area/lv522/atmos/way_in_command_centre) "iQe" = ( /turf/open/floor/corsat{ dir = 9; @@ -18853,15 +21116,19 @@ /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/admin) "iTI" = ( -/obj/effect/landmark/lv624/fog_blocker/short, -/obj/effect/landmark/lv624/fog_blocker/short, -/turf/closed/wall/mineral/bone_resin, -/area/lv522/oob) +/obj/structure/platform, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "iTS" = ( /obj/structure/prop/invuln/ice_prefab{ dir = 10 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/nw_rockies) "iTW" = ( /obj/item/stack/tile/plasteel{ @@ -18869,8 +21136,18 @@ pixel_x = -2; pixel_y = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/nw_rockies) +"iTX" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 2 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "iTY" = ( /obj/structure/surface/rack, /obj/item/clothing/suit/storage/hazardvest, @@ -18891,7 +21168,7 @@ pixel_x = 13; pixel_y = -1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) "iUo" = ( /obj/effect/decal/cleanable/dirt, @@ -18984,6 +21261,14 @@ icon_state = "whitegreenfull" }, /area/lv522/oob) +"iWg" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/surface/table/almayer, +/obj/structure/prop/server_equipment/laptop/on, +/turf/open/floor/strata{ + icon_state = "blue1" + }, +/area/lv522/outdoors/colony_streets/windbreaker/observation) "iWh" = ( /obj/structure/machinery/portable_atmospherics/canister/empty/oxygen, /turf/open/asphalt/cement{ @@ -19029,7 +21314,7 @@ /obj/structure/platform_decoration{ dir = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_2) "iWZ" = ( /obj/structure/machinery/conveyor{ @@ -19048,6 +21333,12 @@ }, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) +"iXI" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/auto_turf/shale/layer2, +/area/lv522/outdoors/w_rockies) "iXM" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, @@ -19061,6 +21352,16 @@ /obj/structure/barricade/deployable, /turf/open/floor/prison, /area/lv522/indoors/a_block/admin) +"iYa" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/bed/chair{ + dir = 1 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/lv522/indoors/a_block/fitness) "iYc" = ( /obj/structure/machinery/light, /obj/effect/decal/cleanable/dirt, @@ -19149,17 +21450,9 @@ /turf/open/floor/corsat, /area/lv522/atmos/east_reactor) "iZS" = ( -/obj/structure/safe{ - spawnkey = 0 - }, -/obj/item/stack/sheet/mineral/gold{ - amount = 60 - }, -/turf/open/floor/strata{ - dir = 4; - icon_state = "white_cyan1" - }, -/area/lv522/oob/w_y_vault) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv522/atmos/way_in_command_centre) "jab" = ( /obj/structure/window/framed/strata/reinforced, /turf/open/floor/corsat{ @@ -19174,7 +21467,7 @@ dir = 10; icon_state = "p_stair_full" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) "jas" = ( /turf/closed/wall/strata_outpost, @@ -19254,17 +21547,12 @@ }, /area/lv522/indoors/c_block/cargo) "jbn" = ( -/obj/structure/safe, -/obj/item/spacecash/c1000, -/obj/item/spacecash/c1000, -/obj/item/spacecash/c1000, -/obj/item/spacecash/c1000, -/obj/item/spacecash/c1000, -/turf/open/floor/strata{ - dir = 4; - icon_state = "white_cyan1" +/obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 }, -/area/lv522/oob/w_y_vault) +/turf/open/floor/prison, +/area/lv522/atmos/way_in_command_centre) "jbs" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat{ @@ -19385,6 +21673,14 @@ icon_state = "squares" }, /area/lv522/atmos/cargo_intake) +"jdv" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/outdoor) "jdD" = ( /obj/structure/bed/chair/comfy{ dir = 8 @@ -19399,6 +21695,14 @@ icon_state = "marked" }, /area/lv522/indoors/c_block/t_comm) +"jeb" = ( +/obj/vehicle/powerloader{ + dir = 8 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/reactor_garage) "jef" = ( /turf/open/floor/corsat{ dir = 8; @@ -19447,6 +21751,49 @@ icon_state = "darkredfull2" }, /area/lv522/indoors/a_block/security) +"jfx" = ( +/obj/structure/filingcabinet{ + density = 0; + pixel_x = -8; + pixel_y = 16 + }, +/obj/structure/filingcabinet{ + density = 0; + pixel_x = 8; + pixel_y = 16 + }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 10 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) +"jfG" = ( +/obj/item/reagent_container/food/drinks/cans/waterbottle{ + pixel_x = 10; + pixel_y = 5 + }, +/obj/item/reagent_container/food/snacks/wishsoup{ + pixel_x = -4; + pixel_y = -7 + }, +/turf/open/floor/strata{ + icon_state = "blue1" + }, +/area/lv522/indoors/a_block/dorm_north) +"jfH" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "jfK" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/prop/almayer/computer/PC{ @@ -19479,6 +21826,13 @@ icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) +"jgI" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/emcloset, +/turf/open/floor/strata{ + icon_state = "blue1" + }, +/area/lv522/indoors/a_block/dorm_north) "jgV" = ( /obj/structure/surface/table/almayer, /obj/effect/decal/cleanable/dirt, @@ -19526,8 +21880,15 @@ pixel_x = 1; pixel_y = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) +"jhS" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor/corsat{ + dir = 4; + icon_state = "brown" + }, +/area/lv522/atmos/east_reactor) "jhY" = ( /obj/structure/surface/table/almayer, /obj/item/clothing/glasses/meson, @@ -19629,6 +21990,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "S" }, +/obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/strata{ dir = 4; icon_state = "floor3" @@ -19636,6 +21998,9 @@ /area/lv522/outdoors/nw_rockies) "jiY" = ( /obj/effect/decal/cleanable/blood/oil, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, /turf/open/floor/corsat, /area/lv522/atmos/cargo_intake) "jjc" = ( @@ -19654,6 +22019,23 @@ icon_state = "floor_marked" }, /area/lv522/atmos/cargo_intake) +"jjj" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "Reactor_garage_2" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/reactor_garage) +"jjl" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "brown" + }, +/area/lv522/atmos/east_reactor/south) "jjo" = ( /obj/structure/surface/table/almayer, /obj/item/clothing/suit/storage/hazardvest{ @@ -19664,15 +22046,16 @@ pixel_x = 6; pixel_y = 3 }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, /turf/open/floor/corsat{ icon_state = "squares" }, /area/lv522/atmos/cargo_intake) "jjq" = ( -/obj/structure/machinery/space_heater/radiator/red{ - dir = 4 - }, -/obj/structure/machinery/light{ +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/power/apc/weak{ dir = 1 }, /turf/open/floor/strata{ @@ -19699,22 +22082,9 @@ icon_state = "blue_plate" }, /area/lv522/indoors/a_block/admin) -"jjF" = ( -/obj/item/reagent_container/food/snacks/stewedsoymeat{ - pixel_y = -6 - }, -/obj/item/trash/sosjerky{ - pixel_x = 8; - pixel_y = 12 - }, -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 10 - }, -/turf/open/floor/prison, -/area/lv522/indoors/a_block/dorm_north) "jjG" = ( /obj/structure/prop/ice_colony/ground_wire, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_2) "jjP" = ( /obj/structure/pipes/vents/pump, @@ -19724,6 +22094,9 @@ "jjU" = ( /obj/structure/surface/table/almayer, /obj/structure/prop/server_equipment/laptop/closed, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, /turf/open/floor/corsat{ icon_state = "squares" }, @@ -19735,6 +22108,18 @@ icon_state = "plate" }, /area/lv522/atmos/east_reactor/south) +"jjW" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 4; + id = "Reactor_garage_1" + }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/reactor_garage) "jkp" = ( /obj/structure/fence{ layer = 2.9 @@ -19756,6 +22141,12 @@ /obj/structure/surface/table/almayer, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) +"jkJ" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv522/atmos/way_in_command_centre) "jkL" = ( /obj/structure/machinery/recharge_station, /obj/item/shard{ @@ -19766,6 +22157,16 @@ icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/engineering) +"jkO" = ( +/obj/structure/platform{ + dir = 4 + }, +/obj/structure/platform, +/obj/structure/platform_decoration{ + dir = 6 + }, +/turf/open/asphalt/cement, +/area/lv522/outdoors/n_rockies) "jlc" = ( /obj/structure/surface/rack, /obj/item/tool/minihoe{ @@ -19883,6 +22284,11 @@ icon_state = "floor_plate" }, /area/lv522/atmos/cargo_intake) +"jmX" = ( +/turf/open/floor/corsat{ + icon_state = "brown" + }, +/area/lv522/atmos/reactor_garage) "jnb" = ( /obj/structure/machinery/light{ dir = 4 @@ -19932,6 +22338,14 @@ }, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) +"jnE" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/stack/sheet/metal, +/obj/effect/decal/cleanable/generic, +/turf/open/floor/strata{ + icon_state = "blue1" + }, +/area/lv522/outdoors/colony_streets/windbreaker/observation) "jnF" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -19957,6 +22371,12 @@ }, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/central_streets) +"joJ" = ( +/obj/structure/window/framed/strata/reinforced, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/reactor_garage) "joK" = ( /obj/structure/window/reinforced{ dir = 4 @@ -19984,6 +22404,13 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, +/obj/structure/transmitter/colony_net{ + dir = 4; + phone_category = "LV522 Chances Claim"; + phone_color = "red"; + phone_id = "Colony Garage"; + pixel_x = -16 + }, /turf/open/floor/prison{ icon_state = "darkbrownfull2" }, @@ -20006,6 +22433,13 @@ /obj/effect/spawner/gibspawner/xeno, /turf/open/floor/prison, /area/lv522/indoors/a_block/security/glass) +"jpm" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/obj/structure/machinery/light, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "jpx" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -20042,6 +22476,11 @@ icon_state = "cement9" }, /area/lv522/outdoors/colony_streets/north_west_street) +"jqL" = ( +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/reactor_garage) "jqO" = ( /obj/structure/platform{ dir = 4 @@ -20049,7 +22488,7 @@ /obj/structure/stairs/perspective{ icon_state = "p_stair_full" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_1) "jqV" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ @@ -20064,6 +22503,12 @@ /obj/structure/girder/displaced, /turf/open/asphalt/cement, /area/lv522/outdoors/colony_streets/central_streets) +"jri" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/west) "jrn" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/generic, @@ -20075,7 +22520,7 @@ /obj/structure/platform{ dir = 8 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_2) "jrB" = ( /obj/structure/machinery/vending/snack{ @@ -20117,7 +22562,7 @@ /area/lv522/indoors/c_block/t_comm) "jrL" = ( /obj/item/stack/sheet/metal, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/central_streets) "jrQ" = ( /obj/effect/decal/warning_stripes{ @@ -20154,14 +22599,14 @@ pixel_y = 25 }, /obj/effect/spawner/gibspawner/xeno, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/w_rockies) "jsQ" = ( /obj/item/prop/alien/hugger, /turf/open/floor/prison, /area/lv522/atmos/cargo_intake) "jtf" = ( -/obj/structure/cargo_container/horizontal/blue/top, +/obj/structure/pipes/standard/manifold/hidden/green, /turf/open/floor/corsat{ icon_state = "squares" }, @@ -20213,6 +22658,14 @@ icon_state = "bcircuit" }, /area/lv522/indoors/a_block/admin) +"jue" = ( +/obj/structure/prop/ice_colony/ground_wire, +/obj/item/lightstick/red/spoke/planted{ + pixel_x = -10; + pixel_y = 5 + }, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/colony_streets/central_streets) "jur" = ( /obj/item/tool/warning_cone{ pixel_x = -10; @@ -20235,7 +22688,8 @@ "juw" = ( /obj/item/prop/colony/used_flare, /turf/open/floor/corsat{ - icon_state = "squares" + dir = 1; + icon_state = "brown" }, /area/lv522/atmos/east_reactor/south) "juQ" = ( @@ -20254,7 +22708,7 @@ icon_state = "N"; pixel_y = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_west_street) "jvf" = ( /obj/structure/cargo_container/arious/leftmid, @@ -20303,6 +22757,15 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) +"jwx" = ( +/obj/structure/reagent_dispensers/fueltank/gas, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/reactor_garage) "jwM" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, @@ -20317,6 +22780,19 @@ icon_state = "squares" }, /area/lv522/atmos/cargo_intake) +"jwV" = ( +/obj/structure/filingcabinet{ + density = 0; + pixel_x = -8; + pixel_y = 16 + }, +/obj/structure/filingcabinet{ + density = 0; + pixel_x = 8; + pixel_y = 16 + }, +/turf/open/floor/wood/ship, +/area/lv522/atmos/way_in_command_centre) "jxu" = ( /obj/item/reagent_container/glass/bucket/janibucket{ pixel_x = 6; @@ -20350,7 +22826,7 @@ /obj/structure/platform_decoration{ dir = 10 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_2) "jxF" = ( /obj/structure/largecrate/guns/russian, @@ -20421,6 +22897,22 @@ icon_state = "cement12" }, /area/lv522/outdoors/colony_streets/central_streets) +"jzB" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/vents/pump, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/obj/structure/machinery/light, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "jzC" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/surface/table/woodentable/fancy, @@ -20458,6 +22950,13 @@ /obj/item/reagent_container/food/drinks/cans/waterbottle, /turf/open/floor/prison, /area/lv522/indoors/a_block/admin) +"jzZ" = ( +/obj/structure/machinery/landinglight/ds2/delaytwo{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/lv522/landing_zone_2) "jAd" = ( /obj/structure/prop/vehicles/crawler{ icon_state = "crawler_covered_bed" @@ -20482,10 +22981,12 @@ /turf/open/floor/prison, /area/lv522/indoors/c_block/cargo) "jAV" = ( -/mob/living/simple_animal/cat/kitten{ - dir = 8 +/obj/item/prop/alien/hugger{ + pixel_x = -12; + pixel_y = 12 }, -/turf/open/floor/prison, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/dorm_north) "jBm" = ( /obj/structure/machinery/vending/hydronutrients, @@ -20495,11 +22996,19 @@ }, /area/lv522/indoors/b_block/bridge) "jBr" = ( -/turf/open/floor/strata{ - dir = 4; - icon_state = "white_cyan1" +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 }, -/area/lv522/oob/w_y_vault) +/obj/item/stack/folding_barricade, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1; + pixel_y = -1 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "jBs" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -20554,6 +23063,12 @@ }, /turf/open/asphalt/cement, /area/lv522/outdoors/colony_streets/north_street) +"jBY" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/prison{ + icon_state = "cell_stripe" + }, +/area/lv522/atmos/way_in_command_centre) "jCb" = ( /obj/structure/prop/invuln/ice_prefab{ dir = 10; @@ -20570,7 +23085,7 @@ pixel_x = 14; pixel_y = -4 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/nw_rockies) "jCh" = ( /obj/structure/machinery/door/airlock/almayer/maint, @@ -20631,6 +23146,18 @@ icon_state = "blue_plate" }, /area/lv522/indoors/a_block/hallway) +"jDc" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 6 + }, +/turf/open/asphalt/cement{ + icon_state = "cement4" + }, +/area/lv522/outdoors/colony_streets/north_west_street) "jDy" = ( /obj/structure/stairs/perspective{ dir = 4; @@ -20655,6 +23182,16 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms) +"jDN" = ( +/obj/structure/filtration/machine_96x96/distribution{ + density = 0; + pixel_y = 16 + }, +/obj/structure/platform_decoration{ + dir = 4 + }, +/turf/open/gm/river, +/area/lv522/atmos/sewer) "jDO" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -20662,15 +23199,24 @@ /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/north_street) "jEa" = ( -/turf/open/floor{ - dir = 4; - icon_state = "whiteyellowfull" +/obj/structure/pipes/standard/manifold/hidden/green{ + dir = 4 }, -/area/lv522/oob/w_y_vault) +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + pixel_y = -1 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "jEk" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, /obj/effect/landmark/xeno_spawn, +/obj/structure/machinery/light{ + dir = 4 + }, /turf/open/floor/corsat{ icon_state = "plate" }, @@ -20688,11 +23234,16 @@ }, /turf/closed/wall/r_wall/biodome/biodome_unmeltable, /area/lv522/oob) -"jEQ" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/engidoor, -/obj/structure/pipes/standard/simple/hidden/green, +"jEF" = ( +/obj/structure/transmitter/colony_net{ + phone_category = "LV522 Chances Claim"; + phone_color = "red"; + phone_id = "Reactor Meeting Room"; + pixel_y = 26 + }, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/corsat{ - icon_state = "marked" + icon_state = "plate" }, /area/lv522/atmos/east_reactor/south) "jEW" = ( @@ -20702,6 +23253,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) +"jEX" = ( +/obj/structure/platform_decoration{ + dir = 8 + }, +/turf/open/asphalt/cement, +/area/lv522/outdoors/n_rockies) "jFa" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/prop/almayer/computer/PC{ @@ -20730,11 +23287,6 @@ /obj/structure/cargo_container/arious/rightmid, /turf/open/floor/prison, /area/lv522/atmos/cargo_intake) -"jFt" = ( -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/atmos/east_reactor/south) "jFu" = ( /obj/structure/morgue{ dir = 8 @@ -20753,7 +23305,7 @@ /area/lv522/indoors/a_block/dorms) "jFG" = ( /obj/structure/cargo_container/arious/right, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/n_rockies) "jGa" = ( /obj/item/storage/backpack/marine/satchel{ @@ -20764,7 +23316,7 @@ pixel_x = -4; pixel_y = 6 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) "jGe" = ( /obj/structure/prop/invuln/overhead_pipe{ @@ -20805,12 +23357,18 @@ /obj/structure/platform_decoration{ dir = 9 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_2) "jGK" = ( /obj/structure/largecrate/random/secure, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/central_streets) +"jHa" = ( +/obj/structure/cargo_container/wy/right{ + layer = 5 + }, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/w_rockies) "jHb" = ( /turf/open/gm/river, /area/lv522/oob) @@ -20871,6 +23429,7 @@ }, /area/lv522/indoors/c_block/cargo) "jII" = ( +/obj/structure/largecrate/random, /turf/open/floor/prison{ dir = 10; icon_state = "floor_marked" @@ -20936,6 +23495,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/lv522/landing_zone_1/tunnel) +"jJI" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + dir = 1 + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/outdoors/colony_streets/windbreaker/observation) "jJO" = ( /obj/structure/surface/table/almayer, /turf/open/floor/corsat{ @@ -20985,6 +23553,9 @@ }, /area/lv522/atmos/north_command_centre) "jKB" = ( +/obj/structure/platform_decoration{ + dir = 4 + }, /turf/open/asphalt/cement{ icon_state = "cement15" }, @@ -21074,6 +23645,18 @@ }, /turf/open/floor/plating, /area/lv522/oob) +"jMK" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + dir = 8; + icon_state = "brown" + }, +/area/lv522/atmos/reactor_garage) +"jMN" = ( +/turf/open/floor/corsat, +/area/lv522/oob) "jMZ" = ( /obj/structure/surface/table/almayer, /obj/item/tool/pen/blue/clicky{ @@ -21102,6 +23685,17 @@ icon_state = "white_cyan1" }, /area/lv522/indoors/a_block/corpo/glass) +"jNQ" = ( +/obj/structure/machinery/space_heater/radiator/red{ + dir = 4 + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/strata{ + icon_state = "blue1" + }, +/area/lv522/indoors/a_block/dorm_north) "jNV" = ( /obj/structure/surface/table/almayer, /obj/structure/flora/pottedplant{ @@ -21168,7 +23762,7 @@ pixel_x = 3; pixel_y = -2 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) "jOF" = ( /obj/effect/acid_hole, @@ -21201,7 +23795,7 @@ icon_state = "p_stair_full" }, /obj/effect/landmark/lv624/fog_blocker/short, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_1) "jPj" = ( /obj/structure/machinery/light{ @@ -21227,12 +23821,6 @@ icon_state = "white_cyan1" }, /area/lv522/indoors/a_block/corpo) -"jPr" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 5 - }, -/turf/open/auto_turf/shale/layer0, -/area/lv522/outdoors/colony_streets/central_streets) "jPv" = ( /turf/open/asphalt/cement{ icon_state = "cement14" @@ -21241,10 +23829,20 @@ "jPw" = ( /turf/open/floor/plating, /area/lv522/oob) -"jPI" = ( -/obj/structure/reagent_dispensers/watertank, -/turf/open/floor/plating/plating_catwalk/prison, -/area/lv522/outdoors/nw_rockies) +"jPz" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/east_reactor) +"jPC" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison, +/area/lv522/atmos/outdoor) "jQa" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/prop/dam/crane{ @@ -21275,16 +23873,20 @@ /turf/open/floor/wood, /area/lv522/indoors/a_block/executive) "jRY" = ( -/obj/structure/blocker/invisible_wall, -/turf/open/auto_turf/shale/layer0, -/area/lv522/outdoors/nw_rockies) -"jRZ" = ( -/obj/structure/largecrate/random, +/obj/structure/bed/chair/comfy{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, /turf/open/floor/corsat{ - dir = 5; - icon_state = "brown" + icon_state = "squares" }, /area/lv522/atmos/cargo_intake) +"jRZ" = ( +/obj/structure/largecrate/random, +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv522/atmos/cargo_intake) "jSk" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/camera/autoname{ @@ -21308,10 +23910,18 @@ /area/lv522/indoors/a_block/dorms) "jSR" = ( /obj/structure/machinery/conveyor, +/obj/structure/machinery/light{ + dir = 8 + }, /turf/open/floor/corsat{ icon_state = "plate" }, /area/lv522/atmos/cargo_intake) +"jSU" = ( +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/indoors/a_block/corpo/glass) "jSW" = ( /obj/structure/prop/ice_colony/dense/planter_box{ dir = 9 @@ -21326,7 +23936,12 @@ }, /area/lv522/indoors/b_block/bridge) "jTb" = ( -/obj/structure/cargo_container/horizontal/blue/middle, +/obj/structure/bed/chair/comfy{ + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, /turf/open/floor/corsat{ icon_state = "squares" }, @@ -21362,15 +23977,13 @@ /turf/open/floor/plating, /area/lv522/atmos/cargo_intake) "jTB" = ( -/obj/structure/prop/invuln{ - desc = "big pile energy."; - icon = 'icons/obj/structures/props/ice_colony/barrel_yard.dmi'; - icon_state = "pile_0"; - name = "barrel pile" +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 10 }, -/obj/structure/blocker/invisible_wall, -/turf/open/auto_turf/shale/layer1, -/area/lv522/outdoors/nw_rockies) +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/lv522/atmos/cargo_intake) "jTH" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -21380,7 +23993,7 @@ icon_state = "N"; pixel_y = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_west_street) "jTJ" = ( /obj/structure/cargo_container/watatsumi/leftmid, @@ -21466,15 +24079,17 @@ }, /area/lv522/indoors/lone_buildings/chunk) "jUY" = ( -/obj/structure/machinery/door/poddoor/almayer/closed{ - dir = 8; - id = "Containers_west_LV522"; - name = "Emergency Lockdown" +/obj/structure/machinery/door_control/brbutton{ + id = "Reactor_garage_2" }, +/turf/closed/wall/strata_outpost/reinforced, +/area/lv522/atmos/reactor_garage) +"jVa" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/floor/corsat{ - icon_state = "marked" + icon_state = "plate" }, -/area/lv522/atmos/cargo_intake) +/area/lv522/atmos/east_reactor) "jVq" = ( /obj/structure/machinery/landinglight/ds2/delaytwo{ dir = 4 @@ -21520,7 +24135,7 @@ /area/lv522/indoors/a_block/dorms) "jVS" = ( /obj/structure/cargo_container/kelland/right, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) "jWr" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, @@ -21536,14 +24151,6 @@ icon_state = "brown" }, /area/lv522/atmos/east_reactor/south) -"jWJ" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, -/obj/effect/landmark/xeno_spawn, -/turf/open/floor/corsat{ - dir = 4; - icon_state = "browncorner" - }, -/area/lv522/atmos/east_reactor/south) "jWV" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/strata{ @@ -21560,6 +24167,15 @@ icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) +"jWZ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/platform_decoration{ + dir = 1 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "jXc" = ( /obj/structure/bed/chair{ dir = 1 @@ -21569,6 +24185,16 @@ icon_state = "greenfull" }, /area/lv522/indoors/a_block/fitness) +"jXp" = ( +/obj/structure/prop/invuln/rope{ + pixel_x = -5; + pixel_y = 26 + }, +/obj/item/weapon/ice_axe/red{ + pixel_y = 3 + }, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/nw_rockies) "jXQ" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 10 @@ -21580,13 +24206,10 @@ /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/nw_rockies) "jYj" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, -/obj/effect/landmark/xeno_spawn, -/turf/open/floor/corsat{ - dir = 1; - icon_state = "brown" - }, -/area/lv522/atmos/east_reactor/south) +/obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat, +/area/lv522/atmos/east_reactor) "jYp" = ( /obj/structure/prop/maintenance_hatch{ pixel_y = 6 @@ -21605,14 +24228,6 @@ /obj/structure/prop/invuln/ice_prefab, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/nw_rockies) -"jYv" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, -/obj/effect/landmark/xeno_spawn, -/turf/open/floor/corsat{ - dir = 5; - icon_state = "brown" - }, -/area/lv522/atmos/east_reactor/south) "jYy" = ( /obj/structure/machinery/power/smes/buildable{ capacity = 1e+006; @@ -21640,7 +24255,7 @@ icon_state = "p_stair_full" }, /obj/effect/landmark/lv624/fog_blocker/short, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_1) "jYZ" = ( /obj/structure/filingcabinet, @@ -21682,6 +24297,12 @@ icon_state = "cement3" }, /area/lv522/landing_zone_1) +"jZE" = ( +/obj/structure/platform_decoration{ + dir = 1 + }, +/turf/open/gm/river, +/area/lv522/atmos/sewer) "jZI" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/space_heater/radiator/red{ @@ -21709,6 +24330,13 @@ icon_state = "white_cyan3" }, /area/lv522/indoors/a_block/medical/glass) +"kaQ" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "brown" + }, +/area/lv522/atmos/east_reactor/south) "kaV" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 @@ -21730,6 +24358,13 @@ }, /turf/open/gm/river, /area/lv522/oob) +"kbb" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 5 + }, +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv522/atmos/sewer) "kbg" = ( /obj/structure/surface/table/almayer, /obj/item/clothing/suit/storage/hazardvest, @@ -21764,6 +24399,13 @@ icon_state = "platebot" }, /area/lv522/indoors/c_block/cargo) +"kbH" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 6 + }, +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv522/outdoors/colony_streets/windbreaker/observation) "kbJ" = ( /obj/vehicle/train/cargo/trolley, /turf/open/floor/corsat{ @@ -21800,6 +24442,9 @@ icon_state = "squares" }, /area/lv522/atmos/east_reactor/east) +"kcb" = ( +/turf/closed/wall/mineral/bone_resin, +/area/lv522/atmos/west_reactor) "kcd" = ( /obj/structure/pipes/standard/manifold/hidden/green, /turf/open/floor/plating/plating_catwalk/prison, @@ -21853,13 +24498,17 @@ pixel_x = 6; pixel_y = 7 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) +"kcL" = ( +/obj/item/prop/colony/used_flare, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/n_rockies) "kcN" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/east_central_street) "kcR" = ( /obj/structure/machinery/landinglight/ds2{ @@ -21872,6 +24521,23 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) +"kda" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor/corsat{ + dir = 6; + icon_state = "brown" + }, +/area/lv522/atmos/east_reactor/south) +"kdf" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform/stair_cut{ + icon_state = "platform_stair_alt" + }, +/turf/open/asphalt/cement, +/area/lv522/outdoors/n_rockies) "kdi" = ( /obj/structure/platform{ dir = 8 @@ -21886,13 +24552,13 @@ /area/lv522/indoors/c_block/mining) "kdm" = ( /obj/structure/cargo_container/wy/right, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) "kdo" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 9 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_street) "kdr" = ( /obj/structure/filingcabinet{ @@ -21931,7 +24597,7 @@ "keb" = ( /obj/effect/decal/cleanable/blood/oil/streak, /obj/effect/spawner/gibspawner/xeno, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/w_rockies) "kel" = ( /obj/structure/barricade/handrail{ @@ -21950,7 +24616,7 @@ dir = 6; icon_state = "p_stair_full" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) "kfa" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ @@ -21981,7 +24647,7 @@ pixel_x = -9; pixel_y = 25 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) "kfs" = ( /obj/structure/stairs/perspective{ @@ -21993,17 +24659,23 @@ }, /area/lv522/indoors/c_block/casino) "kfu" = ( -/obj/structure/prop/invuln/overhead_pipe{ - dir = 4; - name = "overhead pipe"; - pixel_x = -24; - pixel_y = -6 +/obj/structure/machinery/conveyor{ + dir = 8; + id = "cargo_container" + }, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "brown" }, -/turf/closed/wall, /area/lv522/atmos/cargo_intake) "kfv" = ( -/turf/closed/wall/shiva/prefabricated, -/area/lv522/outdoors/colony_streets/south_east_street) +/obj/structure/largecrate/random/secure, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, +/area/lv522/landing_zone_2/ceiling) "kfw" = ( /obj/structure/prop/ice_colony/dense/planter_box{ dir = 5 @@ -22015,6 +24687,14 @@ icon_state = "darkredfull2" }, /area/lv522/indoors/a_block/kitchen) +"kfA" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat{ + dir = 8; + icon_state = "brown" + }, +/area/lv522/atmos/cargo_intake) "kfD" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/shiva{ @@ -22022,39 +24702,11 @@ }, /area/lv522/indoors/a_block/kitchen) "kfF" = ( -/obj/structure/desertdam/decals/road_edge{ - icon_state = "road_edge_decal8"; - pixel_x = -16; - pixel_y = -16 - }, -/obj/structure/desertdam/decals/road_edge{ - icon_state = "road_edge_decal7"; - pixel_x = 16; - pixel_y = -16 - }, -/obj/structure/desertdam/decals/road_edge{ - icon_state = "road_edge_decal6"; - pixel_x = 16; - pixel_y = 16 - }, -/obj/structure/desertdam/decals/road_edge{ - icon_state = "road_edge_decal5"; - pixel_x = -16; - pixel_y = 16 - }, -/obj/structure/holohoop{ - density = 0; - pixel_y = 27 - }, -/obj/item/toy/beach_ball/holoball{ - pixel_x = 8; - pixel_y = 5 - }, -/turf/open/floor/prison{ - dir = 4; - icon_state = "greenfull" +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor/corsat{ + icon_state = "squares" }, -/area/lv522/indoors/a_block/fitness) +/area/lv522/atmos/cargo_intake) "kfG" = ( /obj/structure/prop/dam/crane/cargo{ dir = 1; @@ -22067,15 +24719,35 @@ /turf/open/auto_turf/shale/layer1, /area/lv522/landing_zone_2) "kgb" = ( -/obj/structure/prop/invuln{ - desc = "big pile energy."; - icon = 'icons/obj/structures/props/ice_colony/barrel_yard.dmi'; - icon_state = "pile_0"; - name = "barrel pile" +/obj/item/weapon/twohanded/folded_metal_chair, +/turf/open/floor/corsat{ + icon_state = "squares" }, -/obj/structure/blocker/invisible_wall, -/turf/open/auto_turf/shale/layer1, -/area/lv522/outdoors/w_rockies) +/area/lv522/atmos/cargo_intake) +"kgm" = ( +/obj/structure/surface/table/almayer, +/obj/structure/prop/server_equipment/laptop/on, +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) +"kgC" = ( +/obj/structure/machinery/conveyor{ + dir = 5; + id = "cargo_container" + }, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/cargo_intake) "kgQ" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, @@ -22083,6 +24755,15 @@ icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_street) +"kgR" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "khd" = ( /turf/closed/wall/strata_outpost/reinforced/hull, /area/lv522/indoors/c_block/cargo) @@ -22093,6 +24774,15 @@ icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/outdoor_bot) +"khm" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "kho" = ( /obj/structure/dispenser, /turf/open/floor/prison{ @@ -22113,11 +24803,6 @@ /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison, /area/lv522/indoors/a_block/admin) -"khB" = ( -/obj/structure/girder/reinforced, -/obj/structure/blocker/forcefield/vehicles, -/turf/closed/wall/mineral/bone_resin, -/area/lv522/oob) "khG" = ( /obj/structure/largecrate/random/barrel/yellow, /turf/open/auto_turf/shale/layer1, @@ -22134,9 +24819,15 @@ /turf/open/floor/prison, /area/lv522/indoors/c_block/cargo) "kib" = ( -/obj/structure/blocker/invisible_wall, -/turf/open/auto_turf/shale/layer1, -/area/lv522/outdoors/w_rockies) +/obj/item/clothing/head/hardhat/white, +/obj/item/prop/alien/hugger{ + pixel_x = 11; + pixel_y = -9 + }, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/lv522/atmos/cargo_intake) "kie" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -22214,6 +24905,10 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) +"kiT" = ( +/obj/item/stack/medical/bruise_pack, +/turf/closed/wall/strata_ice/dirty, +/area/lv522/oob) "kiY" = ( /obj/structure/ore_box{ pixel_x = -4 @@ -22244,7 +24939,7 @@ dir = 4; indestructible = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/oob) "kjs" = ( /obj/item/stack/sheet/metal, @@ -22260,7 +24955,7 @@ }, /area/lv522/indoors/a_block/kitchen/glass) "kjU" = ( -/obj/structure/cargo_container/horizontal/blue/bottom, +/obj/item/reagent_container/food/snacks/donut, /turf/open/floor/corsat{ icon_state = "squares" }, @@ -22271,6 +24966,13 @@ icon_state = "squares" }, /area/lv522/atmos/west_reactor) +"kkq" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/obj/structure/machinery/light, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor) "kkr" = ( /obj/structure/prop/ice_colony/ground_wire{ dir = 8 @@ -22305,6 +25007,12 @@ icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) +"kkR" = ( +/obj/structure/bed/chair/comfy, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "kkS" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/prop/cash_register/off/open{ @@ -22346,6 +25054,7 @@ /obj/structure/prop/ice_colony/ground_wire{ dir = 4 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/corsat{ icon_state = "squares" }, @@ -22365,10 +25074,6 @@ /obj/item/trash/ceramic_plate{ pixel_y = 21 }, -/obj/item/storage/box/donkpockets{ - pixel_x = 13; - pixel_y = -11 - }, /turf/open/floor/corsat{ icon_state = "squares" }, @@ -22574,17 +25279,6 @@ }, /turf/open/floor/prison, /area/lv522/indoors/a_block/admin) -"kpm" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, -/obj/structure/prop/invuln/overhead_pipe{ - name = "overhead pipe"; - pixel_x = -20; - pixel_y = 13 - }, -/turf/open/floor/corsat{ - icon_state = "squares" - }, -/area/lv522/atmos/east_reactor/south) "kpo" = ( /turf/open/floor/corsat{ dir = 4; @@ -22611,6 +25305,17 @@ /turf/open/floor/prison, /area/lv522/indoors/c_block/mining) "kpE" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, +/obj/effect/landmark/xeno_spawn, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) +"kpG" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/corsat{ dir = 1; icon_state = "browncorner" @@ -22641,16 +25346,12 @@ icon_state = "cement2" }, /area/lv522/outdoors/colony_streets/north_east_street) -"kqr" = ( -/obj/structure/blocker/forcefield/vehicles, -/turf/open/floor/corsat, -/area/lv522/atmos/cargo_intake) "kqJ" = ( /obj/structure/barricade/wooden{ dir = 4 }, /obj/item/stack/sheet/metal, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/central_streets) "kqT" = ( /obj/item/ammo_magazine/rifle/heap{ @@ -22659,11 +25360,20 @@ /turf/open/floor/prison, /area/lv522/outdoors/colony_streets/north_east_street) "kqX" = ( -/obj/structure/cargo_container/kelland/left, +/obj/item/clipboard, /turf/open/floor/corsat{ icon_state = "squares" }, /area/lv522/atmos/cargo_intake) +"kri" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "cell_stripe" + }, +/area/lv522/atmos/reactor_garage) "krj" = ( /obj/structure/prop/ice_colony/ground_wire{ dir = 1 @@ -22683,6 +25393,7 @@ /area/lv522/indoors/c_block/cargo) "krw" = ( /obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/landmark/monkey_spawn, /turf/open/floor/corsat, /area/lv522/atmos/cargo_intake) "kry" = ( @@ -22719,8 +25430,8 @@ pixel_y = 8 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/turf/open/floor/strata{ + icon_state = "blue1" }, /area/lv522/outdoors/colony_streets/windbreaker/observation) "ksf" = ( @@ -22731,8 +25442,8 @@ /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/nw_rockies) "ksk" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 6 +/obj/structure/pipes/standard/manifold/hidden/green{ + dir = 8 }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/outdoors/colony_streets/windbreaker/observation) @@ -22742,14 +25453,12 @@ icon_state = "brown" }, /area/lv522/atmos/north_command_centre) -"ksv" = ( -/obj/structure/prop/invuln/overhead_pipe{ - name = "overhead pipe"; - pixel_x = -20; - pixel_y = 13 - }, +"kss" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light, /turf/open/floor/corsat{ - icon_state = "squares" + icon_state = "plate" }, /area/lv522/atmos/east_reactor/south) "ksA" = ( @@ -22823,6 +25532,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/c_block/casino) +"kuN" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "kvc" = ( /obj/structure/cargo_container/horizontal/blue/middle, /turf/open/floor/prison, @@ -22858,8 +25576,8 @@ "kvM" = ( /obj/structure/pipes/vents/pump, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/turf/open/floor/strata{ + icon_state = "blue1" }, /area/lv522/outdoors/colony_streets/windbreaker/observation) "kwc" = ( @@ -22871,6 +25589,9 @@ icon_state = "cement1" }, /area/lv522/outdoors/colony_streets/north_street) +"kwg" = ( +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv522/atmos/way_in_command_centre) "kwj" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, @@ -22912,11 +25633,6 @@ icon_state = "darkredfull2" }, /area/lv522/indoors/a_block/security/glass) -"kxh" = ( -/obj/structure/girder/displaced, -/obj/structure/blocker/forcefield/vehicles, -/turf/open/floor/corsat, -/area/lv522/atmos/cargo_intake) "kxm" = ( /obj/effect/landmark/monkey_spawn, /turf/open/floor/corsat{ @@ -22961,12 +25677,14 @@ /turf/open/floor/prison, /area/lv522/indoors/c_block/cargo) "kyz" = ( -/obj/item/lightstick/red/spoke/planted{ - pixel_x = -10; - pixel_y = 25 +/obj/item/storage/box/donkpockets{ + pixel_x = -14; + pixel_y = -2 }, -/turf/open/auto_turf/shale/layer2, -/area/lv522/outdoors/colony_streets/central_streets) +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/lv522/atmos/cargo_intake) "kyB" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 10 @@ -22998,20 +25716,25 @@ dir = 1 }, /turf/open/floor/corsat{ + dir = 10; icon_state = "brown" }, /area/lv522/atmos/cargo_intake) +"kzc" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/lv522/atmos/cargo_intake) "kzd" = ( -/obj/structure/machinery/door_control{ - id = "Corpo Vault"; - name = "Cargo Shutter Control"; - pixel_y = 29 +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + pixel_y = -1 }, -/turf/open/floor{ - dir = 4; - icon_state = "whiteyellowfull" +/turf/open/floor/prison{ + icon_state = "floor_plate" }, -/area/lv522/oob/w_y_vault) +/area/lv522/atmos/way_in_command_centre) "kze" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/prison{ @@ -23042,8 +25765,14 @@ pixel_x = 8; pixel_y = -5 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/east_central_street) +"kzG" = ( +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/reactor_garage) "kzR" = ( /obj/structure/machinery/door/airlock/almayer/generic{ name = "Bathroom" @@ -23086,7 +25815,7 @@ dir = 4 }, /turf/open/floor/corsat{ - icon_state = "squares" + icon_state = "brown" }, /area/lv522/atmos/cargo_intake) "kBj" = ( @@ -23100,26 +25829,18 @@ /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/security) "kBm" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/machinery/space_heater, -/obj/item/reagent_container/food/drinks/coffee{ - pixel_x = 5; - pixel_y = 9 +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 10 }, /turf/open/floor/corsat{ - icon_state = "squares" + dir = 10; + icon_state = "brown" }, -/area/lv522/atmos/cargo_intake) +/area/lv522/atmos/east_reactor/south) "kBq" = ( -/obj/structure/prop/ice_colony/ground_wire{ - dir = 1 - }, -/obj/item/lightstick/red/spoke/planted{ - pixel_x = -10; - pixel_y = 29 - }, -/turf/open/auto_turf/shale/layer1, -/area/lv522/outdoors/colony_streets/central_streets) +/obj/structure/girder, +/turf/open/floor/plating, +/area/lv522/atmos/cargo_intake) "kBv" = ( /obj/structure/prop/invuln/ice_prefab{ dir = 10 @@ -23294,6 +26015,10 @@ icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) +"kEj" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv522/atmos/reactor_garage) "kEl" = ( /obj/structure/platform_decoration{ dir = 4 @@ -23386,10 +26111,9 @@ /turf/open/floor/plating, /area/lv522/indoors/c_block/mining) "kFo" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, -/turf/open/floor/corsat, -/area/lv522/atmos/east_reactor/south) +/obj/item/clothing/suit/storage/marine/M3G, +/turf/closed/wall/mineral/bone_resin, +/area/lv522/oob) "kFx" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/strata{ @@ -23409,6 +26133,13 @@ icon_state = "cement9" }, /area/lv522/outdoors/colony_streets/north_street) +"kFP" = ( +/obj/structure/platform/strata{ + dir = 8 + }, +/obj/structure/platform/strata, +/turf/closed/wall/strata_ice/dirty, +/area/lv522/oob) "kGa" = ( /obj/structure/largecrate/random{ pixel_x = -5 @@ -23434,15 +26165,17 @@ /area/lv522/indoors/b_block/hydro) "kGX" = ( /obj/structure/tunnel, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_street) "kHd" = ( -/obj/effect/landmark/corpsespawner/wy/manager, -/turf/open/floor{ - dir = 4; - icon_state = "whiteyellowfull" +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 5 }, -/area/lv522/oob/w_y_vault) +/turf/open/floor/almayer{ + dir = 1; + icon_state = "w-y0" + }, +/area/lv522/atmos/way_in_command_centre) "kHy" = ( /obj/structure/surface/table/almayer, /obj/item/storage/box/flashbangs{ @@ -23535,21 +26268,8 @@ /obj/effect/decal/warning_stripes{ icon_state = "SW-out" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) -"kIY" = ( -/obj/structure/platform, -/obj/structure/safe, -/obj/item/spacecash/c1000, -/obj/item/spacecash/c1000, -/obj/item/spacecash/c1000, -/obj/item/spacecash/c1000, -/obj/item/spacecash/c1000, -/turf/open/floor/strata{ - dir = 4; - icon_state = "white_cyan1" - }, -/area/lv522/oob/w_y_vault) "kIZ" = ( /obj/structure/machinery/door/poddoor/shutters/almayer/open{ dir = 4; @@ -23574,6 +26294,17 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) +"kJc" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/prop/almayer/computer/PC{ + dir = 1; + pixel_y = 3 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "kJh" = ( /obj/item/stack/rods, /obj/structure/platform, @@ -23648,15 +26379,6 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) -"kLk" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/floor/strata{ - dir = 4; - icon_state = "white_cyan1" - }, -/area/lv522/oob/w_y_vault) "kLs" = ( /obj/item/clothing/mask/facehugger{ desc = "It has some sort of a tube at the end of its tail. What the hell is this thing?"; @@ -23697,7 +26419,7 @@ /obj/structure/machinery/power/apc/weak{ dir = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/indoors/a_block/bridges/dorms_fitness) "kMr" = ( /obj/structure/coatrack{ @@ -23735,10 +26457,12 @@ /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/admin) "kNj" = ( -/obj/structure/prop/invuln/ice_prefab/trim{ - dir = 8 +/obj/structure/prop/vehicles/crawler{ + dir = 8; + icon_state = "crawler_crate_alt2"; + layer = 3.1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/w_rockies) "kNw" = ( /obj/item/prop/alien/hugger, @@ -23761,7 +26485,7 @@ /obj/structure/machinery/door/airlock/almayer/generic{ dir = 1; name = "\improper Dormitories"; - welded = 1 + welded = null }, /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat{ @@ -23794,8 +26518,8 @@ "kOz" = ( /obj/structure/machinery/vending/cigarette/colony, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/turf/open/floor/strata{ + icon_state = "blue1" }, /area/lv522/outdoors/colony_streets/windbreaker/observation) "kOE" = ( @@ -23804,6 +26528,15 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/atmos/cargo_intake) +"kOF" = ( +/obj/effect/spawner/gibspawner/xeno, +/obj/effect/decal/cleanable/blood/xeno{ + icon_state = "xgib3" + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "kOJ" = ( /obj/structure/machinery/conveyor{ dir = 8; @@ -23889,20 +26622,14 @@ /area/lv522/indoors/a_block/dorms) "kQc" = ( /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/turf/open/floor/strata{ + icon_state = "blue1" }, /area/lv522/outdoors/colony_streets/windbreaker/observation) "kQw" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 +/turf/open/floor/corsat{ + icon_state = "browncorner" }, -/turf/open/floor/corsat, /area/lv522/atmos/cargo_intake) "kQJ" = ( /obj/item/explosive/mine/active{ @@ -23932,7 +26659,7 @@ pixel_y = 1 }, /obj/effect/spawner/gibspawner/xeno, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/nw_rockies) "kQW" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -23958,7 +26685,8 @@ /obj/structure/prop/invuln/ice_prefab/trim{ dir = 6 }, -/turf/open/auto_turf/shale/layer0, +/obj/structure/cargo_container/grant/rightmid, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/w_rockies) "kRg" = ( /obj/structure/pipes/standard/manifold/hidden/green{ @@ -24056,7 +26784,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "W" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) "kSs" = ( /obj/structure/filingcabinet/chestdrawer{ @@ -24080,9 +26808,10 @@ /area/lv522/atmos/cargo_intake) "kSR" = ( /obj/structure/prop/invuln/ice_prefab/trim{ - dir = 4 + dir = 6 }, -/turf/open/auto_turf/shale/layer0, +/obj/structure/cargo_container/grant/right, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/w_rockies) "kSS" = ( /obj/structure/cargo_container/horizontal/blue/middle, @@ -24111,6 +26840,7 @@ dir = 4 }, /obj/effect/decal/cleanable/blood/oil, +/obj/structure/machinery/light, /turf/open/floor/corsat{ icon_state = "plate" }, @@ -24127,8 +26857,13 @@ }, /area/lv522/indoors/a_block/security/glass) "kTn" = ( -/obj/structure/cargo_container/kelland/left, -/turf/open/auto_turf/shale/layer0, +/obj/structure/prop/invuln/ice_prefab/trim{ + dir = 6 + }, +/obj/structure/cargo_container/kelland/left{ + layer = 2.9 + }, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/w_rockies) "kTs" = ( /obj/effect/decal/cleanable/blood/oil, @@ -24171,17 +26906,24 @@ /turf/open/floor/prison, /area/lv522/indoors/a_block/security/glass) "kUs" = ( -/obj/structure/pipes/standard/manifold/hidden/green, +/obj/structure/prop/ice_colony/ground_wire{ + dir = 8 + }, /turf/open/floor/corsat{ - icon_state = "plate" + icon_state = "brown" }, /area/lv522/atmos/cargo_intake) "kUF" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_x = -1; + pixel_y = 2 }, -/turf/open/floor/corsat, -/area/lv522/atmos/cargo_intake) +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "kUH" = ( /obj/structure/closet/emcloset, /turf/open/floor/prison{ @@ -24189,8 +26931,13 @@ }, /area/lv522/indoors/a_block/security) "kUJ" = ( -/obj/structure/cargo_container/kelland/right, -/turf/open/auto_turf/shale/layer0, +/obj/structure/prop/invuln/ice_prefab/trim{ + dir = 4 + }, +/obj/structure/cargo_container/kelland/right{ + layer = 2.9 + }, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/w_rockies) "kUP" = ( /obj/structure/machinery/light{ @@ -24202,16 +26949,14 @@ }, /area/lv522/indoors/a_block/security) "kVa" = ( -/obj/structure/pipes/standard/manifold/hidden/green{ - dir = 4 - }, -/obj/structure/bed/chair{ - dir = 1 +/obj/effect/spawner/gibspawner/xeno, +/obj/effect/decal/cleanable/blood/xeno{ + icon_state = "xgib3" }, /turf/open/floor/corsat{ icon_state = "squares" }, -/area/lv522/atmos/cargo_intake) +/area/lv522/atmos/east_reactor/south) "kVh" = ( /obj/item/prop/colony/used_flare, /turf/open/floor/prison, @@ -24231,8 +26976,12 @@ /area/lv522/indoors/a_block/dorms) "kVG" = ( /obj/structure/cargo_container/kelland/left, +/obj/structure/pipes/standard/simple/hidden/green, /turf/open/auto_turf/shale/layer2, /area/lv522/outdoors/w_rockies) +"kVO" = ( +/turf/open/floor/wood/ship, +/area/lv522/atmos/way_in_command_centre) "kVP" = ( /obj/effect/spawner/gibspawner/xeno, /obj/effect/decal/cleanable/dirt, @@ -24264,7 +27013,8 @@ dir = 8 }, /turf/open/floor/corsat{ - icon_state = "squares" + dir = 8; + icon_state = "browncorner" }, /area/lv522/atmos/cargo_intake) "kWi" = ( @@ -24282,7 +27032,6 @@ }, /area/lv522/landing_zone_1/ceiling) "kWD" = ( -/obj/structure/pipes/standard/simple/hidden/green, /obj/structure/prop/vehicles/crawler{ icon_state = "crawler_crate_alt2"; layer = 3.1 @@ -24316,12 +27065,24 @@ }, /area/lv522/atmos/east_reactor/south) "kXc" = ( -/obj/structure/pipes/standard/simple/hidden/green, /obj/structure/prop/ice_colony/ground_wire{ dir = 8 }, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/central_streets) +"kXe" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 5 + }, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/w_rockies) +"kXf" = ( +/obj/item/stack/sheet/wood, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, +/area/lv522/landing_zone_2) "kXg" = ( /obj/structure/machinery/door/airlock/almayer/medical{ name = "Medical Laboratory Operating Theatre"; @@ -24354,23 +27115,19 @@ /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/w_rockies) "kXB" = ( -/obj/structure/prop/invuln/ice_prefab{ - dir = 5 +/obj/item/stack/sheet/metal, +/turf/open/floor/corsat{ + icon_state = "brown" }, -/turf/open/auto_turf/shale/layer0, -/area/lv522/outdoors/w_rockies) +/area/lv522/atmos/cargo_intake) "kXY" = ( -/obj/structure/platform_decoration, -/turf/open/floor/strata{ - dir = 4; - icon_state = "white_cyan1" - }, -/area/lv522/oob/w_y_vault) +/turf/open/floor/prison, +/area/lv522/atmos/way_in_command_centre) "kYm" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) "kYu" = ( /obj/structure/surface/table/almayer{ @@ -24395,8 +27152,8 @@ /obj/structure/machinery/light/small{ dir = 4 }, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/turf/open/floor/strata{ + icon_state = "blue1" }, /area/lv522/outdoors/colony_streets/windbreaker/observation) "kYM" = ( @@ -24406,6 +27163,15 @@ icon_state = "darkredfull2" }, /area/lv522/indoors/a_block/security) +"kZe" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "kZj" = ( /obj/item/ammo_magazine/rifle/m4ra/ap{ current_rounds = 0 @@ -24455,6 +27221,23 @@ icon_state = "darkredfull2" }, /area/lv522/indoors/a_block/kitchen/damage) +"lag" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/power/apc/weak{ + dir = 1 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) +"lao" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1 + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/sewer) "lau" = ( /obj/item/stack/sheet/metal, /obj/structure/pipes/standard/simple/hidden/green{ @@ -24494,7 +27277,7 @@ layer = 4.2; pixel_y = 21 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/central_streets) "lbg" = ( /obj/structure/surface/table/almayer{ @@ -24510,18 +27293,20 @@ }, /area/lv522/indoors/a_block/dorms) "lbo" = ( -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_full" +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, -/obj/structure/platform{ - dir = 8 +/area/lv522/atmos/way_in_command_centre) +"lbt" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "Reactor_entry_1" }, -/turf/open/floor/strata{ - dir = 4; - icon_state = "white_cyan1" +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + icon_state = "marked" }, -/area/lv522/oob/w_y_vault) +/area/lv522/atmos/way_in_command_centre) "lbA" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 10 @@ -24536,8 +27321,22 @@ /area/lv522/indoors/a_block/admin) "lbH" = ( /obj/structure/largecrate/random, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/south_street) +"lbI" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/prop/almayer/computer/PC{ + dir = 1; + pixel_x = -1; + pixel_y = 3 + }, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "lbK" = ( /obj/structure/barricade/deployable{ dir = 8 @@ -24575,11 +27374,11 @@ }, /area/lv522/indoors/b_block/bar) "lcP" = ( -/obj/structure/surface/table/almayer, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/floor/corsat{ - icon_state = "squares" + icon_state = "brown" }, -/area/lv522/atmos/east_reactor/south) +/area/lv522/atmos/west_reactor) "lcT" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/camera/autoname{ @@ -24600,6 +27399,12 @@ icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) +"ldi" = ( +/obj/structure/machinery/light, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/cargo_intake) "ldu" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 6 @@ -24607,6 +27412,15 @@ /obj/effect/landmark/yautja_teleport, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/north_west_street) +"ldy" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "cell_stripe" + }, +/area/lv522/atmos/reactor_garage) "ldC" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/plating, @@ -24671,14 +27485,25 @@ /obj/item/prop/alien/hugger, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms) +"leG" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 4; + id = "Reactor_entry_2" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/way_in_command_centre) "leH" = ( /obj/structure/barricade/deployable{ dir = 8 }, /obj/item/clothing/suit/storage/marine/rto, /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat{ - icon_state = "squares" + dir = 4; + icon_state = "brown" }, /area/lv522/atmos/east_reactor/south) "leI" = ( @@ -24720,6 +27545,11 @@ icon_state = "marked" }, /area/lv522/indoors/a_block/dorms) +"lfj" = ( +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/sewer) "lfS" = ( /turf/open/asphalt/cement{ icon_state = "cement2" @@ -24743,7 +27573,7 @@ dir = 1 }, /obj/effect/landmark/lv624/fog_blocker/short, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_1) "lhb" = ( /obj/structure/prop/invuln/ice_prefab{ @@ -24763,9 +27593,9 @@ /area/lv522/indoors/a_block/admin) "lhC" = ( /obj/structure/prop/invuln/ice_prefab{ - dir = 9 + dir = 5 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/w_rockies) "lhD" = ( /obj/structure/barricade/handrail{ @@ -24810,6 +27640,13 @@ icon_state = "floor_plate" }, /area/lv522/indoors/a_block/security) +"lit" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat{ + icon_state = "brown" + }, +/area/lv522/atmos/cargo_intake) "liD" = ( /obj/item/prop/alien/hugger, /turf/open/floor/prison{ @@ -24817,30 +27654,54 @@ icon_state = "floor_marked" }, /area/lv522/atmos/cargo_intake) +"liK" = ( +/obj/item/prop/colony/used_flare, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "liN" = ( /obj/structure/pipes/vents/pump, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) "ljd" = ( -/obj/item/reagent_container/food/snacks/donut, -/turf/open/floor/corsat, -/area/lv522/atmos/cargo_intake) +/obj/item/prop/colony/used_flare, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "ljm" = ( -/obj/item/clipboard, -/turf/open/floor/corsat, -/area/lv522/atmos/cargo_intake) -"ljq" = ( -/obj/item/weapon/twohanded/folded_metal_chair, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, +/obj/effect/landmark/xeno_spawn, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, /turf/open/floor/corsat{ icon_state = "squares" }, +/area/lv522/atmos/east_reactor/south) +"ljq" = ( +/obj/structure/girder/displaced, +/turf/open/floor/plating, /area/lv522/atmos/cargo_intake) "ljr" = ( /turf/closed/shuttle/elevator{ dir = 10 }, /area/lv522/indoors/c_block/mining) +"ljA" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/obj/structure/platform{ + dir = 8 + }, +/turf/open/gm/river, +/area/lv522/atmos/filt) "ljQ" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, /obj/effect/landmark/corpsespawner/colonist/burst, @@ -24862,15 +27723,18 @@ /obj/item/prop/colony/used_flare, /turf/open/floor/prison, /area/lv522/indoors/a_block/kitchen) -"lko" = ( -/obj/structure/prop/invuln/ice_prefab{ - dir = 9 +"lkl" = ( +/obj/structure/machinery/light{ + dir = 4 }, -/obj/structure/prop/invuln/ice_prefab/roof_greeble{ - icon_state = "solarpanel1" +/turf/open/floor/corsat{ + icon_state = "plate" }, -/turf/open/auto_turf/shale/layer2, -/area/lv522/outdoors/w_rockies) +/area/lv522/atmos/east_reactor/south) +"lko" = ( +/obj/item/stack/sheet/metal, +/turf/open/floor/corsat, +/area/lv522/atmos/cargo_intake) "lkr" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ welded = 1 @@ -24885,12 +27749,6 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/admin) -"llc" = ( -/obj/structure/prop/invuln/ice_prefab{ - dir = 10 - }, -/turf/open/auto_turf/shale/layer1, -/area/lv522/outdoors/w_rockies) "llA" = ( /obj/effect/decal/cleanable/blood/drip, /obj/structure/pipes/standard/simple/hidden/green, @@ -24898,16 +27756,21 @@ icon_state = "floor_plate" }, /area/lv522/indoors/a_block/kitchen) -"llJ" = ( -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_full" +"llG" = ( +/obj/structure/bed/chair/comfy{ + dir = 8 }, -/turf/open/floor/strata{ - dir = 4; - icon_state = "white_cyan1" +/turf/open/floor/corsat{ + dir = 6; + icon_state = "brown" }, -/area/lv522/oob/w_y_vault) +/area/lv522/atmos/east_reactor/south) +"llJ" = ( +/obj/structure/machinery/light, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "llM" = ( /obj/item/tool/kitchen/knife/butcher, /obj/effect/decal/cleanable/dirt, @@ -24917,7 +27780,7 @@ /area/lv522/indoors/a_block/kitchen) "llU" = ( /obj/structure/prop/invuln/ice_prefab, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) "llX" = ( /obj/structure/prop/invuln/ice_prefab{ @@ -24955,8 +27818,10 @@ /obj/structure/barricade/deployable{ dir = 8 }, +/obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat{ - icon_state = "squares" + dir = 4; + icon_state = "brown" }, /area/lv522/atmos/east_reactor/south) "lmz" = ( @@ -24964,7 +27829,7 @@ current_mag = null }, /turf/open/floor/corsat{ - icon_state = "squares" + icon_state = "plate" }, /area/lv522/atmos/east_reactor/south) "lmA" = ( @@ -25005,15 +27870,17 @@ /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/dorms) "lmY" = ( -/obj/item/clothing/suit/storage/marine/medium, -/turf/open/floor/corsat{ - icon_state = "squares" - }, +/turf/closed/wall/strata_outpost, /area/lv522/atmos/east_reactor/south) "lnd" = ( -/obj/item/clothing/suit/storage/marine/medium, -/turf/closed/wall/mineral/bone_resin, -/area/lv522/oob) +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/prison{ + icon_state = "cell_stripe" + }, +/area/lv522/atmos/east_reactor/south) "lnj" = ( /obj/structure/barricade/wooden{ dir = 1 @@ -25024,6 +27891,9 @@ /area/lv522/indoors/a_block/kitchen/glass) "lnC" = ( /obj/structure/largecrate/supply/supplies/water, +/obj/structure/machinery/light{ + dir = 8 + }, /turf/open/floor/corsat{ icon_state = "plate" }, @@ -25041,6 +27911,18 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) +"lnK" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/asphalt/cement{ + icon_state = "cement1" + }, +/area/lv522/outdoors/colony_streets/north_street) "lnL" = ( /obj/structure/prop/invuln/ice_prefab{ dir = 1 @@ -25091,6 +27973,15 @@ icon_state = "brown" }, /area/lv522/atmos/cargo_intake) +"loS" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/item/prop/alien/hugger, +/turf/open/floor/strata{ + icon_state = "blue1" + }, +/area/lv522/outdoors/colony_streets/windbreaker/observation) "lpi" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -25111,6 +28002,10 @@ icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/storage_blocks) +"lpy" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv522/atmos/filt) "lpH" = ( /obj/structure/barricade/handrail{ dir = 4 @@ -25118,18 +28013,18 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) -"lpP" = ( -/obj/structure/largecrate/random/mini/med, -/turf/open/auto_turf/shale/layer0, -/area/lv522/landing_zone_2/ceiling) "lpY" = ( /obj/structure/pipes/standard/manifold/hidden/green, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/security/glass) "lqb" = ( -/obj/structure/blocker/forcefield/vehicles, -/turf/closed/wall/r_wall/biodome/biodome_unmeltable, +/turf/closed/wall/strata_outpost/reinforced, /area/lv522/atmos/cargo_intake) +"lqd" = ( +/obj/structure/largecrate/random, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison, +/area/lv522/atmos/outdoor) "lqL" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/barricade/wooden, @@ -25140,9 +28035,21 @@ }, /area/lv522/indoors/a_block/bridges/garden_bridge) "lqY" = ( -/obj/structure/prop/invuln/ice_prefab, -/turf/open/auto_turf/shale/layer0, -/area/lv522/outdoors/w_rockies) +/obj/effect/decal/cleanable/dirt, +/obj/item/stack/sheet/metal, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/cargo_intake) +"lrd" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat{ + icon_state = "browncorner" + }, +/area/lv522/atmos/east_reactor/south) "lrh" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/floor/corsat{ @@ -25155,6 +28062,18 @@ }, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/central_streets) +"lrr" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 4; + id = "Reactor_garage_3" + }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/reactor_garage) "lrt" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -25165,13 +28084,11 @@ }, /area/lv522/indoors/a_block/security) "lrG" = ( -/obj/item/prop/alien/hugger{ - pixel_x = 11; - pixel_y = -9 +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 10 }, -/obj/item/clothing/head/hardhat/white, /turf/open/floor/corsat{ - icon_state = "squares" + icon_state = "plate" }, /area/lv522/atmos/cargo_intake) "lrJ" = ( @@ -25182,6 +28099,12 @@ icon_state = "darkredfull2" }, /area/lv522/indoors/a_block/kitchen) +"lrM" = ( +/turf/open/floor/corsat{ + dir = 8; + icon_state = "browncorner" + }, +/area/lv522/atmos/reactor_garage) "lrQ" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, /turf/open/floor/corsat{ @@ -25207,7 +28130,7 @@ icon_state = "E"; pixel_x = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) "lsR" = ( /obj/structure/fence{ @@ -25228,14 +28151,22 @@ /obj/structure/platform{ dir = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) "lty" = ( /obj/structure/barricade/wooden{ dir = 8 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_street) +"ltB" = ( +/obj/structure/platform{ + dir = 4 + }, +/turf/open/asphalt/cement{ + icon_state = "cement3" + }, +/area/lv522/outdoors/colony_streets/north_east_street) "ltC" = ( /obj/structure/bed/chair/comfy, /obj/structure/pipes/standard/simple/hidden/green{ @@ -25258,12 +28189,19 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/security) +"lul" = ( +/obj/structure/surface/table/almayer, +/obj/item/frame/fire_alarm, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/sewer) "lum" = ( /obj/structure/platform, /obj/structure/platform{ dir = 8 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/asphalt/cement, /area/lv522/outdoors/colony_streets/south_east_street) "lvb" = ( /obj/structure/prop/ice_colony/ground_wire{ @@ -25273,7 +28211,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) "lvl" = ( /obj/structure/surface/rack, @@ -25282,7 +28220,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "W" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_west_street) "lvF" = ( /obj/item/tool/surgery/circular_saw, @@ -25292,11 +28230,9 @@ }, /area/lv522/indoors/a_block/medical) "lvH" = ( -/obj/structure/prop/invuln/ice_prefab{ - icon_state = "fab_2" - }, -/turf/open/auto_turf/shale/layer0, -/area/lv522/outdoors/w_rockies) +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat, +/area/lv522/atmos/cargo_intake) "lvN" = ( /obj/structure/fence, /obj/effect/decal/warning_stripes{ @@ -25319,6 +28255,14 @@ icon_state = "white_cyan1" }, /area/lv522/indoors/a_block/corpo/glass) +"lwc" = ( +/obj/structure/prop/vehicles{ + icon_state = "truck_damaged" + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/reactor_garage) "lwm" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/floor/corsat{ @@ -25326,6 +28270,13 @@ icon_state = "browncorner" }, /area/lv522/atmos/east_reactor/south) +"lwr" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 10 + }, +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv522/atmos/sewer) "lwv" = ( /obj/structure/machinery/light{ dir = 8 @@ -25364,11 +28315,8 @@ /turf/open/floor/prison, /area/lv522/indoors/a_block/admin) "lxj" = ( -/obj/structure/prop/invuln/ice_prefab{ - dir = 1; - icon_state = "fab_2" - }, -/turf/open/auto_turf/shale/layer0, +/obj/structure/prop/invuln/ice_prefab, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/w_rockies) "lxp" = ( /obj/structure/machinery/light{ @@ -25395,6 +28343,10 @@ "lxL" = ( /turf/open/floor/prison, /area/lv522/indoors/a_block/kitchen) +"lxN" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv522/indoors/a_block/corpo/glass) "lxW" = ( /obj/structure/cargo_container/kelland/left, /turf/open/floor/corsat{ @@ -25411,8 +28363,15 @@ /obj/structure/pipes/standard/manifold/hidden/green{ dir = 4 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) +"lyu" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "lyD" = ( /turf/open/asphalt/cement{ icon_state = "cement15" @@ -25429,18 +28388,15 @@ }, /area/lv522/indoors/a_block/admin) "lzb" = ( -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_full" - }, -/obj/structure/platform{ - dir = 4 +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/space_heater/radiator/red{ + dir = 8 }, -/turf/open/floor/strata{ - dir = 4; - icon_state = "white_cyan1" +/obj/structure/machinery/light, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, -/area/lv522/oob/w_y_vault) +/area/lv522/atmos/way_in_command_centre) "lze" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/warning_stripes{ @@ -25499,7 +28455,7 @@ /obj/structure/platform{ dir = 4 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) "lzV" = ( /obj/structure/platform_decoration, @@ -25514,6 +28470,11 @@ icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/south_east_street) +"lAa" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/prison, +/area/lv522/outdoors/colony_streets/windbreaker/observation) "lAj" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -25543,11 +28504,36 @@ icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_east_street) +"lAA" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor/corsat{ + dir = 8; + icon_state = "brown" + }, +/area/lv522/atmos/cargo_intake) "lAD" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, -/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/obj/structure/foamed_metal, /turf/open/floor/corsat{ - icon_state = "squares" + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) +"lAK" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) +"lAS" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 10 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/corsat{ + icon_state = "plate" }, /area/lv522/atmos/east_reactor/south) "lBd" = ( @@ -25568,7 +28554,7 @@ /area/lv522/indoors/a_block/dorms) "lBl" = ( /obj/effect/landmark/lv624/fog_blocker/short, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_1) "lBu" = ( /obj/structure/machinery/light{ @@ -25586,7 +28572,7 @@ dir = 8; icon_state = "p_stair_full" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_2) "lBC" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -25598,7 +28584,7 @@ /area/lv522/indoors/b_block/bar) "lBE" = ( /obj/structure/prop/invuln/ice_prefab{ - dir = 1 + dir = 9 }, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/w_rockies) @@ -25647,6 +28633,12 @@ icon_state = "blue" }, /area/lv522/indoors/a_block/hallway) +"lCH" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/n_rockies) "lCQ" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 6 @@ -25664,15 +28656,22 @@ dir = 8 }, /turf/open/floor/corsat{ - icon_state = "squares" + icon_state = "brown" }, /area/lv522/atmos/east_reactor/south) +"lDk" = ( +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "lDr" = ( /obj/item/prop/colony/proptag{ desc = "A fallen marine's information dog tag. It reads, Sergeant Douglas 'Bedwetter' Smith" }, +/obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat{ - icon_state = "squares" + dir = 6; + icon_state = "brown" }, /area/lv522/atmos/east_reactor/south) "lDC" = ( @@ -25693,9 +28692,14 @@ }, /area/lv522/outdoors/colony_streets/east_central_street) "lDN" = ( -/obj/item/clothing/suit/storage/marine/M3G, -/turf/closed/wall/mineral/bone_resin, -/area/lv522/oob) +/obj/structure/surface/table/almayer, +/obj/structure/machinery/prop/almayer/computer/PC{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/east_reactor/south) "lDU" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/recharger, @@ -25710,11 +28714,24 @@ /area/lv522/indoors/a_block/security/glass) "lEb" = ( /obj/structure/pipes/vents/pump, +/obj/structure/machinery/door_display/research_cell{ + dir = 4; + id = "Reactor_e_entry_3"; + pixel_x = -16; + req_access = null + }, /turf/open/floor/corsat{ dir = 1; icon_state = "brown" }, /area/lv522/atmos/filt) +"lEd" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/secure_closet/engineering_welding, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/way_in_command_centre) "lEk" = ( /obj/structure/surface/table/almayer, /obj/item/device/radio{ @@ -25735,9 +28752,41 @@ }, /area/lv522/indoors/a_block/bridges/dorms_fitness) "lER" = ( -/obj/effect/landmark/lv624/fog_blocker/short, -/turf/closed/wall/solaris/reinforced/hull/lv522, -/area/lv522/oob) +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 9 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/cargo_intake) +"lEZ" = ( +/turf/open/floor/corsat{ + dir = 8; + icon_state = "brown" + }, +/area/lv522/atmos/reactor_garage) +"lFa" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "brown" + }, +/area/lv522/atmos/reactor_garage) +"lFd" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/lv522/atmos/east_reactor) +"lFk" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/east_reactor) "lFt" = ( /turf/open/floor/corsat{ dir = 1; @@ -25916,15 +28965,6 @@ icon_state = "greenfull" }, /area/lv522/indoors/b_block/bridge) -"lIM" = ( -/obj/structure/machinery/door/poddoor/almayer/closed{ - id = "Corpo Vault"; - name = "Vault Lockdown" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/oob/w_y_vault) "lIR" = ( /obj/structure/prop/invuln/ice_prefab/trim{ dir = 8 @@ -26018,6 +29058,9 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms/glass) +"lLA" = ( +/turf/open/floor/corsat, +/area/lv522/atmos/reactor_garage) "lLL" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/power/apc/weak{ @@ -26028,6 +29071,13 @@ icon_state = "darkyellowfull2" }, /area/lv522/indoors/c_block/t_comm) +"lMF" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/corsat{ + dir = 6; + icon_state = "brown" + }, +/area/lv522/atmos/east_reactor/south) "lMH" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -26045,9 +29095,11 @@ /obj/structure/barricade/deployable{ dir = 8 }, -/obj/item/ammo_magazine/m56d, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, /turf/open/floor/corsat{ - icon_state = "squares" + icon_state = "plate" }, /area/lv522/atmos/east_reactor/south) "lMT" = ( @@ -26107,15 +29159,18 @@ /turf/open/floor/prison, /area/lv522/indoors/a_block/kitchen/glass) "lNA" = ( -/obj/structure/pipes/standard/simple/hidden/green{ +/obj/structure/pipes/standard/manifold/hidden/green{ dir = 4 }, /turf/open/floor/corsat, /area/lv522/atmos/east_reactor/south) "lNI" = ( /obj/item/ammo_magazine/m56d, +/obj/structure/pipes/standard/manifold/hidden/green{ + dir = 4 + }, /turf/open/floor/corsat{ - icon_state = "squares" + icon_state = "plate" }, /area/lv522/atmos/east_reactor/south) "lNT" = ( @@ -26166,10 +29221,22 @@ icon_state = "cyan2" }, /area/lv522/indoors/a_block/medical) +"lPf" = ( +/obj/structure/stairs/perspective{ + dir = 10; + icon_state = "p_stair_full" + }, +/obj/structure/platform{ + dir = 4 + }, +/turf/open/asphalt/cement, +/area/lv522/outdoors/n_rockies) "lPq" = ( -/obj/structure/largecrate/random, -/turf/open/auto_turf/shale/layer0, -/area/lv522/landing_zone_2/ceiling) +/obj/structure/platform{ + dir = 4 + }, +/turf/open/asphalt/cement, +/area/lv522/outdoors/colony_streets/south_east_street) "lPv" = ( /obj/effect/decal/cleanable/liquid_fuel, /turf/open/asphalt/cement{ @@ -26197,7 +29264,7 @@ /obj/item/prop/colony/canister{ pixel_y = 8 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/nw_rockies) "lQS" = ( /obj/structure/prop/vehicles/crawler{ @@ -26205,7 +29272,7 @@ icon_state = "crawler_crate_alt2"; layer = 3.1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/nw_rockies) "lRx" = ( /obj/structure/surface/table/almayer, @@ -26243,7 +29310,7 @@ pixel_x = 2; pixel_y = 9 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) "lSl" = ( /obj/structure/barricade/wooden, @@ -26272,12 +29339,28 @@ /obj/structure/stairs/perspective{ icon_state = "p_stair_full" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_2) "lSP" = ( /obj/structure/surface/table/almayer, +/obj/structure/transmitter/colony_net/rotary{ + phone_category = "LV522 Chances Claim"; + phone_id = "Colony Operations Centre"; + pixel_y = 6 + }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/admin) +"lTd" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 9 + }, +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv522/outdoors/colony_streets/windbreaker/observation) +"lTi" = ( +/obj/structure/girder, +/turf/open/floor/corsat, +/area/lv522/oob) "lTj" = ( /obj/structure/prop/invuln/minecart_tracks, /obj/structure/prop/invuln/minecart_tracks{ @@ -26352,7 +29435,7 @@ dir = 4; icon_state = "p_stair_full" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) "lUK" = ( /turf/open/floor/prison, @@ -26371,16 +29454,8 @@ icon_state = "NW-out"; pixel_y = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_west_street) -"lVg" = ( -/obj/structure/machinery/power/apc/weak{ - dir = 1 - }, -/turf/open/floor/corsat{ - icon_state = "plate" - }, -/area/lv522/atmos/cargo_intake) "lVp" = ( /turf/closed/wall/strata_outpost, /area/lv522/indoors/a_block/kitchen/glass) @@ -26408,12 +29483,6 @@ icon_state = "marked" }, /area/lv522/indoors/a_block/bridges/corpo) -"lVG" = ( -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/corsat{ - icon_state = "brown" - }, -/area/lv522/atmos/cargo_intake) "lVK" = ( /obj/structure/closet/bodybag, /obj/effect/decal/cleanable/dirt, @@ -26448,9 +29517,11 @@ /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/north_east_street) "lWa" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 5 + }, /turf/open/floor/corsat{ - icon_state = "browncorner" + icon_state = "plate" }, /area/lv522/atmos/cargo_intake) "lWf" = ( @@ -26470,7 +29541,7 @@ "lWj" = ( /obj/structure/platform, /obj/effect/landmark/lv624/fog_blocker/short, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_1) "lWm" = ( /obj/structure/machinery/light, @@ -26499,6 +29570,12 @@ icon_state = "squares" }, /area/lv522/atmos/east_reactor/south) +"lXY" = ( +/obj/structure/bed/chair/comfy{ + dir = 8 + }, +/turf/open/floor/wood/ship, +/area/lv522/atmos/way_in_command_centre) "lYg" = ( /obj/structure/stairs/perspective{ dir = 6; @@ -26507,7 +29584,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) "lYG" = ( /obj/structure/platform_decoration{ @@ -26520,6 +29597,12 @@ }, /turf/open/floor/plating, /area/lv522/indoors/c_block/mining) +"lYK" = ( +/obj/structure/platform{ + dir = 1 + }, +/turf/open/gm/river, +/area/lv522/atmos/sewer) "lYL" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -26539,8 +29622,14 @@ /obj/structure/prop/invuln/ice_prefab/standalone{ icon_state = "white" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) +"lZq" = ( +/obj/structure/closet/firecloset/full, +/turf/open/floor/strata{ + icon_state = "blue1" + }, +/area/lv522/indoors/a_block/dorm_north) "lZI" = ( /obj/effect/decal/cleanable/dirt, /obj/item/prop/colony/used_flare, @@ -26574,20 +29663,32 @@ /area/lv522/indoors/b_block/bar) "mad" = ( /obj/effect/decal/cleanable/blood, -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/floor/corsat{ - icon_state = "squares" + icon_state = "marked" }, /area/lv522/atmos/east_reactor/south) "maj" = ( -/obj/structure/pipes/standard/manifold/hidden/green, -/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, -/turf/open/floor/corsat, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/lv522/atmos/east_reactor/south) +"mam" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/fence, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/lv522/landing_zone_2/ceiling) "max" = ( -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_west_street) "may" = ( /obj/structure/sink{ @@ -26653,6 +29754,12 @@ "mbw" = ( /obj/effect/decal/cleanable/blood, /obj/effect/decal/cleanable/dirt, +/obj/structure/transmitter/colony_net{ + phone_category = "LV522 Chances Claim"; + phone_color = "red"; + phone_id = "Colony Dining"; + pixel_y = 26 + }, /turf/open/floor/prison{ icon_state = "darkredfull2" }, @@ -26731,13 +29838,14 @@ }, /area/lv522/atmos/filt) "mcG" = ( -/obj/structure/machinery/light{ - dir = 1 +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 }, -/turf/open/asphalt/cement{ - icon_state = "cement12" +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/corsat{ + icon_state = "brown" }, -/area/lv522/outdoors/colony_streets/central_streets) +/area/lv522/atmos/cargo_intake) "mcO" = ( /obj/structure/machinery/portable_atmospherics/canister/empty/oxygen{ layer = 4.4; @@ -26770,31 +29878,24 @@ /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/atmos/filt) "mdZ" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, +/obj/structure/window/framed/corsat, /turf/open/floor/corsat, -/area/lv522/atmos/cargo_intake) +/area/lv522/oob) "meb" = ( /obj/structure/largecrate/random{ layer = 2.9 }, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) -"med" = ( -/obj/structure/pipes/standard/manifold/hidden/green{ - dir = 4 - }, -/turf/open/floor/corsat{ - icon_state = "plate" - }, -/area/lv522/atmos/filt) "mee" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/atmos/filt) +"men" = ( +/turf/open/floor/shiva{ + icon_state = "radiator_tile2" + }, +/area/lv522/atmos/way_in_command_centre) "meq" = ( /turf/open/floor/prison{ icon_state = "floor_plate" @@ -26820,6 +29921,22 @@ icon_state = "blue" }, /area/lv522/indoors/a_block/hallway) +"mfF" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/surface/table/almayer, +/obj/item/clothing/gloves/boxing{ + pixel_x = -5; + pixel_y = 5 + }, +/obj/item/clothing/gloves/boxing/blue{ + pixel_x = 5; + pixel_y = -6 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, +/area/lv522/indoors/a_block/fitness) "mfS" = ( /obj/structure/machinery/door/airlock/almayer/generic{ dir = 1 @@ -26859,7 +29976,7 @@ /area/lv522/indoors/c_block/cargo) "mgJ" = ( /obj/effect/decal/cleanable/blood/oil, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/nw_rockies) "mhn" = ( /obj/structure/surface/table/almayer, @@ -26896,8 +30013,15 @@ /obj/structure/platform_decoration{ dir = 5 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) +"mis" = ( +/obj/effect/alien/resin/sticky, +/turf/open/floor/corsat{ + dir = 4; + icon_state = "browncorner" + }, +/area/lv522/atmos/east_reactor/south) "miz" = ( /obj/structure/stairs/perspective{ dir = 1; @@ -26908,13 +30032,10 @@ }, /area/lv522/outdoors/colony_streets/north_street) "miH" = ( -/obj/structure/pipes/standard/manifold/hidden/green{ - dir = 1 - }, -/turf/open/floor/corsat{ - icon_state = "brown" +/turf/open/floor{ + icon_state = "bcircuit" }, -/area/lv522/atmos/cargo_intake) +/area/lv522/atmos/east_reactor/south) "miW" = ( /obj/structure/cargo_container/kelland/left, /turf/open/floor/prison{ @@ -26938,21 +30059,17 @@ }, /area/lv522/indoors/a_block/corpo/glass) "mjq" = ( -/obj/structure/barricade/handrail{ - dir = 1 - }, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/floor/corsat{ - icon_state = "plate" + dir = 8; + icon_state = "browncorner" }, -/area/lv522/atmos/east_reactor) +/area/lv522/atmos/west_reactor) "mjs" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/floor/corsat{ - dir = 6; - icon_state = "brown" - }, +/turf/open/floor/plating, /area/lv522/atmos/cargo_intake) "mjz" = ( /obj/structure/dispenser/oxygen, @@ -26974,6 +30091,16 @@ icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2/ceiling) +"mjF" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv522/atmos/reactor_garage) +"mjR" = ( +/obj/item/stack/sheet/metal, +/turf/open/asphalt/cement{ + icon_state = "cement3" + }, +/area/lv522/outdoors/n_rockies) "mjT" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ @@ -26981,6 +30108,16 @@ icon_state = "blue" }, /area/lv522/indoors/a_block/admin) +"mjW" = ( +/obj/structure/machinery/vending/walkman{ + density = 0; + pixel_y = 16 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/lv522/indoors/a_block/fitness) "mjY" = ( /obj/item/shard{ icon_state = "medium"; @@ -26994,13 +30131,15 @@ }, /area/lv522/indoors/b_block/bridge) "mkb" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 10 +/obj/structure/prop/server_equipment/yutani_server{ + density = 0; + pixel_y = 16 }, -/turf/open/floor/corsat{ - icon_state = "brown" +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_marked" }, -/area/lv522/atmos/cargo_intake) +/area/lv522/atmos/east_reactor/south) "mkd" = ( /obj/item/stack/folding_barricade, /obj/effect/decal/cleanable/dirt, @@ -27008,13 +30147,22 @@ icon_state = "darkredfull2" }, /area/lv522/indoors/a_block/security) +"mkh" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "mkm" = ( /obj/structure/closet/crate, /obj/effect/decal/warning_stripes{ icon_state = "N"; pixel_y = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) "mkJ" = ( /obj/structure/machinery/deployable/barrier, @@ -27034,13 +30182,6 @@ }, /turf/open/floor/prison, /area/lv522/indoors/c_block/garage) -"mkZ" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, -/turf/open/floor/corsat{ - dir = 10; - icon_state = "brown" - }, -/area/lv522/atmos/cargo_intake) "mld" = ( /obj/structure/barricade/wooden{ dir = 1 @@ -27048,10 +30189,18 @@ /turf/open/floor/prison, /area/lv522/indoors/c_block/cargo) "mlp" = ( -/obj/effect/landmark/lv624/fog_blocker/short, -/obj/effect/landmark/lv624/fog_blocker/short, -/turf/open/auto_turf/shale/layer2, -/area/lv522/outdoors/colony_streets/north_street) +/obj/structure/machinery/computer3/server/rack{ + density = 0; + pixel_y = 16 + }, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_marked" + }, +/area/lv522/atmos/east_reactor/south) "mly" = ( /obj/structure/closet/firecloset/full, /obj/effect/decal/cleanable/dirt, @@ -27066,11 +30215,10 @@ }, /area/lv522/indoors/a_block/dorms) "mlE" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, -/turf/open/floor/corsat{ - dir = 10; - icon_state = "brown" +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 9 }, +/turf/open/floor/corsat, /area/lv522/atmos/east_reactor/south) "mlO" = ( /obj/structure/bed/chair{ @@ -27102,6 +30250,13 @@ icon_state = "blue_plate" }, /area/lv522/indoors/a_block/admin) +"mlR" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/reactor_garage) "mlY" = ( /obj/structure/largecrate/random, /obj/effect/decal/warning_stripes{ @@ -27124,12 +30279,27 @@ icon_state = "blue_plate" }, /area/lv522/indoors/a_block/admin) +"mmh" = ( +/obj/item/ammo_magazine/rifle/heap{ + current_rounds = 0 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "mmj" = ( -/obj/structure/largecrate, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 6 + }, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/floor/corsat{ - icon_state = "squares" + icon_state = "marked" }, -/area/lv522/atmos/cargo_intake) +/area/lv522/atmos/filt) "mmv" = ( /obj/structure/machinery/light{ dir = 8 @@ -27190,6 +30360,14 @@ /obj/item/clothing/suit/storage/marine/M3S, /turf/open/floor/corsat, /area/lv522/atmos/east_reactor/south) +"mnx" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/open/floor/strata{ + icon_state = "blue1" + }, +/area/lv522/outdoors/colony_streets/windbreaker/observation) "mnz" = ( /obj/structure/platform_decoration{ dir = 8 @@ -27211,6 +30389,14 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) +"mnQ" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/outdoors/n_rockies) "mnU" = ( /obj/effect/decal/cleanable/dirt, /obj/item/ammo_magazine/rifle/l42a/extended{ @@ -27219,11 +30405,17 @@ /turf/open/floor/prison, /area/lv522/indoors/a_block/security/glass) "mnX" = ( -/obj/item/weapon/gun/rifle/m41a{ - current_mag = null +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 9 }, -/turf/closed/wall/mineral/bone_resin, -/area/lv522/oob) +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/filt) +"moe" = ( +/turf/closed/wall/strata_outpost/reinforced/hull, +/area/lv522/oob/w_y_vault) "moz" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/light{ @@ -27259,6 +30451,13 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/fitness/glass) +"moZ" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor/corsat{ + dir = 8; + icon_state = "brown" + }, +/area/lv522/atmos/east_reactor/west) "mpr" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ @@ -27285,8 +30484,18 @@ /obj/structure/prop/vehicles/crawler{ layer = 3.2 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/central_streets) +"mpQ" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/prop/almayer/computer/PC{ + dir = 1; + pixel_y = 3 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "mpU" = ( /obj/structure/surface/rack, /obj/effect/decal/cleanable/dirt, @@ -27295,13 +30504,16 @@ icon_state = "blue_plate" }, /area/lv522/indoors/a_block/admin) -"mqf" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/belt/marine/m41a, -/turf/open/floor/corsat{ - icon_state = "squares" +"mqc" = ( +/obj/effect/decal/cleanable/blood, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 }, -/area/lv522/atmos/east_reactor/south) +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "mqi" = ( /obj/structure/surface/table/almayer{ dir = 4; @@ -27325,10 +30537,11 @@ /turf/open/floor/wood, /area/lv522/indoors/a_block/fitness/glass) "mql" = ( -/obj/structure/surface/table/almayer, -/obj/item/clothing/suit/storage/marine/heavy, +/obj/structure/machinery/door/airlock/almayer/engineering/colony{ + dir = 1 + }, /turf/open/floor/corsat{ - icon_state = "squares" + icon_state = "marked" }, /area/lv522/atmos/east_reactor/south) "mqu" = ( @@ -27340,7 +30553,6 @@ }, /area/lv522/atmos/east_reactor/south) "mqv" = ( -/obj/effect/landmark/survivor_spawner/lv522_forecon_grenadier, /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 }, @@ -27349,6 +30561,9 @@ icon_state = "blue" }, /area/lv522/indoors/a_block/admin) +"mqx" = ( +/turf/open/gm/river, +/area/lv522/atmos/sewer) "mqA" = ( /obj/structure/stairs/perspective{ dir = 8; @@ -27359,7 +30574,7 @@ /area/lv522/atmos/filt) "mqC" = ( /obj/structure/cargo_container/horizontal/blue/top, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/central_streets) "mqH" = ( /obj/effect/decal/cleanable/dirt, @@ -27380,6 +30595,12 @@ icon_state = "white_cyan1" }, /area/lv522/indoors/a_block/corpo/glass) +"mrL" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/lv522/atmos/east_reactor) "mrM" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -27398,8 +30619,15 @@ /area/lv522/atmos/east_reactor/south) "mse" = ( /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_west_street) +"msf" = ( +/obj/structure/machinery/light, +/turf/open/floor/corsat{ + dir = 6; + icon_state = "brown" + }, +/area/lv522/atmos/east_reactor) "msj" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/plating/plating_catwalk/prison, @@ -27409,12 +30637,41 @@ /obj/item/device/analyzer/plant_analyzer, /turf/open/floor/prison, /area/lv522/indoors/b_block/hydro) +"msp" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/command_centre) "msr" = ( /obj/structure/barricade/deployable, /turf/open/floor/prison{ icon_state = "darkredfull2" }, /area/lv522/indoors/a_block/security) +"msB" = ( +/obj/item/reagent_container/food/snacks/stewedsoymeat{ + pixel_y = -6 + }, +/obj/item/trash/sosjerky{ + pixel_x = 8; + pixel_y = 12 + }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 10 + }, +/turf/open/floor/prison, +/area/lv522/indoors/a_block/dorm_north) +"msQ" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/asphalt/cement{ + icon_state = "cement3" + }, +/area/lv522/outdoors/n_rockies) "mto" = ( /obj/effect/landmark/monkey_spawn, /turf/open/floor/corsat{ @@ -27436,11 +30693,18 @@ /obj/structure/flora/bush/ausbushes/ppflowers, /turf/open/floor/grass, /area/lv522/indoors/a_block/garden) -"mua" = ( -/obj/structure/pipes/vents/pump, -/turf/open/floor/corsat{ - icon_state = "plate" +"mtM" = ( +/obj/structure/transmitter/colony_net{ + dir = 4; + phone_category = "LV522 Chances Claim"; + phone_color = "red"; + phone_id = "Colony Cargo"; + pixel_x = -16 }, +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv522/indoors/c_block/cargo) +"mua" = ( +/turf/closed/wall/r_wall/biodome/biodome_unmeltable, /area/lv522/atmos/filt) "mum" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -27503,6 +30767,12 @@ /obj/item/prop/alien/hugger, /turf/open/floor/plating, /area/lv522/indoors/a_block/security) +"mvI" = ( +/obj/structure/bed/chair, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/reactor_garage) "mvP" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/lv624/fog_blocker/short, @@ -27543,12 +30813,8 @@ /area/lv522/outdoors/colony_streets/south_west_street) "mwp" = ( /obj/effect/spawner/random/tool, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/nw_rockies) -"mwv" = ( -/obj/effect/landmark/lv624/fog_blocker/short, -/turf/closed/wall/strata_outpost/reinforced, -/area/lv522/oob/w_y_vault) "mwC" = ( /obj/item/clothing/head/welding, /obj/effect/decal/warning_stripes{ @@ -27572,7 +30838,7 @@ /obj/structure/prop/ice_colony/ground_wire{ dir = 8 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) "mxo" = ( /obj/structure/surface/rack, @@ -27588,7 +30854,7 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, /obj/effect/landmark/corpsespawner/colonist/burst, /turf/open/floor/corsat{ - icon_state = "squares" + icon_state = "browncorner" }, /area/lv522/atmos/east_reactor/south) "mxt" = ( @@ -27636,6 +30902,9 @@ icon_state = "greenfull" }, /area/lv522/indoors/b_block/hydro) +"myz" = ( +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv522/atmos/reactor_garage) "myC" = ( /obj/structure/machinery/vending/snack, /turf/open/floor/prison{ @@ -27694,9 +30963,27 @@ icon_state = "greenfull" }, /area/lv522/landing_zone_1/ceiling) +"mzP" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/recharger{ + pixel_y = 5 + }, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) +"mzX" = ( +/obj/structure/bed/chair{ + dir = 1 + }, +/turf/open/floor/prison, +/area/lv522/atmos/way_in_command_centre) "mAg" = ( /obj/structure/prop/dam/crane/damaged, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) "mAA" = ( /obj/structure/machinery/light, @@ -27716,16 +31003,26 @@ /obj/structure/closet/secure_closet/detective, /turf/open/floor/wood, /area/lv522/indoors/a_block/security) +"mAE" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/item/lightstick/red/spoke/planted{ + pixel_x = -9; + pixel_y = -2 + }, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/colony_streets/central_streets) "mAR" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 10 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/central_streets) "mAW" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/blood/oil, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/nw_rockies) "mBc" = ( /obj/structure/bed/chair/comfy{ @@ -27745,14 +31042,28 @@ }, /area/lv522/indoors/a_block/security) "mBy" = ( -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/corsat{ - icon_state = "plate" +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 }, -/area/lv522/atmos/cargo_intake) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison{ + dir = 8; + icon_state = "cell_stripe" + }, +/area/lv522/atmos/reactor_garage) "mBF" = ( /turf/closed/wall/strata_outpost, /area/lv522/indoors/b_block/bar) +"mBL" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/standard/manifold/hidden/green{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "w-y2" + }, +/area/lv522/atmos/way_in_command_centre) "mCm" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -27767,24 +31078,34 @@ /obj/item/storage/beer_pack, /turf/open/asphalt/cement, /area/lv522/outdoors/colony_streets/south_street) +"mCx" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/corsat{ + dir = 4; + icon_state = "brown" + }, +/area/lv522/atmos/reactor_garage) "mCA" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/b_block/hydro) -"mCK" = ( -/obj/structure/blocker/forcefield/vehicles, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/atmos/cargo_intake) "mCQ" = ( -/obj/structure/blocker/forcefield/vehicles, -/obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/decal/cleanable/blood, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/floor/corsat{ icon_state = "marked" }, -/area/lv522/atmos/cargo_intake) +/area/lv522/atmos/filt) +"mDw" = ( +/obj/structure/prop/invuln/ice_prefab{ + dir = 10 + }, +/turf/open/auto_turf/shale/layer2, +/area/lv522/outdoors/w_rockies) "mDz" = ( /obj/structure/prop/ice_colony/dense/planter_box{ dir = 8 @@ -27799,8 +31120,11 @@ }, /area/lv522/indoors/b_block/bridge) "mDT" = ( -/obj/structure/largecrate/random/barrel/red, -/turf/open/auto_turf/shale/layer0, +/obj/structure/largecrate/random/mini, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/lv522/landing_zone_2/ceiling) "mDX" = ( /obj/effect/decal/cleanable/dirt, @@ -27824,6 +31148,16 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) +"mEp" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/prison{ + dir = 1; + icon_state = "cell_stripe" + }, +/area/lv522/atmos/reactor_garage) "mEx" = ( /obj/item/stack/rods, /turf/open/floor/prison, @@ -27839,6 +31173,12 @@ icon_state = "white_cyan2" }, /area/lv522/indoors/a_block/medical/glass) +"mEG" = ( +/obj/structure/largecrate/random, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/outdoors/n_rockies) "mFe" = ( /obj/structure/machinery/light{ dir = 8 @@ -27849,6 +31189,17 @@ icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/storage_blocks) +"mFg" = ( +/obj/structure/surface/table/almayer, +/obj/item/co2_cartridge{ + pixel_x = -8; + pixel_y = 14 + }, +/obj/item/clothing/accessory/armband/engine, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "mFm" = ( /obj/structure/surface/table/almayer, /obj/item/ashtray/plastic{ @@ -27883,6 +31234,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/c_block/cargo) +"mGb" = ( +/obj/structure/bed/chair/comfy{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison, +/area/lv522/atmos/reactor_garage) "mGD" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/prop/almayer/computer/PC{ @@ -27945,9 +31304,11 @@ /turf/open/floor/grass, /area/lv522/indoors/a_block/garden) "mHZ" = ( -/obj/effect/landmark/lv624/fog_blocker/short, -/turf/open/asphalt/cement, -/area/lv522/outdoors/colony_streets/north_street) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/shiva{ + icon_state = "radiator_tile2" + }, +/area/lv522/indoors/a_block/corpo/glass) "mIa" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -27957,6 +31318,15 @@ icon_state = "darkredfull2" }, /area/lv522/outdoors/colony_streets/north_street) +"mIq" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "mIO" = ( /obj/structure/machinery/vending/coffee, /obj/structure/machinery/light{ @@ -28039,7 +31409,7 @@ dir = 4; icon_state = "p_stair_full" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_street) "mJZ" = ( /obj/structure/surface/table/almayer, @@ -28049,8 +31419,11 @@ }, /area/lv522/indoors/a_block/kitchen) "mKu" = ( -/obj/structure/largecrate/random/secure, -/turf/open/auto_turf/shale/layer0, +/obj/structure/largecrate/random, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_marked" + }, /area/lv522/landing_zone_2/ceiling) "mKA" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -28063,14 +31436,17 @@ }, /area/lv522/indoors/a_block/admin) "mKN" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" - }, -/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/cargo_container/kelland/left, /turf/open/floor/corsat{ icon_state = "plate" }, /area/lv522/atmos/cargo_intake) +"mKQ" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/lv522/atmos/cargo_intake) "mLb" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -28084,6 +31460,18 @@ icon_state = "8,0" }, /area/lv522/oob) +"mLI" = ( +/obj/structure/barricade/deployable{ + dir = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "mLO" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 9 @@ -28103,7 +31491,7 @@ pixel_x = 8; pixel_y = 15 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) "mLW" = ( /obj/structure/machinery/portable_atmospherics/canister/empty/phoron{ @@ -28111,14 +31499,12 @@ layer = 3.1; pixel_y = 18 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) "mLX" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, -/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, -/obj/effect/landmark/xeno_spawn, +/obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat{ - dir = 10; + dir = 4; icon_state = "brown" }, /area/lv522/atmos/east_reactor/south) @@ -28129,6 +31515,13 @@ icon_state = "brown" }, /area/lv522/atmos/east_reactor/south) +"mMr" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/faxmachine/corporate, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "mMv" = ( /obj/structure/bed/chair/comfy{ dir = 4 @@ -28166,6 +31559,19 @@ /obj/structure/machinery/floodlight, /turf/open/floor/prison, /area/lv522/indoors/c_block/mining) +"mNf" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/surface/table/reinforced/prison, +/obj/item/ashtray/glass, +/obj/item/clothing/mask/cigarette{ + pixel_x = 6; + pixel_y = 12 + }, +/obj/item/clothing/mask/cigarette, +/turf/open/floor/strata{ + icon_state = "blue1" + }, +/area/lv522/indoors/a_block/dorm_north) "mNm" = ( /turf/open/floor/corsat, /area/lv522/atmos/east_reactor/east) @@ -28193,6 +31599,12 @@ icon_state = "white_cyan2" }, /area/lv522/indoors/a_block/medical/glass) +"mNI" = ( +/turf/open/floor/almayer{ + dir = 1; + icon_state = "w-y1" + }, +/area/lv522/oob/w_y_vault) "mNR" = ( /obj/structure/prop/ice_colony/dense/planter_box{ dir = 9 @@ -28225,12 +31637,18 @@ icon_state = "greenfull" }, /area/lv522/landing_zone_1/ceiling) -"mOl" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 10 +"mOh" = ( +/obj/structure/machinery/space_heater/radiator/red{ + pixel_y = 16 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, +/area/lv522/atmos/reactor_garage) +"mOl" = ( +/obj/structure/cargo_container/kelland/right, /turf/open/floor/corsat{ - icon_state = "squares" + icon_state = "plate" }, /area/lv522/atmos/cargo_intake) "mOs" = ( @@ -28262,6 +31680,12 @@ icon_state = "kitchen" }, /area/lv522/indoors/a_block/kitchen) +"mOI" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 6 + }, +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv522/atmos/way_in_command_centre) "mOJ" = ( /obj/structure/prop/ice_colony/dense/planter_box{ dir = 5 @@ -28316,15 +31740,29 @@ /turf/open/floor/carpet, /area/lv522/indoors/c_block/garage) "mPe" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "Reactor_garage_2" + }, +/obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat{ - dir = 5; - icon_state = "brown" + icon_state = "marked" }, -/area/lv522/atmos/cargo_intake) +/area/lv522/atmos/reactor_garage) +"mPj" = ( +/turf/closed/wall/strata_outpost, +/area/lv522/atmos/sewer) "mPr" = ( /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/south_street) +"mPs" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "mPy" = ( /obj/structure/largecrate/random/barrel/green, /turf/open/floor/prison{ @@ -28367,18 +31805,13 @@ "mPY" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, /obj/effect/landmark/xeno_spawn, -/turf/open/floor/corsat{ - icon_state = "brown" - }, +/turf/open/floor/corsat, /area/lv522/atmos/east_reactor/south) "mQd" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_full" }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/gm/river, +/turf/closed/wall/r_wall/biodome/biodome_unmeltable, /area/lv522/atmos/filt) "mQh" = ( /obj/structure/surface/table/almayer, @@ -28412,6 +31845,13 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/dorms/glass) +"mQt" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/corsat{ + dir = 5; + icon_state = "brown" + }, +/area/lv522/atmos/reactor_garage) "mQv" = ( /obj/effect/decal/cleanable/dirt, /obj/item/prop/colony/used_flare, @@ -28467,7 +31907,7 @@ pixel_x = 9; pixel_y = -2 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) "mRO" = ( /obj/structure/prop/structure_lattice, @@ -28478,10 +31918,11 @@ /turf/open/floor/wood, /area/lv522/indoors/a_block/executive) "mSc" = ( -/obj/effect/landmark/lv624/fog_blocker/short, -/obj/effect/landmark/lv624/fog_blocker/short, -/turf/closed/wall/strata_outpost/reinforced, -/area/lv522/oob/w_y_vault) +/obj/item/tool/wet_sign, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/cargo_intake) "mSe" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/bridges/garden_bridge) @@ -28535,6 +31976,12 @@ icon_state = "white_cyan1" }, /area/lv522/indoors/a_block/medical) +"mTE" = ( +/obj/structure/platform/strata{ + dir = 8 + }, +/turf/closed/wall/strata_ice/dirty, +/area/lv522/oob) "mTK" = ( /obj/structure/largecrate/supply/medicine/medkits, /obj/structure/largecrate/guns/merc{ @@ -28602,7 +32049,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "W" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) "mUG" = ( /obj/structure/platform_decoration, @@ -28651,6 +32098,10 @@ icon_state = "blue_plate" }, /area/lv522/indoors/a_block/bridges/op_centre) +"mVm" = ( +/obj/effect/decal/cleanable/dirt, +/turf/closed/wall/strata_outpost/reinforced, +/area/lv522/atmos/way_in_command_centre) "mVt" = ( /obj/structure/bed/chair/comfy{ dir = 8 @@ -28692,18 +32143,14 @@ }, /area/lv522/outdoors/nw_rockies) "mWd" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, +/obj/structure/largecrate/random/secure, +/turf/open/floor/prison, /area/lv522/landing_zone_2/ceiling) "mWw" = ( /obj/item/prop/colony/proptag{ desc = "A fallen marine's information dog tag. It reads, Corporal Donald 'Firefly' Harrow" }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/atmos/outdoor) "mWF" = ( @@ -28724,8 +32171,8 @@ "mXn" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/corsat{ - dir = 4; - icon_state = "browncorner" + dir = 10; + icon_state = "brown" }, /area/lv522/atmos/cargo_intake) "mXy" = ( @@ -28739,11 +32186,10 @@ }, /area/lv522/indoors/b_block/bar) "mXA" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - dir = 1 - }, +/obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat{ - icon_state = "marked" + dir = 8; + icon_state = "browncorner" }, /area/lv522/atmos/cargo_intake) "mYo" = ( @@ -28812,21 +32258,33 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms) +"mZM" = ( +/obj/structure/cargo_container/wy/left{ + layer = 5 + }, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/w_rockies) "mZN" = ( -/turf/open/asphalt/cement{ - icon_state = "cement9" +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 }, -/area/lv522/outdoors/n_rockies) +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/lv522/atmos/east_reactor/south) "mZQ" = ( /obj/structure/barricade/deployable, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/north_east_street) "mZU" = ( -/obj/structure/platform_decoration{ +/obj/structure/pipes/standard/manifold/hidden/green{ dir = 4 }, -/turf/open/gm/river, -/area/lv522/atmos/filt) +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/lv522/atmos/east_reactor/south) "mZW" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/gm/river, @@ -28855,7 +32313,7 @@ }, /area/lv522/outdoors/colony_streets/north_east_street) "nax" = ( -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_street) "naC" = ( /obj/structure/shuttle/engine/heater{ @@ -28960,6 +32418,12 @@ icon_state = "darkredfull2" }, /area/lv522/indoors/a_block/security) +"nbD" = ( +/obj/structure/machinery/light, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/command_centre) "nbE" = ( /obj/structure/cargo_container/kelland/right, /turf/open/floor/prison, @@ -28969,6 +32433,13 @@ icon_state = "77" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) +"nbT" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison{ + dir = 1; + icon_state = "cell_stripe" + }, +/area/lv522/atmos/cargo_intake) "ncg" = ( /obj/structure/platform{ dir = 8 @@ -28990,6 +32461,15 @@ icon_state = "darkredfull2" }, /area/lv522/outdoors/colony_streets/north_street) +"ncv" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "ncz" = ( /obj/structure/platform, /obj/effect/decal/warning_stripes{ @@ -29001,7 +32481,7 @@ }, /area/lv522/outdoors/colony_streets/north_east_street) "ncA" = ( -/obj/structure/blocker/forcefield/vehicles, +/obj/item/clothing/suit/storage/marine/medium, /turf/closed/wall/mineral/bone_resin, /area/lv522/oob) "ncJ" = ( @@ -29050,7 +32530,7 @@ icon_state = "NW-out"; pixel_y = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_west_street) "nee" = ( /obj/structure/pipes/standard/manifold/hidden/green, @@ -29065,6 +32545,18 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/security) +"nem" = ( +/obj/structure/transmitter/colony_net{ + phone_category = "LV522 Chances Claim"; + phone_color = "red"; + phone_id = "Colony Northern Dorms"; + pixel_y = 26 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/strata{ + icon_state = "blue1" + }, +/area/lv522/indoors/a_block/dorm_north) "nez" = ( /obj/item/ammo_magazine/rifle/heap{ current_rounds = 0 @@ -29074,6 +32566,15 @@ icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_east_street) +"neI" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/prison{ + dir = 8; + icon_state = "cell_stripe" + }, +/area/lv522/atmos/way_in_command_centre) "neO" = ( /obj/structure/machinery/light{ dir = 8 @@ -29120,6 +32621,13 @@ icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_east_street) +"nfk" = ( +/obj/item/lightstick/red/spoke/planted{ + pixel_x = 10; + pixel_y = 21 + }, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/central_streets) "nfm" = ( /obj/structure/machinery/light{ dir = 4 @@ -29134,8 +32642,8 @@ }, /area/lv522/indoors/a_block/bridges/garden_bridge) "nfq" = ( -/turf/closed/shuttle/dropship2/tornado{ - icon_state = "18" +/turf/closed/shuttle/dropship2/tornado/typhoon{ + icon_state = "36" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "nfP" = ( @@ -29269,14 +32777,18 @@ icon_state = "wood-broken" }, /area/lv522/indoors/b_block/bar) +"niT" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/strata{ + icon_state = "blue1" + }, +/area/lv522/indoors/a_block/dorm_north) "niU" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/obj/structure/foamed_metal, /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/floor/corsat{ - icon_state = "brown" - }, +/turf/open/floor/plating, /area/lv522/atmos/cargo_intake) "njd" = ( /obj/structure/platform_decoration, @@ -29290,6 +32802,28 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/c_block/mining) +"njn" = ( +/obj/effect/spawner/gibspawner/xeno, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1 + }, +/obj/effect/decal/cleanable/blood/xeno{ + icon_state = "xgib3" + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) +"njF" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/corsat{ + dir = 5; + icon_state = "brown" + }, +/area/lv522/atmos/east_reactor) "njH" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -29372,7 +32906,7 @@ pixel_x = 12; pixel_y = -7 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) "nlO" = ( /obj/structure/closet/crate, @@ -29419,7 +32953,7 @@ pixel_x = -6; pixel_y = -18 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) "nlW" = ( /obj/item/stack/sheet/wood, @@ -29438,6 +32972,16 @@ }, /turf/open/floor/carpet, /area/lv522/indoors/c_block/garage) +"nmt" = ( +/obj/structure/machinery/light, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "nmB" = ( /obj/structure/surface/table/almayer{ dir = 8; @@ -29488,9 +33032,9 @@ "nno" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/floor/corsat{ - icon_state = "brown" + icon_state = "marked" }, -/area/lv522/atmos/east_reactor/south) +/area/lv522/atmos/east_reactor) "nnv" = ( /obj/item/reagent_container/food/drinks/coffeecup/wy{ pixel_x = -4; @@ -29543,7 +33087,9 @@ }, /area/lv522/atmos/east_reactor/south) "noL" = ( -/obj/structure/blocker/invisible_wall, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 5 + }, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/nw_rockies) "noT" = ( @@ -29564,14 +33110,22 @@ }, /area/lv522/atmos/east_reactor/south) "npb" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 +/obj/effect/spawner/gibspawner/xeno, +/obj/effect/decal/cleanable/blood/xeno{ + icon_state = "xgib3" }, /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/floor/corsat{ - icon_state = "squares" + icon_state = "marked" }, /area/lv522/atmos/east_reactor/south) +"npd" = ( +/obj/structure/machinery/light, +/turf/open/floor/corsat{ + dir = 10; + icon_state = "brown" + }, +/area/lv522/atmos/east_reactor) "npp" = ( /obj/structure/girder, /obj/structure/prop/invuln/lattice_prop{ @@ -29686,6 +33240,13 @@ }, /turf/open/floor/plating, /area/lv522/oob) +"nqE" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/corsat{ + dir = 4; + icon_state = "brown" + }, +/area/lv522/atmos/cargo_intake) "nqN" = ( /obj/structure/machinery/camera/autoname{ dir = 8 @@ -29699,10 +33260,11 @@ }, /area/lv522/indoors/a_block/corpo/glass) "nqQ" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, -/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, -/turf/open/floor/prison, -/area/lv522/atmos/outdoor) +/obj/item/stack/sheet/metal, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "nqY" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -29721,8 +33283,12 @@ }, /area/lv522/indoors/a_block/dorms) "nrh" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, -/turf/open/floor/prison, +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_marked" + }, /area/lv522/atmos/outdoor) "nri" = ( /obj/structure/platform_decoration, @@ -29745,7 +33311,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "W" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/nw_rockies) "nrA" = ( /obj/structure/surface/rack, @@ -29767,12 +33333,34 @@ icon_state = "white_cyan1" }, /area/lv522/indoors/a_block/medical/glass) +"nrL" = ( +/obj/structure/surface/table/almayer{ + dir = 8; + flipped = 1 + }, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/prison{ + dir = 1; + icon_state = "blue_plate" + }, +/area/lv522/indoors/a_block/admin) "nrP" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/security) +"nrT" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/shiva{ + icon_state = "radiator_tile2" + }, +/area/lv522/indoors/a_block/corpo/glass) "nsd" = ( /obj/effect/decal/cleanable/generic, /turf/open/floor/prison{ @@ -29818,8 +33406,8 @@ pixel_x = -20; pixel_y = 24 }, -/turf/closed/wall/r_wall/biodome/biodome_unmeltable, -/area/lv522/oob) +/turf/closed/wall/mineral/bone_resin, +/area/lv522/atmos/east_reactor/south) "ntK" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ @@ -29828,17 +33416,28 @@ }, /area/lv522/indoors/c_block/mining) "ntL" = ( -/obj/structure/prop/invuln/ice_prefab/trim{ - dir = 6 - }, -/turf/open/auto_turf/shale/layer1, -/area/lv522/outdoors/w_rockies) +/obj/item/stack/sheet/metal, +/turf/open/floor/corsat, +/area/lv522/atmos/reactor_garage) "ntN" = ( /obj/structure/platform{ dir = 4 }, /turf/closed/wall/mineral/bone_resin, /area/lv522/oob) +"ntQ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "ntS" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/camera/autoname, @@ -29872,10 +33471,12 @@ icon_state = "marked" }, /area/lv522/indoors/b_block/hydro) -"num" = ( -/obj/structure/pipes/standard/manifold/hidden/green, -/turf/open/floor/plating/plating_catwalk/prison, -/area/lv522/atmos/cargo_intake) +"nuo" = ( +/obj/structure/machinery/light, +/turf/open/floor/strata{ + icon_state = "blue1" + }, +/area/lv522/indoors/a_block/dorm_north) "nuG" = ( /obj/structure/platform{ dir = 4 @@ -29921,10 +33522,8 @@ }, /area/lv522/landing_zone_1/ceiling) "nvd" = ( -/obj/effect/landmark/monkey_spawn, -/turf/open/floor/corsat{ - icon_state = "plate" - }, +/obj/structure/girder/reinforced, +/turf/open/floor/plating, /area/lv522/atmos/cargo_intake) "nvt" = ( /obj/effect/decal/cleanable/dirt, @@ -29963,9 +33562,12 @@ }, /area/lv522/indoors/a_block/dorms) "nwR" = ( -/obj/structure/cargo_container/kelland/left, -/turf/open/floor/corsat{ - icon_state = "plate" +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, /area/lv522/atmos/east_reactor/south) "nwZ" = ( @@ -30008,9 +33610,15 @@ }, /area/lv522/indoors/a_block/admin) "nxQ" = ( -/obj/structure/cargo_container/kelland/right, -/turf/open/floor/corsat{ - icon_state = "plate" +/obj/structure/bed/chair/comfy{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, /area/lv522/atmos/east_reactor/south) "nye" = ( @@ -30052,11 +33660,9 @@ }, /area/lv522/oob) "nzR" = ( -/obj/structure/prop/invuln/ice_prefab{ - dir = 5 - }, -/turf/open/auto_turf/shale/layer1, -/area/lv522/outdoors/w_rockies) +/obj/item/stack/sheet/metal, +/turf/closed/wall/r_wall/biodome/biodome_unmeltable, +/area/lv522/atmos/cargo_intake) "nzU" = ( /obj/structure/barricade/deployable, /turf/open/floor/prison{ @@ -30069,7 +33675,7 @@ pixel_x = -16; pixel_y = 9 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) "nAa" = ( /obj/structure/bed/stool, @@ -30099,6 +33705,19 @@ "nBe" = ( /turf/open/floor/plating, /area/lv522/indoors/a_block/kitchen/damage) +"nBo" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/machinery/door/airlock/almayer/generic/glass, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/way_in_command_centre) +"nBs" = ( +/obj/structure/largecrate/random/barrel/green, +/turf/open/auto_turf/shale/layer2, +/area/lv522/outdoors/colony_streets/north_west_street) "nBv" = ( /obj/item/prop/alien/hugger{ pixel_x = 3; @@ -30118,11 +33737,27 @@ /obj/item/tool/scythe, /turf/open/floor/prison, /area/lv522/indoors/b_block/hydro) +"nCa" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/n_rockies) "nCt" = ( /obj/effect/decal/cleanable/blood/gibs/xeno/body, /obj/effect/spawner/gibspawner/xeno, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/w_rockies) +"nCC" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + layer = 2.5; + pixel_x = -1; + pixel_y = 1 + }, +/turf/open/floor{ + dir = 4; + icon_state = "whiteyellowfull" + }, +/area/lv522/oob/w_y_vault) "nCX" = ( /obj/structure/largecrate/random/barrel, /turf/open/floor/corsat{ @@ -30154,7 +33789,7 @@ dir = 4 }, /obj/structure/platform, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_2) "nDz" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -30172,31 +33807,38 @@ /turf/open/asphalt/cement, /area/lv522/outdoors/colony_streets/east_central_street) "nDM" = ( -/obj/structure/largecrate/random/barrel/white, -/turf/open/floor/prison, +/turf/closed/wall/strata_outpost/reinforced, /area/lv522/outdoors/n_rockies) "nDR" = ( /obj/item/tool/wrench, /turf/open/floor/prison, /area/lv522/indoors/c_block/mining) +"nDS" = ( +/obj/structure/transmitter/colony_net{ + phone_category = "LV522 Chances Claim"; + phone_color = "red"; + phone_id = "Colony Dorms"; + pixel_y = 26 + }, +/turf/open/floor/prison, +/area/lv522/indoors/a_block/dorms) "nEd" = ( -/obj/structure/platform{ - dir = 4 +/obj/structure/surface/table/almayer, +/obj/structure/machinery/prop/almayer/computer/PC{ + dir = 8; + pixel_y = -1 }, -/obj/structure/platform{ - dir = 8 +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 }, -/obj/structure/prop/invuln/overhead_pipe{ - dir = 1; - name = "overhead pipe"; - pixel_x = -8; - pixel_y = -6 +/obj/structure/machinery/light{ + dir = 1 }, -/obj/structure/prop/invuln/pipe_water{ - pixel_y = 17 +/turf/open/floor/prison{ + icon_state = "floor_plate" }, -/turf/open/gm/river, -/area/lv522/atmos/cargo_intake) +/area/lv522/atmos/east_reactor/south) "nEq" = ( /obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/plating/plating_catwalk/prison, @@ -30212,16 +33854,22 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/lone_buildings/engineering) +"nFc" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv522/atmos/way_in_command_centre) "nFj" = ( /turf/open/floor/plating, /area/lv522/landing_zone_1) "nFt" = ( -/obj/structure/blocker/forcefield/vehicles, -/obj/structure/blocker/invisible_wall, +/obj/structure/pipes/vents/pump, +/obj/structure/machinery/power/apc/weak{ + dir = 1 + }, /turf/open/floor/corsat{ icon_state = "plate" }, -/area/lv522/oob) +/area/lv522/atmos/filt) "nFM" = ( /obj/effect/landmark/objective_landmark/science, /obj/effect/decal/cleanable/dirt, @@ -30243,7 +33891,7 @@ /area/lv522/indoors/c_block/casino) "nFO" = ( /obj/structure/prop/invuln/ice_prefab{ - dir = 9 + dir = 5 }, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/w_rockies) @@ -30264,7 +33912,7 @@ "nGe" = ( /obj/structure/cargo_container/kelland/left, /obj/effect/landmark/lv624/fog_blocker/short, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_1) "nGq" = ( /obj/effect/spawner/gibspawner/xeno, @@ -30288,7 +33936,7 @@ icon_state = "NW-out"; pixel_y = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_west_street) "nGC" = ( /obj/structure/stairs/perspective{ @@ -30312,6 +33960,12 @@ icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_street) +"nHg" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/shiva{ + icon_state = "radiator_tile2" + }, +/area/lv522/atmos/way_in_command_centre) "nHi" = ( /turf/open/floor/prison{ dir = 10; @@ -30380,10 +34034,20 @@ "nJv" = ( /turf/closed/wall/strata_outpost, /area/lv522/indoors/lone_buildings/engineering) +"nJO" = ( +/obj/structure/surface/table/almayer, +/obj/effect/landmark/objective_landmark/far, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "nJV" = ( /obj/structure/noticeboard, -/turf/closed/wall/solaris/reinforced/hull/lv522, -/area/lv522/oob) +/turf/closed/wall/strata_outpost, +/area/lv522/outdoors/colony_streets/windbreaker/observation) "nKh" = ( /obj/structure/machinery/camera/autoname{ dir = 8 @@ -30489,7 +34153,6 @@ }, /area/lv522/outdoors/colony_streets/north_street) "nLW" = ( -/obj/item/tool/weldingtool/simple, /obj/structure/pipes/standard/manifold/hidden/green{ dir = 8 }, @@ -30509,6 +34172,10 @@ icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/engineering) +"nMl" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison, +/area/lv522/atmos/reactor_garage) "nMt" = ( /obj/structure/surface/table/almayer, /obj/effect/decal/cleanable/dirt, @@ -30518,14 +34185,14 @@ }, /area/lv522/indoors/a_block/security) "nMw" = ( -/obj/item/clothing/head/hardhat, -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 +/obj/effect/decal/cleanable/dirt, +/obj/item/ammo_magazine/rifle/heap{ + current_rounds = 0 }, -/turf/open/floor/corsat{ - icon_state = "squares" +/turf/open/floor/shiva{ + icon_state = "radiator_tile2" }, -/area/lv522/atmos/cargo_intake) +/area/lv522/atmos/way_in_command_centre) "nMz" = ( /obj/item/prop/alien/hugger, /obj/structure/pipes/standard/simple/hidden/green{ @@ -30536,6 +34203,13 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) +"nMB" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood/ship, +/area/lv522/atmos/way_in_command_centre) "nMC" = ( /obj/structure/platform{ dir = 4 @@ -30565,6 +34239,10 @@ icon_state = "marked" }, /area/lv522/outdoors/colony_streets/north_street) +"nMX" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/prison, +/area/lv522/atmos/way_in_command_centre) "nNf" = ( /obj/structure/platform{ dir = 8 @@ -30624,11 +34302,13 @@ }, /area/lv522/indoors/a_block/corpo/glass) "nNL" = ( -/obj/structure/machinery/door/airlock/almayer/maint, -/turf/open/floor/corsat{ - icon_state = "marked" +/obj/item/ammo_magazine/rifle, +/obj/item/ammo_magazine/rifle{ + pixel_x = -10; + pixel_y = 9 }, -/area/lv522/atmos/cargo_intake) +/turf/open/asphalt/cement, +/area/lv522/outdoors/nw_rockies) "nNM" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 4 @@ -30723,7 +34403,7 @@ /obj/structure/platform_decoration{ dir = 6 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_2) "nPc" = ( /obj/structure/platform_decoration, @@ -30762,7 +34442,14 @@ "nPN" = ( /turf/closed/shuttle/dropship2/tornado, /area/lv522/landing_zone_forecon/UD6_Tornado) +"nPV" = ( +/obj/structure/bed/chair/comfy, +/turf/open/floor/prison, +/area/lv522/atmos/way_in_command_centre) "nQa" = ( +/obj/structure/platform_decoration{ + dir = 8 + }, /turf/open/asphalt/cement{ icon_state = "cement14" }, @@ -30789,7 +34476,7 @@ /area/lv522/outdoors/colony_streets/north_street) "nQz" = ( /obj/structure/platform_decoration, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_1) "nQG" = ( /obj/item/stack/sheet/wood, @@ -30801,6 +34488,13 @@ icon_state = "cement4" }, /area/lv522/outdoors/colony_streets/north_west_street) +"nQO" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + dir = 6; + icon_state = "brown" + }, +/area/lv522/atmos/reactor_garage) "nQQ" = ( /obj/item/storage/backpack/marine/satchel{ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; @@ -30810,7 +34504,7 @@ pixel_x = 4; pixel_y = 21 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) "nQT" = ( /obj/structure/machinery/door/airlock/almayer/maint, @@ -30829,6 +34523,21 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) +"nRs" = ( +/obj/structure/prop/ice_colony/ground_wire{ + dir = 8 + }, +/obj/structure/prop/ice_colony/ground_wire, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/colony_streets/central_streets) +"nRy" = ( +/obj/structure/closet/fireaxecabinet{ + pixel_y = 29 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/sewer) "nRJ" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/faxmachine, @@ -30923,18 +34632,18 @@ }, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorm_north) +"nTj" = ( +/obj/effect/landmark/lv624/fog_blocker/short, +/turf/closed/wall/strata_outpost/reinforced/hull, +/area/lv522/oob/w_y_vault) "nTl" = ( -/obj/effect/landmark/xeno_hive_spawn, -/obj/effect/landmark/ert_spawns/groundside_xeno, -/turf/open/floor/corsat{ - icon_state = "plate" - }, +/turf/closed/wall/r_wall/biodome/biodome_unmeltable, /area/lv522/atmos/east_reactor) "nTp" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_full" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) "nTv" = ( /turf/closed/wall/strata_outpost, @@ -30970,6 +34679,9 @@ /turf/open/floor/prison, /area/lv522/landing_zone_1) "nUD" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 9 + }, /turf/open/floor/corsat{ dir = 1; icon_state = "browncorner" @@ -31031,7 +34743,7 @@ "nVN" = ( /obj/item/ammo_magazine/flamer_tank/empty, /obj/effect/decal/cleanable/liquid_fuel, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/north_street) "nVR" = ( /obj/structure/platform_decoration{ @@ -31051,6 +34763,9 @@ "nVW" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/fence, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, /turf/open/floor/prison{ icon_state = "floor_plate" }, @@ -31236,7 +34951,7 @@ icon_state = "E"; pixel_x = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_street) "nXY" = ( /obj/effect/decal/cleanable/dirt, @@ -31254,11 +34969,24 @@ icon_state = "blue" }, /area/lv522/indoors/a_block/hallway) +"nYz" = ( +/obj/structure/platform{ + dir = 4 + }, +/turf/open/asphalt/cement{ + icon_state = "cement3" + }, +/area/lv522/outdoors/n_rockies) "nYF" = ( /obj/item/weapon/twohanded/folded_metal_chair, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/bridges/garden_bridge) +"nYM" = ( +/obj/structure/cargo_container/wy/mid, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/w_rockies) "nYQ" = ( /obj/structure/platform_decoration{ dir = 1 @@ -31334,21 +35062,19 @@ }, /area/lv522/outdoors/n_rockies) "oaj" = ( -/obj/structure/fence{ - layer = 2.9 - }, /obj/structure/pipes/standard/simple/hidden/green, +/turf/closed/wall/r_wall/biodome/biodome_unmeltable, +/area/lv522/atmos/cargo_intake) +"oan" = ( /obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" + icon_state = "E"; + pixel_x = 1 }, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/turf/open/floor{ + dir = 4; + icon_state = "whiteyellowfull" }, -/area/lv522/outdoors/colony_streets/central_streets) +/area/lv522/oob/w_y_vault) "oaq" = ( /obj/item/storage/backpack/marine/satchel{ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; @@ -31500,17 +35226,14 @@ }, /area/lv522/indoors/a_block/bridges/dorms_fitness) "oem" = ( -/obj/structure/pipes/standard/simple/hidden/green{ +/obj/structure/bed/chair/comfy{ dir = 4 }, -/obj/structure/barricade/handrail/wire{ - layer = 3.1 - }, /turf/open/floor/prison{ dir = 4; - icon_state = "greenfull" + icon_state = "cell_stripe" }, -/area/lv522/indoors/a_block/fitness) +/area/lv522/atmos/east_reactor/south) "oet" = ( /obj/structure/prop/dam/crane/cargo{ dir = 1 @@ -31576,9 +35299,15 @@ icon_state = "blue_plate" }, /area/lv522/indoors/c_block/mining) +"oeU" = ( +/obj/structure/bed/chair/comfy{ + dir = 1 + }, +/turf/open/floor/prison, +/area/lv522/atmos/way_in_command_centre) "oeX" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/n_rockies) "ofd" = ( /obj/structure/window/framed/strata/reinforced, @@ -31594,14 +35323,8 @@ dir = 4; pixel_x = -9 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/central_streets) -"ofF" = ( -/obj/structure/prop/dam/truck/cargo, -/turf/open/asphalt/cement{ - icon_state = "cement1" - }, -/area/lv522/landing_zone_2) "ofS" = ( /obj/structure/cargo_container/kelland/left, /turf/open/floor/prison{ @@ -31775,6 +35498,12 @@ icon_state = "marked" }, /area/lv522/indoors/a_block/garden) +"oim" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/corsat, +/area/lv522/atmos/east_reactor) "oiA" = ( /obj/structure/stairs/perspective{ dir = 4; @@ -31792,7 +35521,7 @@ icon_state = "p_stair_full" }, /obj/effect/landmark/lv624/fog_blocker/short, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_1) "oiD" = ( /obj/structure/machinery/light/double/blue{ @@ -31804,13 +35533,6 @@ icon_state = "plate" }, /area/lv522/indoors/c_block/mining) -"oiK" = ( -/obj/structure/prop/turbine_extras/border, -/obj/structure/prop/turbine, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/lv522/landing_zone_2/ceiling) "oiP" = ( /obj/structure/platform_decoration{ dir = 1 @@ -31828,10 +35550,8 @@ }, /area/lv522/indoors/lone_buildings/storage_blocks) "oiW" = ( -/obj/effect/landmark/monkey_spawn, -/turf/open/floor/corsat{ - icon_state = "squares" - }, +/obj/structure/foamed_metal, +/turf/open/floor/plating, /area/lv522/atmos/cargo_intake) "oiY" = ( /obj/effect/landmark/lv624/fog_blocker/short, @@ -31859,6 +35579,12 @@ icon_state = "greenfull" }, /area/lv522/landing_zone_1/ceiling) +"ojn" = ( +/obj/structure/surface/table/almayer, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/lv522/atmos/east_reactor) "ojp" = ( /turf/closed/wall/strata_outpost, /area/lv522/indoors/a_block/bridges/garden_bridge) @@ -31901,6 +35627,29 @@ icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) +"okj" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/storage/backpack/marine/satchel{ + desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; + icon = 'icons/obj/janitor.dmi'; + icon_state = "trashbag3"; + name = "trash bag"; + pixel_x = -4; + pixel_y = 6 + }, +/obj/item/storage/backpack/marine/satchel{ + desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; + icon = 'icons/obj/janitor.dmi'; + icon_state = "trashbag3"; + name = "trash bag"; + pixel_x = 3; + pixel_y = -2 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "cell_stripe" + }, +/area/lv522/atmos/sewer) "okA" = ( /obj/structure/surface/rack, /obj/structure/machinery/camera/autoname{ @@ -31988,6 +35737,14 @@ icon_state = "cement4" }, /area/lv522/outdoors/colony_streets/north_east_street) +"onM" = ( +/obj/structure/barricade/deployable{ + dir = 1 + }, +/turf/open/floor/shiva{ + icon_state = "radiator_tile2" + }, +/area/lv522/atmos/way_in_command_centre) "onT" = ( /obj/structure/largecrate/random, /obj/effect/decal/cleanable/dirt, @@ -32164,6 +35921,12 @@ }, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) +"orm" = ( +/obj/structure/platform/strata{ + dir = 4 + }, +/turf/closed/wall/strata_ice/dirty, +/area/lv522/oob) "ort" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ @@ -32179,7 +35942,7 @@ /area/lv522/indoors/a_block/hallway) "orE" = ( /obj/item/prop/colony/used_flare, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/w_rockies) "orI" = ( /obj/structure/surface/table/almayer, @@ -32200,7 +35963,7 @@ /obj/structure/prop/invuln/ice_prefab/roof_greeble{ icon_state = "smokestack" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) "orS" = ( /obj/effect/decal/cleanable/blood/xeno, @@ -32231,6 +35994,17 @@ icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) +"osm" = ( +/obj/structure/transmitter/colony_net{ + phone_category = "LV522 Chances Claim"; + phone_color = "red"; + phone_id = "Reactor Sewer"; + pixel_y = 26 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/sewer) "osN" = ( /turf/open/asphalt/cement{ icon_state = "cement4" @@ -32268,6 +36042,15 @@ icon_state = "marked" }, /area/lv522/indoors/a_block/medical) +"otx" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 9 + }, +/obj/structure/platform_decoration, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/sewer) "otC" = ( /obj/structure/machinery/colony_floodlight{ layer = 4.3; @@ -32342,6 +36125,16 @@ }, /turf/open/gm/river, /area/lv522/outdoors/colony_streets/south_street) +"ouv" = ( +/obj/structure/pipes/vents/pump, +/obj/structure/machinery/camera/autoname, +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/strata{ + icon_state = "blue1" + }, +/area/lv522/indoors/a_block/dorm_north) "ouG" = ( /obj/structure/barricade/deployable{ dir = 8 @@ -32389,7 +36182,7 @@ icon_state = "p_stair_full" }, /obj/structure/platform, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/indoors/a_block/bridges/dorms_fitness) "owe" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -32434,6 +36227,22 @@ }, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) +"oxt" = ( +/obj/structure/fence{ + layer = 2.9 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/lv522/outdoors/colony_streets/north_street) "oxH" = ( /obj/structure/barricade/handrail/strata{ dir = 8 @@ -32482,6 +36291,12 @@ icon_state = "blue_plate" }, /area/lv522/indoors/a_block/admin) +"oyK" = ( +/obj/effect/spawner/gibspawner/xeno, +/turf/open/floor/corsat{ + icon_state = "brown" + }, +/area/lv522/atmos/east_reactor/south) "oyM" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat{ @@ -32499,7 +36314,7 @@ "oyY" = ( /obj/structure/largecrate, /obj/effect/landmark/lv624/fog_blocker/short, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_1) "ozk" = ( /obj/structure/prop/invuln/lattice_prop{ @@ -32540,9 +36355,6 @@ "ozJ" = ( /obj/structure/surface/table/almayer, /obj/effect/landmark/objective_landmark/far, -/obj/structure/machinery/power/apc/weak{ - dir = 1 - }, /turf/open/floor/strata{ icon_state = "blue1" }, @@ -32589,7 +36401,7 @@ /obj/structure/platform_decoration{ dir = 9 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) "oAJ" = ( /obj/structure/bookcase{ @@ -32602,6 +36414,25 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) +"oAY" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/filingcabinet{ + density = 0; + pixel_x = -8; + pixel_y = 16 + }, +/obj/structure/filingcabinet{ + density = 0; + pixel_x = 8; + pixel_y = 16 + }, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "oBf" = ( /obj/structure/bed/chair/wheelchair, /turf/open/floor/prison, @@ -32616,7 +36447,6 @@ /turf/open/floor/plating, /area/lv522/landing_zone_1/tunnel) "oBx" = ( -/obj/item/prop/alien/hugger, /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorm_north) @@ -32679,12 +36509,29 @@ }, /turf/open/floor/plating, /area/lv522/landing_zone_1/tunnel) +"oDj" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + dir = 1 + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/reactor_garage) "oDu" = ( /obj/structure/machinery/door/airlock/almayer/maint, /turf/open/floor/corsat{ icon_state = "marked" }, /area/lv522/indoors/a_block/dorms) +"oDU" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/command_centre) "oDZ" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ @@ -32692,6 +36539,14 @@ icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) +"oEc" = ( +/obj/structure/largecrate/random/secure, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_marked" + }, +/area/lv522/landing_zone_2/ceiling) "oEw" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -32843,6 +36698,18 @@ icon_state = "blue" }, /area/lv522/indoors/a_block/admin) +"oHR" = ( +/obj/structure/transmitter/colony_net{ + dir = 4; + phone_category = "LV522 Chances Claim"; + phone_color = "red"; + phone_id = "Colony Security"; + pixel_x = -16 + }, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, +/area/lv522/indoors/a_block/security/glass) "oIr" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ @@ -32937,7 +36804,7 @@ /obj/structure/platform_decoration{ dir = 6 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_1) "oKe" = ( /obj/structure/pipes/standard/manifold/hidden/green{ @@ -32963,7 +36830,7 @@ dir = 10 }, /obj/effect/landmark/lv624/fog_blocker/short, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_1) "oKI" = ( /obj/structure/stairs/perspective{ @@ -32977,9 +36844,22 @@ }, /area/lv522/outdoors/colony_streets/north_east_street) "oKK" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor/plating/plating_catwalk/prison, -/area/lv522/atmos/filt) +/turf/open/floor/prison{ + dir = 8; + icon_state = "cell_stripe" + }, +/area/lv522/atmos/east_reactor/south) +"oKN" = ( +/obj/structure/transmitter/colony_net{ + phone_category = "LV522 Chances Claim"; + phone_color = "red"; + phone_id = "Reactor Central Office"; + pixel_y = 26 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/command_centre) "oKP" = ( /obj/structure/machinery/autolathe, /obj/effect/decal/cleanable/dirt, @@ -33061,6 +36941,15 @@ icon_state = "white_cyan2" }, /area/lv522/indoors/a_block/medical) +"oLK" = ( +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/reactor_garage) +"oLU" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat, +/area/lv522/oob) "oLW" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -33085,6 +36974,14 @@ icon_state = "darkredfull2" }, /area/lv522/indoors/a_block/bridges/op_centre) +"oMo" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/device/flashlight/lamp/green{ + layer = 3.5; + pixel_y = 13 + }, +/turf/open/floor/wood/ship, +/area/lv522/atmos/way_in_command_centre) "oML" = ( /turf/open/floor/corsat{ icon_state = "brown" @@ -33148,6 +37045,13 @@ icon_state = "marked" }, /area/lv522/indoors/lone_buildings/storage_blocks) +"oOD" = ( +/obj/structure/prop/invuln/ice_prefab{ + dir = 1; + icon_state = "fab_2" + }, +/turf/open/auto_turf/shale/layer2, +/area/lv522/outdoors/w_rockies) "oOS" = ( /turf/open/asphalt/cement, /area/lv522/outdoors/colony_streets/north_west_street) @@ -33213,7 +37117,7 @@ /area/lv522/indoors/a_block/dorm_north) "oQC" = ( /obj/structure/platform_decoration, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) "oQN" = ( /obj/structure/largecrate/random/case, @@ -33285,7 +37189,7 @@ pixel_x = 17; pixel_y = 31 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) "oSA" = ( /obj/structure/surface/rack, @@ -33307,6 +37211,7 @@ /area/lv522/indoors/a_block/bridges) "oSX" = ( /obj/structure/blocker/forcefield/vehicles, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/floor/corsat{ icon_state = "marked" }, @@ -33320,7 +37225,7 @@ icon_state = "p_stair_full" }, /obj/structure/platform/stair_cut, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/indoors/a_block/bridges/dorms_fitness) "oTd" = ( /obj/structure/cargo_container/ferret/mid, @@ -33363,7 +37268,7 @@ /obj/structure/prop/ice_colony/ground_wire{ dir = 4 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) "oTG" = ( /obj/structure/largecrate/random, @@ -33395,7 +37300,7 @@ /area/lv522/landing_zone_2) "oTX" = ( /obj/effect/spawner/gibspawner/xeno, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/nw_rockies) "oTY" = ( /obj/structure/flora/jungle/plantbot1, @@ -33410,6 +37315,9 @@ icon_state = "wood" }, /area/lv522/indoors/b_block/bar) +"oUq" = ( +/turf/closed/wall/strata_outpost/reinforced, +/area/lv522/atmos/way_in_command_centre) "oUC" = ( /obj/structure/prop/invuln/overhead/flammable_pipe/fly{ pixel_y = 6 @@ -33418,6 +37326,16 @@ icon_state = "plate" }, /area/lv522/atmos/east_reactor) +"oUE" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1; + pixel_y = -1 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "oUZ" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/corsat{ @@ -33438,6 +37356,11 @@ }, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) +"oVt" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat, +/area/lv522/oob) "oVA" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/reagent_container/food/drinks/coffee, @@ -33478,6 +37401,23 @@ icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) +"oVO" = ( +/obj/structure/fence{ + layer = 2.9 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/lv522/outdoors/colony_streets/north_street) "oVS" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat{ @@ -33511,6 +37451,13 @@ icon_state = "marked" }, /area/lv522/landing_zone_1/tunnel) +"oWS" = ( +/obj/item/prop/colony/used_flare, +/obj/structure/machinery/light, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "oWV" = ( /obj/structure/machinery/light{ dir = 4 @@ -33525,6 +37472,14 @@ }, /turf/open/floor/prison, /area/lv522/indoors/a_block/kitchen/glass) +"oXk" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison{ + dir = 8; + icon_state = "cell_stripe" + }, +/area/lv522/atmos/reactor_garage) "oXp" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 9 @@ -33582,7 +37537,7 @@ /area/lv522/indoors/a_block/hallway) "oXZ" = ( /obj/structure/cargo_container/kelland/left, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/east_central_street) "oYa" = ( /obj/structure/stairs/perspective{ @@ -33590,12 +37545,22 @@ icon_state = "p_stair_full" }, /obj/structure/platform, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/indoors/a_block/bridges/dorms_fitness) +"oYu" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "oYM" = ( /obj/structure/platform_decoration, /obj/effect/landmark/lv624/fog_blocker/short, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_1) "oYO" = ( /obj/structure/platform{ @@ -33605,7 +37570,7 @@ dir = 8 }, /obj/structure/platform, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_2) "oYZ" = ( /obj/effect/decal/cleanable/dirt, @@ -33623,8 +37588,13 @@ /area/lv522/indoors/a_block/fitness) "oZN" = ( /obj/structure/platform, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) +"pab" = ( +/obj/structure/machinery/landinglight/ds2/delayone, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/lv522/landing_zone_2) "pag" = ( /obj/structure/largecrate/random/secure, /obj/structure/largecrate/random/secure{ @@ -33652,8 +37622,14 @@ "paT" = ( /obj/structure/cargo_container/kelland/right, /obj/effect/landmark/lv624/fog_blocker/short, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_1) +"pbi" = ( +/obj/structure/machinery/door_control/brbutton{ + id = "Reactor_garage_1" + }, +/turf/closed/wall/strata_outpost/reinforced, +/area/lv522/atmos/reactor_garage) "pbp" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/dorms/glass) @@ -33676,6 +37652,10 @@ icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/storage_blocks) +"pco" = ( +/obj/structure/pipes/standard/manifold/fourway/hidden/green, +/turf/open/floor/prison, +/area/lv522/atmos/way_in_command_centre) "pcr" = ( /obj/structure/filingcabinet/seeds{ density = 0; @@ -33700,6 +37680,10 @@ icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/outdoor_bot) +"pcH" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv522/atmos/way_in_command_centre) "pcO" = ( /obj/structure/stairs/perspective{ dir = 5; @@ -33715,6 +37699,17 @@ /obj/item/weapon/twohanded/fireaxe, /turf/open/floor/prison, /area/lv522/indoors/a_block/security/glass) +"pcV" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/sewer) "pdp" = ( /obj/structure/prop/invuln/overhead_pipe{ dir = 8; @@ -33802,12 +37797,24 @@ dir = 9; icon_state = "p_stair_full" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) +"pex" = ( +/obj/structure/barricade/deployable{ + dir = 1 + }, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/prison{ + dir = 1; + icon_state = "cell_stripe" + }, +/area/lv522/atmos/way_in_command_centre) "pez" = ( /obj/structure/cargo_container/horizontal/blue/top, /obj/effect/landmark/lv624/fog_blocker/short, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_1) "peM" = ( /obj/structure/platform_decoration{ @@ -33912,7 +37919,10 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 4; + id = "Reactor_e_entry_3" + }, /turf/open/floor/corsat{ icon_state = "marked" }, @@ -33942,7 +37952,7 @@ pixel_x = 10; pixel_y = 21 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/central_streets) "pgn" = ( /obj/effect/decal/cleanable/dirt, @@ -33981,6 +37991,13 @@ icon_state = "darkredfull2" }, /area/lv522/indoors/a_block/security) +"pgy" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/lv522/atmos/west_reactor) "pgG" = ( /obj/structure/platform_decoration{ dir = 4 @@ -33996,13 +38013,15 @@ icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_east_street) -"pgL" = ( +"pgJ" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, -/turf/open/floor/prison{ - dir = 10; - icon_state = "floor_marked" +/obj/structure/machinery/light{ + dir = 4 }, -/area/lv522/atmos/outdoor) +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/lv522/atmos/east_reactor) "pha" = ( /obj/structure/bed/chair{ can_buckle = 0; @@ -34057,7 +38076,7 @@ /area/lv522/landing_zone_1/ceiling) "pit" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/nw_rockies) "piD" = ( /turf/open/floor/plating/plating_catwalk/prison, @@ -34076,9 +38095,16 @@ /turf/open/floor/wood, /area/lv522/indoors/a_block/fitness/glass) "piW" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/turf/open/auto_turf/shale/layer1, -/area/lv522/outdoors/n_rockies) +/obj/structure/surface/table/almayer, +/obj/item/paper_bin{ + pixel_x = 7; + pixel_y = 7 + }, +/obj/item/tool/pen/blue/clicky, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/east_reactor/south) "piY" = ( /obj/structure/platform{ dir = 4 @@ -34150,6 +38176,16 @@ icon_state = "9" }, /area/lv522/landing_zone_forecon/UD6_Tornado) +"pkE" = ( +/obj/structure/powerloader_wreckage, +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/lv522/atmos/reactor_garage) "pkH" = ( /obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison{ @@ -34158,12 +38194,17 @@ }, /area/lv522/landing_zone_1) "plb" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic, +/obj/structure/machinery/door_display/research_cell{ + dir = 4; + id = "Reactor_e_entry_4"; + pixel_x = -16; + req_access = null + }, /turf/open/floor/corsat{ - icon_state = "marked" + dir = 1; + icon_state = "brown" }, -/area/lv522/indoors/a_block/fitness) +/area/lv522/atmos/filt) "pli" = ( /obj/effect/decal/cleanable/dirt, /obj/item/prop/colony/used_flare, @@ -34277,7 +38318,7 @@ /area/lv522/indoors/a_block/hallway) "poZ" = ( /obj/structure/cargo_container/kelland/right, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) "pps" = ( /turf/closed/shuttle/dropship2/tornado/typhoon{ @@ -34297,7 +38338,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "S" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) "ppF" = ( /turf/closed/shuttle/dropship2/tornado/typhoon{ @@ -34364,6 +38405,12 @@ icon_state = "cyan2" }, /area/lv522/indoors/a_block/medical) +"pqQ" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv522/atmos/sewer) "pqR" = ( /obj/effect/decal/cleanable/cobweb2, /turf/open/asphalt/cement, @@ -34388,7 +38435,6 @@ /turf/open/floor/prison, /area/lv522/outdoors/colony_streets/north_west_street) "prT" = ( -/obj/structure/pipes/standard/simple/hidden/green, /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /obj/structure/cargo_container/grant/rightmid, /turf/open/auto_turf/shale/layer1, @@ -34446,18 +38492,15 @@ pixel_x = 1; pixel_y = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) "psq" = ( -/obj/structure/machinery/power/apc/weak{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison{ - dir = 4; - icon_state = "greenfull" +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "brown" }, -/area/lv522/indoors/a_block/fitness) +/area/lv522/atmos/filt) "psC" = ( /turf/closed/wall/strata_outpost/reinforced/hull, /area/lv522/indoors/a_block/hallway) @@ -34480,14 +38523,12 @@ }, /area/lv522/indoors/a_block/hallway) "ptc" = ( -/obj/structure/bed/chair, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/cobweb, -/turf/open/floor/prison{ - dir = 4; - icon_state = "greenfull" +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "browncorner" }, -/area/lv522/indoors/a_block/fitness) +/area/lv522/atmos/filt) "ptp" = ( /obj/structure/machinery/light, /obj/effect/decal/cleanable/dirt, @@ -34512,16 +38553,6 @@ icon_state = "cement4" }, /area/lv522/outdoors/colony_streets/north_east_street) -"pur" = ( -/obj/structure/prop/turbine_extras/left, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/lv522/landing_zone_2/ceiling) "puu" = ( /obj/structure/machinery/cm_vending/sorted/medical/no_access, /turf/open/floor/strata{ @@ -34547,13 +38578,9 @@ }, /area/lv522/indoors/a_block/hallway) "puV" = ( -/obj/structure/bed/chair, -/obj/item/prop/alien/hugger, -/turf/open/floor/prison{ - dir = 4; - icon_state = "greenfull" - }, -/area/lv522/indoors/a_block/fitness) +/obj/structure/cargo_container/kelland/right, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/colony_streets/north_west_street) "puY" = ( /obj/item/lightstick/red/spoke/planted{ pixel_x = -9; @@ -34571,6 +38598,13 @@ icon_state = "greenfull" }, /area/lv522/landing_zone_1) +"pvz" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "pvE" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/machinery/door/airlock/multi_tile/almayer/generic, @@ -34583,7 +38617,7 @@ pixel_x = -12; pixel_y = 25 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_2) "pwa" = ( /turf/open/auto_turf/shale/layer1, @@ -34619,15 +38653,32 @@ /area/lv522/indoors/c_block/cargo) "pwz" = ( /obj/structure/cargo_container/horizontal/blue/middle, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/central_streets) -"pwC" = ( -/obj/structure/bed/chair, +"pwA" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) +"pwB" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_x = -1; + pixel_y = 2 + }, /turf/open/floor/prison{ - dir = 4; - icon_state = "greenfull" + icon_state = "floor_plate" }, -/area/lv522/indoors/a_block/fitness) +/area/lv522/atmos/way_in_command_centre) +"pwC" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, +/turf/open/floor/corsat, +/area/lv522/atmos/east_reactor/south) "pwH" = ( /obj/effect/landmark/lv624/fog_blocker/short, /obj/structure/machinery/landinglight/ds1/delayone{ @@ -34660,38 +38711,22 @@ }, /area/lv522/indoors/b_block/bridge) "pwX" = ( -/obj/structure/machinery/vending/walkman{ - density = 0; - pixel_y = 16 - }, -/turf/open/floor/prison{ - dir = 4; - icon_state = "greenfull" - }, -/area/lv522/indoors/a_block/fitness) +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat, +/area/lv522/atmos/east_reactor/south) "pxb" = ( -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_1) "pxk" = ( /obj/structure/largecrate/random/barrel/red, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/central_streets) "pxN" = ( -/obj/structure/machinery/space_heater/radiator/red{ - dir = 1; - pixel_y = 26 - }, +/obj/structure/surface/table/almayer, /turf/open/floor/prison{ - dir = 4; - icon_state = "greenfull" - }, -/area/lv522/indoors/a_block/fitness) -"pxQ" = ( -/obj/structure/pipes/standard/manifold/hidden/green{ - dir = 1 + icon_state = "floor_plate" }, -/turf/open/auto_turf/shale/layer0, -/area/lv522/outdoors/colony_streets/central_streets) +/area/lv522/atmos/east_reactor/south) "pxS" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ @@ -34703,6 +38738,13 @@ icon_state = "95" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) +"pyc" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/prison{ + dir = 1; + icon_state = "cell_stripe" + }, +/area/lv522/atmos/way_in_command_centre) "pyo" = ( /obj/structure/machinery/conveyor{ dir = 10; @@ -34764,7 +38806,7 @@ pixel_x = 9; pixel_y = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) "pzj" = ( /obj/structure/surface/table/reinforced/prison, @@ -34781,7 +38823,7 @@ /area/lv522/indoors/c_block/garage) "pzo" = ( /obj/item/weapon/twohanded/folded_metal_chair, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) "pzs" = ( /obj/structure/barricade/wooden, @@ -34808,24 +38850,19 @@ }, /area/lv522/outdoors/colony_streets/south_west_street) "pAp" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/space_heater/radiator/red{ - dir = 4 - }, -/turf/open/floor/prison{ - dir = 4; - icon_state = "greenfull" - }, -/area/lv522/indoors/a_block/fitness) +/obj/structure/largecrate, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/north_west_street) +"pAw" = ( +/obj/item/prop/colony/used_flare, +/turf/open/floor/corsat, +/area/lv522/atmos/east_reactor/south) "pAN" = ( -/obj/structure/pipes/standard/manifold/hidden/green{ - dir = 8 - }, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + dir = 1; + icon_state = "cell_stripe" }, -/area/lv522/indoors/a_block/fitness) +/area/lv522/atmos/east_reactor/south) "pAW" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -34938,7 +38975,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_street) "pCG" = ( /obj/structure/stairs/perspective{ @@ -35022,14 +39059,13 @@ }, /area/lv522/indoors/a_block/fitness) "pDM" = ( -/obj/structure/bed/chair{ +/obj/structure/bed/chair/comfy{ dir = 4 }, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + icon_state = "floor_plate" }, -/area/lv522/indoors/a_block/fitness) +/area/lv522/atmos/east_reactor/south) "pDU" = ( /obj/structure/barricade/wooden{ dir = 4 @@ -35072,31 +39108,18 @@ /area/lv522/atmos/east_reactor/south) "pEp" = ( /obj/structure/surface/table/almayer, -/obj/item/clothing/gloves/boxing{ - pixel_x = -5; +/obj/structure/machinery/prop/almayer/computer/PC{ + dir = 8; pixel_y = 5 }, -/obj/item/clothing/gloves/boxing/blue{ - pixel_x = 5; - pixel_y = -6 - }, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + icon_state = "floor_plate" }, -/area/lv522/indoors/a_block/fitness) +/area/lv522/atmos/east_reactor/south) "pEs" = ( -/obj/structure/surface/table/almayer, -/obj/item/toy/beach_ball, -/obj/item/reagent_container/food/drinks/bottle/sake{ - pixel_x = 9; - pixel_y = 17 - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/lv522/indoors/a_block/fitness) +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv522/atmos/east_reactor/south) "pEu" = ( /obj/structure/machinery/space_heater/radiator/red{ dir = 8 @@ -35107,13 +39130,21 @@ }, /area/lv522/indoors/a_block/admin) "pEv" = ( -/obj/structure/largecrate/random/mini/wooden, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 4; + id = "Reactor_e_entry_4" }, -/area/lv522/indoors/a_block/fitness) +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/filt) +"pEw" = ( +/obj/structure/blocker/forcefield/vehicles, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/command_centre) "pEA" = ( /obj/item/lightstick/red/spoke/planted{ pixel_x = -9; @@ -35135,7 +39166,7 @@ "pFw" = ( /obj/structure/cargo_container/horizontal/blue/middle, /obj/effect/landmark/lv624/fog_blocker/short, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_1) "pFF" = ( /obj/structure/platform_decoration{ @@ -35158,7 +39189,7 @@ dir = 1; icon_state = "p_stair_full" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) "pFQ" = ( /obj/item/prop/alien/hugger, @@ -35167,12 +39198,27 @@ icon_state = "darkredfull2" }, /area/lv522/indoors/a_block/security) +"pGe" = ( +/obj/item/ammo_magazine/rifle/heap{ + current_rounds = 0 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "pGg" = ( /obj/structure/bed/chair{ dir = 8 }, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorm_north) +"pGh" = ( +/turf/closed/wall/strata_outpost/reinforced, +/area/lv522/outdoors/colony_streets/north_street) "pGl" = ( /turf/closed/wall/strata_outpost/reinforced/hull, /area/lv522/indoors/a_block/kitchen) @@ -35206,8 +39252,21 @@ icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) +"pGQ" = ( +/obj/item/prop/alien/hugger, +/turf/open/floor/wood/ship, +/area/lv522/atmos/way_in_command_centre) "pGY" = ( /obj/effect/decal/cleanable/blood/xeno, +/obj/structure/platform{ + dir = 1 + }, +/obj/structure/platform{ + dir = 8 + }, +/obj/structure/platform_decoration{ + dir = 5 + }, /turf/open/asphalt/cement, /area/lv522/outdoors/colony_streets/north_east_street) "pHi" = ( @@ -35276,6 +39335,19 @@ icon_state = "greenfull" }, /area/lv522/indoors/b_block/hydro) +"pJh" = ( +/obj/structure/surface/table/almayer{ + dir = 4; + flipped = 1 + }, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/prison{ + dir = 1; + icon_state = "blue_plate" + }, +/area/lv522/indoors/a_block/admin) "pJj" = ( /obj/structure/closet/crate/hydroponics/prespawned, /turf/open/floor/prison{ @@ -35357,7 +39429,10 @@ }, /area/lv522/indoors/a_block/admin) "pKv" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 4; + id = "Reactor_e_entry_3" + }, /turf/open/floor/corsat{ icon_state = "marked" }, @@ -35383,7 +39458,7 @@ dir = 6 }, /obj/effect/landmark/lv624/fog_blocker/short, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_1) "pLs" = ( /obj/structure/barricade/wooden{ @@ -35397,7 +39472,7 @@ pixel_x = 9; pixel_y = 25 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) "pLN" = ( /obj/structure/machinery/door/airlock/almayer/medical{ @@ -35409,6 +39484,16 @@ icon_state = "marked" }, /area/lv522/indoors/a_block/medical) +"pLP" = ( +/obj/effect/decal/cleanable/blood/drip, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "pLT" = ( /obj/item/reagent_container/glass/bucket/janibucket{ desc = "It's a large bucket that fits in a janitorial cart. Holds 500 units. The lip is stained."; @@ -35436,12 +39521,11 @@ }, /area/lv522/indoors/a_block/dorms) "pMg" = ( -/obj/item/lightstick/red/spoke/planted{ - pixel_x = -13 +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat{ + icon_state = "marked" }, -/obj/structure/pipes/standard/simple/hidden/green, -/turf/open/auto_turf/shale/layer0, -/area/lv522/outdoors/w_rockies) +/area/lv522/atmos/filt) "pMs" = ( /obj/structure/surface/table/gamblingtable, /obj/item/card/id/visa{ @@ -35468,15 +39552,19 @@ icon_state = "marked" }, /area/lv522/indoors/a_block/medical) -"pMT" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 1 - }, -/turf/open/floor/prison{ - dir = 4; - icon_state = "greenfull" +"pMz" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1; + pixel_y = -1 }, -/area/lv522/indoors/a_block/fitness) +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv522/atmos/sewer) +"pMT" = ( +/obj/structure/largecrate/random/barrel/white, +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv522/outdoors/nw_rockies) "pNa" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1 @@ -35485,6 +39573,15 @@ icon_state = "marked" }, /area/lv522/landing_zone_1/tunnel) +"pNc" = ( +/obj/structure/prop/server_equipment/yutani_server/broken, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/command_centre) "pNf" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 9 @@ -35510,6 +39607,19 @@ }, /turf/open/floor/prison, /area/lv522/indoors/a_block/kitchen) +"pNv" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor/corsat{ + icon_state = "brown" + }, +/area/lv522/atmos/cargo_intake) +"pNF" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/oil/streak, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/lv522/atmos/reactor_garage) "pNJ" = ( /obj/structure/stairs/perspective{ dir = 4; @@ -35572,6 +39682,15 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) +"pOK" = ( +/obj/structure/platform/strata{ + dir = 1 + }, +/obj/structure/platform/strata{ + dir = 8 + }, +/turf/closed/wall/strata_ice/dirty, +/area/lv522/oob) "pON" = ( /obj/structure/filingcabinet/chestdrawer{ density = 0; @@ -35589,40 +39708,18 @@ }, /area/lv522/indoors/a_block/admin) "pPm" = ( -/obj/structure/bed/chair, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" +/obj/structure/largecrate, +/turf/open/asphalt/cement{ + icon_state = "cement4" }, -/area/lv522/indoors/a_block/fitness) +/area/lv522/outdoors/colony_streets/north_west_street) "pPt" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 6 - }, -/obj/structure/bed/chair, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/lv522/indoors/a_block/fitness) +/obj/structure/largecrate/random, +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv522/outdoors/nw_rockies) "pPC" = ( -/obj/structure/machinery/computer/cameras/wooden_tv{ - desc = "An old TV hooked up to a video cassette recorder, you can even use it to time shift WOW."; - layer = 3.2; - name = "Television set"; - network = null; - pixel_x = -3; - pixel_y = 6 - }, -/obj/structure/surface/table/almayer, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/lv522/indoors/a_block/fitness) +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv522/outdoors/nw_rockies) "pPV" = ( /obj/structure/toilet{ dir = 4 @@ -35684,10 +39781,21 @@ icon_state = "greenfull" }, /area/lv522/indoors/b_block/bridge) +"pQR" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/east_reactor) "pRf" = ( -/obj/structure/pipes/standard/manifold/hidden/green, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 9 + }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/corsat{ - icon_state = "squares" + icon_state = "brown" }, /area/lv522/atmos/cargo_intake) "pRg" = ( @@ -35695,13 +39803,8 @@ /turf/open/floor/plating, /area/lv522/landing_zone_1) "pRh" = ( -/obj/structure/surface/table/almayer, -/obj/item/clothing/gloves/black, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/lv522/indoors/a_block/fitness) +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv522/outdoors/n_rockies) "pRi" = ( /obj/structure/machinery/seed_extractor, /obj/effect/decal/cleanable/dirt, @@ -35714,7 +39817,7 @@ /obj/structure/pipes/standard/manifold/hidden/green{ dir = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) "pRH" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -35770,6 +39873,15 @@ icon_state = "white_cyan2" }, /area/lv522/indoors/a_block/dorms) +"pSK" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "w-y1" + }, +/area/lv522/atmos/way_in_command_centre) "pTa" = ( /obj/structure/prop/vehicles/crawler{ layer = 3.1 @@ -35871,8 +39983,7 @@ /obj/structure/prop/ice_colony/ground_wire{ dir = 4 }, -/obj/structure/pipes/standard/simple/hidden/green, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/w_rockies) "pVb" = ( /obj/item/prop/colony/used_flare, @@ -35886,7 +39997,7 @@ dir = 5; icon_state = "p_stair_full" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) "pVo" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -35931,6 +40042,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/lv522/indoors/a_block/security) +"pVH" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/prison{ + dir = 1; + icon_state = "cell_stripe" + }, +/area/lv522/atmos/way_in_command_centre) "pVX" = ( /obj/structure/machinery/light{ dir = 8 @@ -35964,11 +40084,20 @@ icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2/ceiling) +"pWC" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/bed/chair{ + dir = 1 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/sewer) "pWR" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 6 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/central_streets) "pWW" = ( /obj/item/stack/sheet/wood, @@ -35987,6 +40116,19 @@ icon_state = "blue" }, /area/lv522/indoors/a_block/admin) +"pXh" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "pXk" = ( /obj/structure/machinery/power/monitor{ name = "Main Power Grid Monitoring" @@ -36034,6 +40176,11 @@ icon_state = "greenfull" }, /area/lv522/indoors/b_block/bridge) +"pXH" = ( +/obj/effect/alien/weeds/node/alpha, +/obj/effect/alien/egg/alpha, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/w_rockies) "pYf" = ( /obj/structure/machinery/light{ dir = 8 @@ -36068,7 +40215,7 @@ /obj/structure/platform_decoration{ dir = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) "pYO" = ( /obj/structure/prop/invuln/overhead_pipe{ @@ -36107,6 +40254,21 @@ }, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/north_east_street) +"pZy" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/surface/table/almayer, +/obj/effect/decal/cleanable/dirt, +/obj/item/reagent_container/food/snacks/mre_pack/meal1{ + desc = "A tray of standard UA food. Stale cornbread, tomato paste and some green goop fill this tray."; + name = "\improper UA Prepared Meal (cornbread)"; + pixel_y = 9 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/reactor_garage) "pZA" = ( /obj/item/storage/secure/safe{ pixel_y = 29 @@ -36154,7 +40316,7 @@ "qbf" = ( /obj/structure/cargo_container/horizontal/blue/bottom, /obj/effect/landmark/lv624/fog_blocker/short, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_1) "qbi" = ( /obj/structure/stairs/perspective{ @@ -36199,7 +40361,7 @@ layer = 2; name = "weak acid" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_street) "qbI" = ( /obj/structure/prop/invuln/ice_prefab/trim{ @@ -36216,7 +40378,7 @@ pixel_y = 21 }, /obj/structure/sign/safety/high_voltage, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/central_streets) "qbL" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ @@ -36253,6 +40415,25 @@ icon_state = "blue" }, /area/lv522/indoors/a_block/admin) +"qce" = ( +/obj/structure/pipes/vents/pump, +/obj/structure/surface/table/almayer, +/obj/effect/decal/cleanable/dirt, +/obj/item/reagent_container/food/drinks/cans/waterbottle{ + pixel_x = 7; + pixel_y = 7 + }, +/obj/item/reagent_container/food/drinks/cans/waterbottle{ + pixel_y = 7 + }, +/obj/item/reagent_container/food/drinks/cans/waterbottle{ + pixel_x = -7; + pixel_y = 7 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/reactor_garage) "qcw" = ( /obj/effect/spawner/gibspawner/human, /obj/effect/decal/cleanable/dirt, @@ -36277,8 +40458,11 @@ }, /area/lv522/landing_zone_1) "qda" = ( -/obj/structure/largecrate/random/barrel, -/turf/open/auto_turf/shale/layer0, +/obj/structure/largecrate/random/barrel/green, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/lv522/landing_zone_2/ceiling) "qdc" = ( /obj/structure/desertdam/decals/road_edge{ @@ -36316,17 +40500,11 @@ }, /area/lv522/indoors/c_block/mining) "qeJ" = ( -/obj/structure/pipes/standard/manifold/hidden/green{ - dir = 4 - }, -/obj/structure/barricade/handrail/wire{ - layer = 3.1 - }, -/turf/open/floor/prison{ - dir = 4; - icon_state = "greenfull" +/obj/structure/prop/vehicles/crawler, +/turf/open/floor/corsat{ + icon_state = "plate" }, -/area/lv522/indoors/a_block/fitness) +/area/lv522/atmos/reactor_garage) "qeK" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 6 @@ -36335,6 +40513,23 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) +"qfm" = ( +/obj/structure/prop/ice_colony/ground_wire{ + dir = 8 + }, +/obj/structure/prop/ice_colony/ground_wire, +/obj/item/lightstick/red/spoke/planted{ + pixel_x = -10; + pixel_y = 10 + }, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/colony_streets/central_streets) +"qfo" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/wood/ship, +/area/lv522/atmos/way_in_command_centre) "qfu" = ( /obj/structure/foamed_metal, /obj/effect/decal/cleanable/dirt, @@ -36363,13 +40558,13 @@ /obj/structure/barricade/deployable{ dir = 8 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) "qgj" = ( /obj/structure/barricade/wooden{ dir = 8 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/central_streets) "qgr" = ( /obj/structure/machinery/light/small, @@ -36381,14 +40576,10 @@ /turf/open/floor/plating, /area/lv522/oob) "qgx" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 9 - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/lv522/indoors/a_block/fitness) +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, +/turf/open/floor/corsat, +/area/lv522/atmos/east_reactor/south) "qhm" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -36397,11 +40588,6 @@ icon_state = "darkredfull2" }, /area/lv522/indoors/lone_buildings/chunk) -"qhA" = ( -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/a_block/dorm_north) "qhO" = ( /obj/structure/bed/chair/comfy{ dir = 8 @@ -36417,7 +40603,7 @@ dir = 4; pixel_x = -8 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/central_streets) "qio" = ( /obj/structure/pipes/standard/manifold/hidden/green{ @@ -36443,6 +40629,13 @@ icon_state = "darkyellowfull2" }, /area/lv522/indoors/c_block/t_comm) +"qix" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "qiC" = ( /obj/structure/machinery/camera/autoname{ dir = 8 @@ -36455,9 +40648,7 @@ }, /area/lv522/indoors/a_block/bridges) "qiG" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - dir = 1 - }, +/obj/structure/window/framed/strata/reinforced, /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, @@ -36556,6 +40747,11 @@ }, /turf/open/floor/prison, /area/shuttle/drop1/lv522) +"qle" = ( +/obj/structure/machinery/landinglight/ds2/delaytwo, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/lv522/landing_zone_2) "qlr" = ( /obj/item/trash/barcardine, /obj/effect/decal/cleanable/dirt, @@ -36664,7 +40860,7 @@ /obj/structure/platform_decoration{ dir = 6 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) "qnk" = ( /obj/structure/surface/table/almayer, @@ -36781,6 +40977,12 @@ icon_state = "cell_stripe" }, /area/lv522/indoors/lone_buildings/storage_blocks) +"qpd" = ( +/turf/open/floor/prison{ + dir = 1; + icon_state = "cell_stripe" + }, +/area/lv522/atmos/sewer) "qpg" = ( /turf/open/shuttle/dropship{ icon_state = "floor8" @@ -36795,6 +40997,18 @@ }, /turf/open/floor/prison, /area/lv522/indoors/a_block/security/glass) +"qpy" = ( +/obj/structure/surface/table/almayer, +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/prop/almayer/computer/PC{ + dir = 1; + pixel_x = -1; + pixel_y = 3 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "qpz" = ( /obj/structure/cable/heavyduty{ icon_state = "1-2" @@ -36815,8 +41029,11 @@ /turf/closed/wall/mineral/bone_resin, /area/lv522/oob) "qpE" = ( -/obj/structure/largecrate/random/barrel/green, -/turf/open/auto_turf/shale/layer0, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_marked" + }, /area/lv522/landing_zone_2/ceiling) "qqc" = ( /obj/structure/filingcabinet, @@ -36832,6 +41049,13 @@ icon_state = "white_cyan3" }, /area/lv522/indoors/a_block/medical) +"qqq" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor/corsat{ + dir = 8; + icon_state = "brown" + }, +/area/lv522/atmos/filt) "qqx" = ( /obj/structure/barricade/wooden{ dir = 4 @@ -36869,8 +41093,30 @@ /obj/structure/platform_decoration{ dir = 10 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) +"qqJ" = ( +/obj/structure/platform{ + dir = 4 + }, +/turf/open/asphalt/cement, +/area/lv522/outdoors/n_rockies) +"qqN" = ( +/obj/structure/filingcabinet{ + density = 0; + pixel_x = -8; + pixel_y = 16 + }, +/obj/structure/filingcabinet{ + density = 0; + pixel_x = 8; + pixel_y = 16 + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "white_cyan1" + }, +/area/lv522/oob/w_y_vault) "qqR" = ( /obj/structure/platform, /obj/structure/stairs/perspective{ @@ -36921,6 +41167,12 @@ icon_state = "white_cyan2" }, /area/lv522/outdoors/w_rockies) +"qro" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/filt) "qsd" = ( /obj/structure/pipes/standard/simple/visible{ dir = 10 @@ -36992,6 +41244,12 @@ icon_state = "floor_plate" }, /area/lv522/indoors/a_block/garden) +"qsW" = ( +/obj/structure/platform{ + dir = 4 + }, +/turf/open/gm/river, +/area/lv522/atmos/sewer) "qtc" = ( /turf/closed/shuttle/dropship2/tornado/typhoon{ icon_state = "74" @@ -37015,6 +41273,13 @@ /obj/structure/cargo_container/horizontal/blue/top, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/north_west_street) +"qts" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 6 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison, +/area/lv522/atmos/way_in_command_centre) "qtx" = ( /obj/structure/barricade/wooden{ dir = 4 @@ -37057,7 +41322,7 @@ icon_state = "E"; pixel_x = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/central_streets) "qup" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -37074,7 +41339,7 @@ /area/lv522/indoors/c_block/mining) "quw" = ( /obj/item/clothing/head/welding, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) "quD" = ( /obj/effect/decal/cleanable/blood/oil, @@ -37087,6 +41352,16 @@ icon_state = "floor_marked" }, /area/lv522/landing_zone_1) +"qvb" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "qvA" = ( /turf/open/floor/prison{ dir = 10; @@ -37118,6 +41393,15 @@ }, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) +"qvQ" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/north_command_centre) "qvY" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/prison, @@ -37200,7 +41484,7 @@ /obj/item/ammo_magazine/sniper{ current_rounds = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) "qxD" = ( /obj/structure/machinery/microwave, @@ -37225,6 +41509,11 @@ icon_state = "cyan2" }, /area/lv522/indoors/a_block/medical) +"qxX" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv522/indoors/a_block/dorm_north) "qxZ" = ( /obj/structure/bed/chair{ can_buckle = 0; @@ -37247,9 +41536,20 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) +"qyp" = ( +/obj/structure/transmitter/colony_net{ + phone_category = "LV522 Chances Claim"; + phone_color = "red"; + phone_id = "Reactor Eastern Reactor Control"; + pixel_y = 26 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor) "qyG" = ( /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/n_rockies) "qyI" = ( /obj/structure/closet/firecloset/full, @@ -37312,7 +41612,7 @@ pixel_x = -3; pixel_y = 6 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) "qzA" = ( /obj/item/reagent_container/glass/bucket/janibucket{ @@ -37340,7 +41640,7 @@ /obj/structure/stairs/perspective{ icon_state = "p_stair_full" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) "qzQ" = ( /turf/open/floor/prison, @@ -37374,6 +41674,12 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) +"qAS" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + icon_state = "browncorner" + }, +/area/lv522/atmos/reactor_garage) "qAX" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -37493,6 +41799,19 @@ icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) +"qCE" = ( +/obj/item/clothing/mask/facehugger{ + desc = "It has some sort of a tube at the end of its tail. What the hell is this thing?"; + icon_state = "facehugger_impregnated"; + layer = 3; + name = "????"; + stat = 2 + }, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "browncorner" + }, +/area/lv522/atmos/east_reactor/south) "qCL" = ( /obj/structure/bed/chair{ dir = 8 @@ -37513,7 +41832,7 @@ dir = 6; pixel_y = 29 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/central_streets) "qDd" = ( /obj/structure/machinery/suit_storage_unit/compression_suit/uscm{ @@ -37531,7 +41850,7 @@ pixel_x = 1; pixel_y = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) "qDr" = ( /obj/item/ammo_magazine/rifle/heap{ @@ -37548,7 +41867,7 @@ icon_state = "p_stair_full" }, /obj/effect/landmark/lv624/fog_blocker/short, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_1) "qDw" = ( /obj/effect/decal/cleanable/generic, @@ -37560,7 +41879,7 @@ icon_state = "p_stair_full" }, /obj/effect/landmark/lv624/fog_blocker/short, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_1) "qDL" = ( /turf/closed/wall/strata_outpost, @@ -37573,7 +41892,7 @@ /obj/structure/pipes/standard/manifold/hidden/green{ dir = 8 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) "qEc" = ( /obj/effect/decal/cleanable/dirt, @@ -37604,21 +41923,19 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) -"qET" = ( -/obj/structure/platform{ +"qEQ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/prop/invuln/overhead_pipe{ - dir = 1; - name = "overhead pipe"; - pixel_x = -8; - pixel_y = -6 +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv522/atmos/sewer) +"qET" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + icon_state = "marked" }, -/turf/open/gm/river, -/area/lv522/atmos/cargo_intake) +/area/lv522/atmos/east_reactor/south) "qEU" = ( /obj/structure/window/framed/strata/reinforced, /obj/structure/pipes/standard/simple/hidden/green{ @@ -37638,20 +41955,28 @@ icon_state = "cement1" }, /area/lv522/outdoors/colony_streets/north_west_street) -"qFP" = ( -/obj/item/lightstick/red/spoke/planted{ - pixel_x = -9; - pixel_y = 25 - }, -/obj/structure/prop/ice_colony/ground_wire{ - dir = 4 +"qFW" = ( +/obj/effect/spawner/gibspawner/xeno, +/turf/open/floor/corsat{ + icon_state = "squares" }, -/turf/open/auto_turf/shale/layer0, -/area/lv522/outdoors/colony_streets/central_streets) +/area/lv522/atmos/east_reactor/south) "qGf" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/asphalt/cement, /area/lv522/outdoors/colony_streets/central_streets) +"qGh" = ( +/obj/structure/transmitter/colony_net{ + phone_category = "LV522 Chances Claim"; + phone_color = "red"; + phone_id = "Colony Fitness"; + pixel_y = 26 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/lv522/indoors/a_block/fitness) "qGq" = ( /obj/structure/bed/chair/comfy{ dir = 4 @@ -37742,12 +42067,29 @@ icon_state = "white_cyan2" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) +"qHD" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light, +/turf/open/floor/wood/ship, +/area/lv522/atmos/way_in_command_centre) "qHI" = ( /obj/vehicle/powerloader/jd{ dir = 4 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/central_streets) +"qIu" = ( +/obj/structure/bed/bedroll{ + dir = 1; + layer = 6; + pixel_y = 16 + }, +/obj/item/bedsheet/ce{ + layer = 6.1; + pixel_y = 17 + }, +/turf/closed/wall/strata_ice/dirty, +/area/lv522/oob) "qIy" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat{ @@ -37873,6 +42215,12 @@ }, /turf/open/asphalt/cement, /area/lv522/outdoors/colony_streets/central_streets) +"qKO" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/sewer) "qKV" = ( /obj/structure/platform_decoration{ dir = 8 @@ -37979,7 +42327,7 @@ dir = 8 }, /obj/effect/landmark/lv624/fog_blocker/short, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_1) "qMX" = ( /obj/structure/cargo_container/horizontal/blue/middle{ @@ -38222,7 +42570,7 @@ /obj/structure/prop/ice_colony/ground_wire{ dir = 4 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/central_streets) "qQo" = ( /obj/structure/closet/bodybag, @@ -38263,7 +42611,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 10 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) "qQM" = ( /obj/structure/stairs/perspective{ @@ -38306,6 +42654,14 @@ icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) +"qRw" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/reactor_garage) "qRB" = ( /obj/structure/closet/crate, /obj/item/stack/sheet/plasteel/medium_stack, @@ -38374,7 +42730,7 @@ /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/dorms) "qSH" = ( -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) "qSL" = ( /obj/structure/surface/table/almayer, @@ -38458,8 +42814,10 @@ }, /area/lv522/indoors/a_block/security) "qTE" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, -/turf/open/floor/corsat, +/obj/item/clothing/suit/storage/marine/medium, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/lv522/atmos/east_reactor/south) "qTG" = ( /obj/structure/window/framed/strata/reinforced, @@ -38493,7 +42851,7 @@ /obj/structure/prop/ice_colony/ground_wire{ dir = 8 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) "qTO" = ( /obj/structure/largecrate/supply/ammo/m41a/half{ @@ -38539,11 +42897,13 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 9 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) "qUq" = ( /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor/prison, +/turf/open/floor/strata{ + icon_state = "blue1" + }, /area/lv522/indoors/a_block/dorm_north) "qUs" = ( /obj/structure/window/framed/strata/reinforced, @@ -38552,6 +42912,14 @@ icon_state = "marked" }, /area/lv522/indoors/c_block/t_comm) +"qUz" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/reactor_garage) "qUD" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med/limited{ pixel_x = 30 @@ -38602,8 +42970,17 @@ }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "qVN" = ( -/turf/open/floor/plating/plating_catwalk/prison, -/area/lv522/atmos/cargo_intake) +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 4; + id = "Reactor_e_entry_4" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/filt) "qVQ" = ( /obj/structure/machinery/camera/autoname{ dir = 8 @@ -38678,7 +43055,7 @@ /obj/structure/platform{ dir = 8 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) "qYc" = ( /obj/structure/surface/table/almayer, @@ -38687,6 +43064,14 @@ icon_state = "marked" }, /area/lv522/indoors/a_block/fitness/glass) +"qYk" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/cargo_intake) "qYl" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -38700,6 +43085,13 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/fitness/glass) +"qYp" = ( +/obj/structure/surface/table/almayer, +/obj/item/trash/ceramic_plate, +/turf/open/floor/strata{ + icon_state = "blue1" + }, +/area/lv522/outdoors/colony_streets/windbreaker/observation) "qYq" = ( /obj/structure/machinery/light{ dir = 4 @@ -38729,6 +43121,18 @@ icon_state = "greenfull" }, /area/lv522/indoors/a_block/fitness) +"qYy" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, +/obj/structure/platform{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/sewer) "qYG" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 4 @@ -38736,6 +43140,24 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/b_block/hydro) +"qYM" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/lv522/atmos/reactor_garage) +"qYP" = ( +/obj/structure/platform{ + dir = 1 + }, +/obj/structure/platform{ + dir = 8 + }, +/obj/structure/platform_decoration{ + dir = 5 + }, +/turf/open/asphalt/cement, +/area/lv522/outdoors/colony_streets/north_east_street) "qYX" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/flour, @@ -38752,6 +43174,13 @@ icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/bridge) +"qZf" = ( +/obj/item/storage/belt/marine{ + pixel_x = 7; + pixel_y = 5 + }, +/turf/closed/wall/strata_ice/dirty, +/area/lv522/oob) "qZh" = ( /obj/structure/surface/table/almayer, /obj/item/storage/fancy/egg_box, @@ -38768,7 +43197,7 @@ }, /area/lv522/outdoors/colony_streets/north_east_street) "qZB" = ( -/obj/structure/barricade/handrail, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/floor/corsat{ icon_state = "brown" }, @@ -38845,6 +43274,15 @@ icon_state = "radiator_tile2" }, /area/lv522/indoors/a_block/bridges/op_centre) +"raH" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood/ship, +/area/lv522/atmos/way_in_command_centre) +"raI" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv522/indoors/a_block/corpo/glass) "raQ" = ( /obj/structure/bed/chair{ dir = 4 @@ -38942,12 +43380,28 @@ dir = 8; layer = 3.1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) +"rbW" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat{ + icon_state = "brown" + }, +/area/lv522/atmos/east_reactor) "rbX" = ( /obj/effect/landmark/yautja_teleport, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/east_central_street) +"rbZ" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/corsat, +/area/lv522/atmos/east_reactor/south) "rcd" = ( /obj/structure/surface/table/almayer, /obj/item/clothing/accessory/poncho, @@ -38955,14 +43409,14 @@ /area/lv522/indoors/a_block/admin) "rcr" = ( /obj/structure/barricade/deployable, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) "rcO" = ( /obj/structure/prop/ice_colony/ground_wire{ dir = 1; layer = 2.9 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) "rcP" = ( /obj/structure/desertdam/decals/road_edge{ @@ -39016,6 +43470,15 @@ icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) +"rdf" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/prison{ + dir = 8; + icon_state = "cell_stripe" + }, +/area/lv522/atmos/reactor_garage) "rdq" = ( /obj/structure/prop/invuln/ice_prefab/roof_greeble{ icon_state = "vent2"; @@ -39189,16 +43652,6 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/carpet, /area/lv522/indoors/c_block/garage) -"rgd" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_full" - }, -/turf/open/asphalt/cement{ - icon_state = "cement4" - }, -/area/lv522/outdoors/n_rockies) "rge" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/light, @@ -39233,18 +43686,15 @@ pixel_y = 7 }, /obj/item/toy/farwadoll, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/turf/open/floor/strata{ + icon_state = "blue1" }, /area/lv522/outdoors/colony_streets/windbreaker/observation) "rhh" = ( -/obj/structure/machinery/power/apc/weak{ - dir = 1 - }, /obj/structure/bed/chair/wheelchair, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/turf/open/floor/strata{ + icon_state = "blue1" }, /area/lv522/outdoors/colony_streets/windbreaker/observation) "rhk" = ( @@ -39333,6 +43783,20 @@ icon_state = "greenfull" }, /area/lv522/indoors/b_block/bridge) +"rjl" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/obj/effect/decal/cleanable/blood, +/obj/structure/transmitter/colony_net{ + phone_category = "LV522 Chances Claim"; + phone_color = "red"; + phone_id = "Reactor Entrance Office"; + pixel_y = 26 + }, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "rjn" = ( /obj/structure/prop/invuln/ice_prefab/trim{ dir = 6; @@ -39348,7 +43812,7 @@ layer = 4.2; pixel_y = 21 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/central_streets) "rjx" = ( /obj/structure/largecrate/random/barrel/green{ @@ -39394,6 +43858,13 @@ icon_state = "radiator_tile2" }, /area/lv522/indoors/a_block/bridges/op_centre) +"rla" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat{ + dir = 8; + icon_state = "brown" + }, +/area/lv522/atmos/filt) "rls" = ( /obj/structure/bed/chair{ dir = 1 @@ -39402,6 +43873,9 @@ icon_state = "darkredfull2" }, /area/lv522/indoors/a_block/security) +"rlB" = ( +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv522/outdoors/colony_streets/windbreaker/observation) "rlE" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ welded = 1 @@ -39452,6 +43926,12 @@ "rmt" = ( /turf/closed/wall/strata_outpost, /area/lv522/indoors/a_block/fitness/glass) +"rmA" = ( +/obj/structure/pipes/standard/manifold/hidden/green{ + dir = 8 + }, +/turf/open/floor/prison, +/area/lv522/atmos/way_in_command_centre) "rmC" = ( /obj/structure/bed/chair{ dir = 1 @@ -39476,11 +43956,18 @@ icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) +"rmV" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + dir = 9; + icon_state = "brown" + }, +/area/lv522/atmos/east_reactor/south) "rmX" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) "rng" = ( /obj/effect/decal/cleanable/dirt, @@ -39520,7 +44007,7 @@ }, /area/lv522/outdoors/colony_streets/north_street) "rnB" = ( -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/east_central_street) "rnG" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -39553,6 +44040,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms) +"rov" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/lv522/atmos/cargo_intake) "rox" = ( /obj/structure/bed/chair/comfy{ dir = 4 @@ -39647,6 +44143,14 @@ icon_state = "floor_plate" }, /area/lv522/indoors/c_block/cargo) +"rqE" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/prop/almayer/CICmap{ + pixel_x = 16; + pixel_y = 16 + }, +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv522/atmos/way_in_command_centre) "rqP" = ( /obj/structure/stairs/perspective{ dir = 4; @@ -39655,9 +44159,14 @@ /turf/open/floor/prison, /area/lv522/indoors/c_block/mining) "rqT" = ( -/obj/structure/curtain/red, -/turf/open/floor/prison, -/area/lv522/indoors/a_block/dorm_north) +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/filt) "rrf" = ( /obj/structure/platform, /obj/structure/prop/invuln/lattice_prop{ @@ -39726,7 +44235,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/w_rockies) "rsM" = ( /obj/structure/stairs/perspective{ @@ -39762,7 +44271,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 10 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/w_rockies) "rtv" = ( /obj/structure/machinery/cm_vending/sorted/medical/no_access, @@ -39774,6 +44283,12 @@ icon_state = "white_cyan3" }, /area/lv522/indoors/a_block/medical/glass) +"rtw" = ( +/turf/open/floor/corsat{ + dir = 5; + icon_state = "brown" + }, +/area/lv522/atmos/reactor_garage) "rtz" = ( /obj/item/stack/sheet/wood, /obj/item/ore/diamond, @@ -39783,23 +44298,20 @@ /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/c_block/cargo) "rtI" = ( -/obj/structure/bed/chair{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, +/obj/structure/largecrate/random/barrel/white, /turf/open/floor/prison, -/area/lv522/outdoors/colony_streets/windbreaker/observation) +/area/lv522/outdoors/nw_rockies) "rtX" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/turf/open/floor/strata{ + icon_state = "blue1" }, /area/lv522/outdoors/colony_streets/windbreaker/observation) "ruc" = ( /obj/structure/cargo_container/kelland/left{ layer = 2.9 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/east_central_street) "ruf" = ( /obj/structure/bed/chair/comfy{ @@ -39826,17 +44338,14 @@ /area/lv522/outdoors/colony_streets/north_east_street) "ruH" = ( /obj/structure/pipes/standard/manifold/hidden/green{ - dir = 8 + dir = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/w_rockies) "ruS" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms/glass) -"ruU" = ( -/turf/open/auto_turf/shale/layer0, -/area/lv522/outdoors/colony_streets/central_streets) "ruW" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/firstaid/adv/empty{ @@ -39864,13 +44373,20 @@ icon_state = "cyan2" }, /area/lv522/indoors/a_block/medical) +"rvg" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/reactor_garage) "rvh" = ( /obj/effect/decal/cleanable/blood/gibs/xeno/body, /obj/effect/spawner/gibspawner/xeno, /obj/structure/pipes/standard/simple/hidden/green{ dir = 9 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/w_rockies) "rvu" = ( /obj/structure/prop/ice_colony/dense/planter_box{ @@ -39906,7 +44422,7 @@ /obj/structure/prop/invuln/ice_prefab/trim{ dir = 4 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/north_street) "rvI" = ( /turf/open/asphalt/cement{ @@ -39959,7 +44475,7 @@ /area/lv522/indoors/a_block/fitness/glass) "rwB" = ( /obj/structure/cargo_container/grant/left, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/central_streets) "rwC" = ( /obj/structure/cargo_container/kelland/left, @@ -39967,7 +44483,7 @@ /area/lv522/indoors/c_block/mining) "rwE" = ( /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/central_streets) "rwK" = ( /obj/structure/desertdam/decals/road_edge{ @@ -40037,15 +44553,6 @@ icon_state = "white_cyan1" }, /area/lv522/indoors/a_block/medical) -"rxN" = ( -/obj/structure/stairs/perspective{ - dir = 9; - icon_state = "p_stair_full" - }, -/turf/open/asphalt/cement{ - icon_state = "cement4" - }, -/area/lv522/outdoors/n_rockies) "rxT" = ( /obj/structure/machinery/door/poddoor/almayer/closed{ id = "East_Lock"; @@ -40062,24 +44569,18 @@ }, /area/lv522/outdoors/colony_streets/north_street) "ryj" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 6 - }, -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_full" - }, -/turf/open/asphalt/cement{ - icon_state = "cement4" +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, -/area/lv522/outdoors/colony_streets/north_street) +/area/lv522/indoors/a_block/corpo/glass) "rys" = ( /obj/structure/stairs/perspective{ dir = 4; icon_state = "p_stair_full" }, /obj/effect/landmark/lv624/fog_blocker/short, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_1) "ryu" = ( /obj/structure/surface/rack, @@ -40106,17 +44607,12 @@ }, /area/lv522/indoors/a_block/executive) "ryT" = ( -/obj/structure/stairs/perspective{ - dir = 5; - icon_state = "p_stair_full" - }, -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/turf/open/asphalt/cement{ - icon_state = "cement4" +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light, +/turf/open/floor/shiva{ + icon_state = "radiator_tile2" }, -/area/lv522/outdoors/colony_streets/north_street) +/area/lv522/indoors/a_block/corpo/glass) "ryU" = ( /turf/open/floor/prison{ dir = 4; @@ -40135,6 +44631,10 @@ icon_state = "brown" }, /area/lv522/atmos/filt) +"rzq" = ( +/obj/structure/cargo_container/kelland/left, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/colony_streets/north_west_street) "rzz" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/lv624/fog_blocker/short, @@ -40203,6 +44703,15 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/bridges) +"rAL" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/machinery/light, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/cargo_intake) "rAX" = ( /turf/open/floor{ dir = 4; @@ -40213,7 +44722,7 @@ /obj/structure/platform{ dir = 4 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_2) "rBy" = ( /obj/effect/landmark/objective_landmark/medium, @@ -40256,6 +44765,20 @@ icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) +"rCu" = ( +/turf/open/floor/prison{ + dir = 4; + icon_state = "cell_stripe" + }, +/area/lv522/outdoors/n_rockies) +"rCz" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/engidoor/glass/colony{ + dir = 1 + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/east_reactor/south) "rCE" = ( /obj/structure/machinery/light{ dir = 8 @@ -40389,7 +44912,7 @@ /area/lv522/landing_zone_forecon/UD6_Typhoon) "rGi" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/w_rockies) "rGm" = ( /obj/item/tool/weldingtool, @@ -40524,11 +45047,7 @@ }, /area/lv522/indoors/a_block/dorms) "rJf" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - dir = 1; - name = "\improper Dormitories" - }, -/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/window/framed/strata/reinforced, /turf/open/floor/corsat{ icon_state = "marked" }, @@ -40567,14 +45086,19 @@ /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms) "rJI" = ( -/obj/structure/barricade/handrail/wire{ - layer = 3.1 - }, +/obj/structure/largecrate/random, /turf/open/floor/prison{ - dir = 4; - icon_state = "greenfull" + dir = 10; + icon_state = "floor_marked" }, -/area/lv522/indoors/a_block/fitness) +/area/lv522/outdoors/nw_rockies) +"rKa" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/alien/resin/sticky, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/lv522/atmos/east_reactor/south) "rKe" = ( /obj/structure/platform{ dir = 8 @@ -40611,6 +45135,25 @@ icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) +"rKz" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/bed/chair, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/reactor_garage) +"rKS" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/reactor_garage) "rKW" = ( /obj/effect/decal/cleanable/blood, /obj/structure/pipes/standard/simple/hidden/green, @@ -40688,12 +45231,18 @@ }, /area/lv522/indoors/a_block/fitness) "rLB" = ( -/obj/structure/pipes/standard/manifold/hidden/green, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/structure/fence, /turf/open/floor/prison{ - dir = 4; - icon_state = "greenfull" + icon_state = "floor_plate" }, -/area/lv522/indoors/a_block/fitness) +/area/lv522/outdoors/nw_rockies) "rMb" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -40718,9 +45267,7 @@ }, /area/lv522/indoors/a_block/admin) "rMi" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 9 - }, +/obj/structure/pipes/standard/manifold/hidden/green, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 10; @@ -40748,6 +45295,12 @@ }, /turf/open/asphalt/cement, /area/lv522/outdoors/colony_streets/east_central_street) +"rMD" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/sewer) "rME" = ( /turf/closed/wall/solaris/reinforced/hull/lv522, /area/lv522/outdoors/colony_streets/north_east_street) @@ -40756,11 +45309,11 @@ /area/lv522/outdoors/colony_streets/central_streets) "rMR" = ( /obj/structure/largecrate/random/secure, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) "rNm" = ( /obj/structure/largecrate/random/barrel/blue, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) "rNs" = ( /obj/item/stack/sheet/wood, @@ -40788,12 +45341,6 @@ icon_state = "darkredfull2" }, /area/lv522/indoors/lone_buildings/chunk) -"rNM" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/turf/open/auto_turf/shale/layer0, -/area/lv522/outdoors/n_rockies) "rNO" = ( /obj/structure/surface/table/almayer, /obj/effect/landmark/objective_landmark/close, @@ -40808,7 +45355,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 9 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/n_rockies) "rOg" = ( /turf/open/floor/prison, @@ -40882,7 +45429,7 @@ dir = 4 }, /obj/effect/landmark/lv624/fog_blocker/short, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_1) "rQd" = ( /obj/structure/closet/secure_closet/quartermaster, @@ -40909,6 +45456,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/c_block/mining) +"rQL" = ( +/obj/structure/platform_decoration/strata{ + dir = 4 + }, +/turf/closed/wall/strata_ice/dirty, +/area/lv522/oob) "rRa" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/toy/deck{ @@ -40968,6 +45521,13 @@ icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2/ceiling) +"rRA" = ( +/obj/structure/pipes/vents/pump, +/obj/structure/machinery/light, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "rRJ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/simple/hidden/green{ @@ -41045,6 +45605,15 @@ icon_state = "greenfull" }, /area/lv522/landing_zone_1/ceiling) +"rSs" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 5 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/sewer) "rSG" = ( /obj/item/clothing/shoes/jackboots{ pixel_x = 5; @@ -41076,7 +45645,9 @@ /obj/structure/platform_decoration{ dir = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/asphalt/cement{ + icon_state = "cement9" + }, /area/lv522/outdoors/colony_streets/south_east_street) "rTh" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -41109,6 +45680,15 @@ icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/east_central_street) +"rUl" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 5 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/cargo_intake) "rUr" = ( /obj/structure/machinery/prop/almayer/computer/PC{ pixel_y = 5 @@ -41116,6 +45696,18 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/a_block/admin) +"rUX" = ( +/obj/structure/shuttle/engine/heater{ + dir = 4; + pixel_x = 4 + }, +/obj/structure/prop/invuln/overhead/flammable_pipe/fly{ + dir = 4; + icon_state = "flammable_pipe_3"; + pixel_x = 2 + }, +/turf/closed/wall/mineral/bone_resin, +/area/lv522/oob) "rVa" = ( /obj/structure/machinery/colony_floodlight{ density = 0; @@ -41134,6 +45726,16 @@ icon_state = "cement14" }, /area/lv522/outdoors/colony_streets/central_streets) +"rVB" = ( +/obj/effect/spawner/gibspawner/xeno, +/obj/effect/decal/cleanable/blood/xeno{ + icon_state = "xgib3" + }, +/turf/open/floor/corsat{ + dir = 5; + icon_state = "brown" + }, +/area/lv522/atmos/east_reactor/south) "rVO" = ( /obj/structure/surface/table/almayer, /turf/open/floor/prison{ @@ -41141,6 +45743,12 @@ icon_state = "blue" }, /area/lv522/indoors/a_block/admin) +"rVR" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, +/area/lv522/landing_zone_2) "rVW" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/light{ @@ -41179,10 +45787,43 @@ icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) +"rXa" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/light, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "rXb" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/central_streets) +"rXq" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/platform, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) +"rXr" = ( +/obj/structure/fence{ + layer = 2.9 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/lv522/outdoors/nw_rockies) "rXE" = ( /obj/item/stack/sheet/wood, /turf/open/floor/prison{ @@ -41264,7 +45905,7 @@ /obj/structure/prop/invuln/ice_prefab/trim{ dir = 6 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/north_street) "rZg" = ( /obj/effect/decal/warning_stripes{ @@ -41311,7 +45952,7 @@ /obj/item/tool/weldpack{ pixel_y = 17 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) "sam" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -41330,6 +45971,24 @@ icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/storage_blocks) +"say" = ( +/obj/structure/pipes/vents/pump, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_x = -1; + pixel_y = 2 + }, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "saz" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -41395,6 +46054,13 @@ icon_state = "marked" }, /area/lv522/indoors/c_block/mining) +"sbh" = ( +/obj/structure/platform_decoration, +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/turf/open/asphalt/cement, +/area/lv522/landing_zone_2/ceiling) "sbm" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -41521,6 +46187,14 @@ /obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/plating, /area/lv522/landing_zone_1/tunnel) +"sdR" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 6 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "sec" = ( /obj/structure/prop/invuln/fire{ pixel_x = -7; @@ -41541,7 +46215,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "W" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) "seA" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -41549,6 +46223,10 @@ icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) +"seF" = ( +/obj/structure/window/framed/corsat, +/turf/open/floor/corsat, +/area/lv522/atmos/east_reactor/south) "seG" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 4 @@ -41580,6 +46258,12 @@ icon_state = "cement9" }, /area/lv522/outdoors/colony_streets/south_west_street) +"sfc" = ( +/turf/open/floor/prison{ + dir = 4; + icon_state = "cell_stripe" + }, +/area/lv522/atmos/way_in_command_centre) "sfm" = ( /obj/structure/surface/table/almayer, /obj/item/toy/bikehorn, @@ -41595,13 +46279,21 @@ /obj/structure/stairs/perspective{ icon_state = "p_stair_full" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) +"sfM" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/corsat{ + icon_state = "brown" + }, +/area/lv522/atmos/east_reactor/south) "sfO" = ( /obj/structure/platform_decoration{ dir = 8 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_2) "sfZ" = ( /obj/structure/prop/invuln/fire{ @@ -41616,6 +46308,14 @@ /obj/item/stack/sheet/wood, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/c_block/cargo) +"sgq" = ( +/obj/structure/pipes/standard/manifold/hidden/green{ + dir = 8 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/reactor_garage) "sgG" = ( /obj/structure/surface/table/almayer, /obj/item/tool/kitchen/tray{ @@ -41669,6 +46369,10 @@ icon_state = "86" }, /area/lv522/landing_zone_forecon/UD6_Tornado) +"shD" = ( +/obj/item/stack/rods, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/north_east_street) "shK" = ( /obj/structure/surface/table/almayer, /obj/effect/spawner/random/toy, @@ -41759,6 +46463,16 @@ icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) +"sjx" = ( +/obj/item/prop/colony/canister{ + layer = 3.1; + pixel_y = 16 + }, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "brown" + }, +/area/lv522/atmos/reactor_garage) "sjy" = ( /turf/closed/wall/strata_outpost, /area/lv522/indoors/a_block/security) @@ -41791,6 +46505,11 @@ icon_state = "floor_plate" }, /area/lv522/indoors/c_block/mining) +"sjQ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/bed/chair, +/turf/open/floor/prison, +/area/lv522/outdoors/colony_streets/windbreaker/observation) "sjS" = ( /obj/structure/closet/crate/green, /obj/item/device/sentry_computer, @@ -41815,6 +46534,13 @@ icon_state = "white_cyan2" }, /area/lv522/indoors/a_block/dorms) +"skk" = ( +/obj/effect/decal/cleanable/blood, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "skn" = ( /obj/structure/machinery/door/airlock/almayer/generic{ dir = 2; @@ -41825,6 +46551,13 @@ icon_state = "marked" }, /area/lv522/indoors/a_block/dorms) +"skC" = ( +/obj/structure/closet/secure_closet/engineering_welding, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/reactor_garage) "skE" = ( /turf/closed/shuttle/dropship2/tornado{ icon_state = "63" @@ -41866,8 +46599,19 @@ dir = 6; icon_state = "p_stair_full" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_2) +"slt" = ( +/obj/structure/surface/table/almayer, +/obj/structure/transmitter/colony_net/rotary{ + phone_category = "LV522 Chances Claim"; + phone_id = "Reactor Control"; + pixel_y = 6 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "slD" = ( /obj/structure/prop/invuln/ice_prefab/trim{ dir = 6 @@ -41903,7 +46647,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) "smi" = ( /obj/item/prop/alien/hugger, @@ -41913,9 +46657,11 @@ /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms) "smr" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor/wood, -/area/lv522/indoors/a_block/fitness/glass) +/turf/open/floor/prison{ + dir = 4; + icon_state = "cell_stripe" + }, +/area/lv522/atmos/reactor_garage) "sms" = ( /obj/effect/decal/cleanable/blood/drip, /obj/structure/pipes/standard/simple/hidden/green{ @@ -41936,6 +46682,12 @@ icon_state = "cyan2" }, /area/lv522/indoors/a_block/medical/glass) +"smK" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/lv522/oob) "smR" = ( /turf/open/floor/corsat{ icon_state = "marked" @@ -41967,7 +46719,7 @@ /area/lv522/indoors/a_block/security) "sno" = ( /obj/structure/prop/invuln/ice_prefab, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/central_streets) "snu" = ( /obj/structure/window/reinforced{ @@ -41987,6 +46739,13 @@ icon_state = "cell_stripe" }, /area/lv522/indoors/lone_buildings/storage_blocks) +"snP" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/obj/structure/surface/table/almayer, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "snR" = ( /obj/structure/surface/rack, /obj/item/tank/oxygen, @@ -42008,11 +46767,24 @@ /obj/effect/decal/cleanable/generic, /turf/open/floor/prison, /area/lv522/indoors/c_block/t_comm) +"soS" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/structure/machinery/space_heater/radiator/red{ + dir = 1; + pixel_y = 26 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, +/area/lv522/indoors/a_block/fitness) "spe" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 10 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_street) "spj" = ( /obj/effect/landmark/lv624/fog_blocker/short, @@ -42024,6 +46796,17 @@ /obj/effect/decal/cleanable/cobweb2, /turf/open/floor/carpet, /area/lv522/indoors/b_block/bar) +"spn" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/turf/open/floor{ + dir = 4; + icon_state = "whiteyellowfull" + }, +/area/lv522/oob/w_y_vault) "spo" = ( /turf/open/asphalt/cement{ icon_state = "cement12" @@ -42034,7 +46817,7 @@ icon_state = "E"; pixel_x = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) "spy" = ( /obj/structure/fence, @@ -42059,6 +46842,15 @@ icon_state = "marked" }, /area/lv522/indoors/c_block/mining) +"spB" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 5 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "spI" = ( /turf/open/floor/corsat{ dir = 4; @@ -42099,10 +46891,36 @@ icon_state = "cement15" }, /area/lv522/outdoors/colony_streets/central_streets) +"sqH" = ( +/obj/structure/machinery/door_display/research_cell{ + dir = 8; + id = "Reactor_entry_2"; + pixel_x = 16; + req_access = null + }, +/obj/item/prop/alien/hugger, +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "sqQ" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/lv522/indoors/a_block/kitchen/damage) +"srf" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "srk" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ @@ -42143,9 +46961,26 @@ icon_state = "cement4" }, /area/lv522/outdoors/colony_streets/north_west_street) +"srS" = ( +/obj/structure/machinery/landinglight/ds2/delaythree{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/lv522/landing_zone_2) +"sse" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_x = -1; + pixel_y = 2 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "ssh" = ( /obj/structure/closet/crate/trashcart, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) "ssj" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -42225,6 +47060,28 @@ }, /turf/open/floor/prison, /area/lv522/indoors/b_block/hydro) +"suG" = ( +/obj/item/prop/colony/used_flare, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) +"suS" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "suV" = ( /obj/structure/machinery/computer/cameras/wooden_tv{ desc = "An old TV hooked up to a video cassette recorder, you can even use it to time shift WOW."; @@ -42271,14 +47128,14 @@ /obj/structure/platform_decoration{ dir = 4 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_2) "svK" = ( /obj/structure/largecrate/random/barrel/blue, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/north_east_street) "svW" = ( -/turf/closed/wall, +/turf/closed/wall/strata_outpost, /area/lv522/atmos/east_reactor) "swf" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ @@ -42305,12 +47162,9 @@ }, /area/lv522/atmos/east_reactor) "swD" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, +/obj/structure/largecrate/supply/supplies/metal, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2/ceiling) "swF" = ( @@ -42343,7 +47197,7 @@ /area/lv522/indoors/a_block/hallway) "sxg" = ( /obj/item/stack/rods, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/south_street) "sxp" = ( /obj/structure/surface/table/almayer, @@ -42353,10 +47207,18 @@ }, /turf/open/floor/prison, /area/lv522/indoors/a_block/security/glass) -"sxV" = ( -/obj/structure/largecrate/random, -/turf/open/floor/plating/plating_catwalk/prison, -/area/lv522/outdoors/nw_rockies) +"sxU" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/west) +"syg" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat{ + icon_state = "brown" + }, +/area/lv522/atmos/east_reactor/south) "syl" = ( /obj/structure/bed/chair/comfy{ dir = 8 @@ -42389,14 +47251,14 @@ icon_state = "N"; pixel_y = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) "syH" = ( /obj/structure/stairs/perspective{ dir = 9; icon_state = "p_stair_full" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_2) "syM" = ( /obj/structure/machinery/door/airlock/almayer/generic{ @@ -42407,11 +47269,17 @@ icon_state = "marked" }, /area/lv522/landing_zone_1/ceiling) +"syV" = ( +/obj/structure/bed/chair/comfy, +/turf/open/floor/corsat{ + icon_state = "brown" + }, +/area/lv522/atmos/east_reactor/south) "syW" = ( /obj/item/explosive/mine/active{ dir = 8 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/north_east_street) "szo" = ( /obj/structure/platform{ @@ -42472,7 +47340,7 @@ /obj/structure/platform_decoration{ dir = 5 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_2) "sAx" = ( /obj/structure/surface/table/almayer, @@ -42529,6 +47397,19 @@ /obj/structure/machinery/squeezer, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) +"sBH" = ( +/obj/structure/reagent_dispensers/water_cooler/stacks{ + density = 0; + pixel_y = 16 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) +"sBX" = ( +/obj/structure/girder, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/north_east_street) "sCb" = ( /obj/structure/platform_decoration{ dir = 8 @@ -42599,13 +47480,23 @@ icon_state = "darkredfull2" }, /area/lv522/indoors/lone_buildings/chunk) +"sDf" = ( +/turf/open/floor/corsat{ + dir = 5; + icon_state = "brown" + }, +/area/lv522/atmos/east_reactor/south) "sDq" = ( /obj/structure/barricade/wooden{ dir = 4 }, /obj/item/weapon/twohanded/folded_metal_chair, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/central_streets) +"sDv" = ( +/obj/structure/girder/displaced, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/north_east_street) "sDz" = ( /obj/structure/largecrate/random{ layer = 2.9 @@ -42669,6 +47560,15 @@ icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/storage_blocks) +"sFb" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + dir = 9; + icon_state = "brown" + }, +/area/lv522/atmos/reactor_garage) "sFf" = ( /obj/item/trash/burger, /obj/effect/decal/cleanable/dirt, @@ -42704,7 +47604,7 @@ /obj/structure/prop/invuln/ice_prefab{ dir = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) "sFS" = ( /turf/closed/shuttle/dropship2/tornado/typhoon{ @@ -42730,6 +47630,18 @@ icon_state = "cement12" }, /area/lv522/outdoors/nw_rockies) +"sGv" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "sGD" = ( /obj/item/shard{ icon_state = "medium" @@ -42740,6 +47652,10 @@ icon_state = "darkyellowfull2" }, /area/lv522/indoors/c_block/t_comm) +"sGF" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/closed/wall/mineral/bone_resin, +/area/lv522/oob) "sGQ" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/prop/almayer/computer/PC{ @@ -42791,6 +47707,13 @@ icon_state = "marked" }, /area/lv522/indoors/c_block/casino) +"sHy" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/west_reactor) "sHS" = ( /obj/structure/stairs/perspective{ dir = 5; @@ -43000,10 +47923,49 @@ /obj/structure/window/reinforced, /turf/open/floor/bluegrid, /area/lv522/indoors/a_block/corpo/glass) +"sLc" = ( +/obj/structure/surface/table/almayer, +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/faxmachine{ + pixel_y = 2 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "sLk" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/security) +"sLl" = ( +/obj/structure/window/reinforced{ + dir = 4; + pixel_x = -2; + pixel_y = 4 + }, +/obj/structure/window/reinforced{ + dir = 8; + layer = 3.3; + pixel_y = 4 + }, +/obj/structure/bed{ + can_buckle = 0 + }, +/obj/structure/bed{ + buckling_y = 13; + layer = 3.5; + pixel_y = 13 + }, +/obj/item/bedsheet/brown{ + pixel_y = 13 + }, +/obj/item/bedsheet/brown{ + layer = 3.1 + }, +/turf/open/floor/strata{ + icon_state = "blue1" + }, +/area/lv522/indoors/a_block/dorm_north) "sLn" = ( /obj/effect/decal/cleanable/greenglow, /obj/item/reagent_container/glass/beaker, @@ -43064,8 +48026,19 @@ /obj/structure/prop/ice_colony/ground_wire{ dir = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/central_streets) +"sMA" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 9 + }, +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/prop/almayer/computer/PC{ + dir = 4; + pixel_x = 2 + }, +/turf/open/floor/wood/ship, +/area/lv522/atmos/way_in_command_centre) "sMI" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/camera/autoname{ @@ -43086,7 +48059,7 @@ /area/lv522/outdoors/colony_streets/east_central_street) "sMN" = ( /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) "sMV" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -43108,6 +48081,10 @@ /obj/structure/window/reinforced, /turf/open/floor/bluegrid, /area/lv522/indoors/a_block/corpo/glass) +"sNk" = ( +/obj/effect/landmark/survivor_spawner/lv522_forecon_sniper, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/nw_rockies) "sNm" = ( /obj/structure/platform{ dir = 8 @@ -43192,6 +48169,11 @@ }, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/south_west_street) +"sOL" = ( +/turf/open/floor/strata{ + icon_state = "blue1" + }, +/area/lv522/outdoors/colony_streets/windbreaker/observation) "sOM" = ( /obj/structure/platform{ dir = 1 @@ -43202,7 +48184,7 @@ /obj/structure/platform_decoration{ dir = 9 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_1) "sON" = ( /turf/open/floor/prison{ @@ -43277,12 +48259,23 @@ /area/lv522/indoors/a_block/security) "sPs" = ( /obj/item/stack/rods, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/central_streets) "sPw" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/central_streets) +"sPH" = ( +/obj/structure/machinery/door/poddoor/almayer/closed{ + dir = 4; + id = "Corpo Vault"; + name = "Vault Lockdown" + }, +/obj/effect/landmark/lv624/fog_blocker/short, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/oob/w_y_vault) "sPS" = ( /obj/structure/surface/table/almayer, /obj/effect/spawner/random/toolbox, @@ -43348,6 +48341,24 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) +"sQR" = ( +/obj/item/stack/sheet/wood, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_marked" + }, +/area/lv522/landing_zone_2) +"sQS" = ( +/obj/item/prop/alien/hugger, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "sQT" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -43357,6 +48368,16 @@ icon_state = "platingdmg1" }, /area/lv522/indoors/a_block/bridges/op_centre) +"sQY" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1; + req_one_access_txt = "100"; + welded = 1 + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/c_block/mining) "sQZ" = ( /obj/item/weapon/twohanded/folded_metal_chair, /turf/open/floor/prison{ @@ -43377,6 +48398,15 @@ }, /turf/open/asphalt/cement, /area/lv522/outdoors/colony_streets/north_east_street) +"sRx" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "sRA" = ( /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/w_rockies) @@ -43430,6 +48460,15 @@ icon_state = "cement9" }, /area/lv522/outdoors/colony_streets/north_street) +"sSv" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1 + }, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/way_in_command_centre) "sSG" = ( /obj/structure/stairs/perspective{ dir = 1; @@ -43471,14 +48510,14 @@ }, /area/lv522/indoors/c_block/mining) "sTr" = ( -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_full" +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 4; + id = "Reactor_garage_3" }, -/turf/open/asphalt/cement{ - icon_state = "cement4" +/turf/open/floor/corsat{ + icon_state = "marked" }, -/area/lv522/outdoors/n_rockies) +/area/lv522/atmos/reactor_garage) "sTy" = ( /obj/structure/window_frame/strata, /obj/item/stack/rods, @@ -43515,7 +48554,7 @@ pixel_x = 11; pixel_y = 25 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/east_central_street) "sUj" = ( /obj/structure/stairs/perspective{ @@ -43562,6 +48601,10 @@ icon_state = "blue_plate" }, /area/lv522/indoors/a_block/hallway) +"sWn" = ( +/obj/effect/decal/cleanable/dirt, +/turf/closed/wall/strata_outpost/reinforced, +/area/lv522/atmos/cargo_intake) "sWr" = ( /turf/open/floor/prison, /area/lv522/indoors/a_block/admin) @@ -43654,6 +48697,10 @@ /obj/structure/platform, /turf/open/asphalt/cement, /area/lv522/outdoors/colony_streets/north_east_street) +"sYl" = ( +/obj/item/stack/sheet/metal, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/north_east_street) "sYv" = ( /obj/structure/platform{ dir = 8 @@ -43732,6 +48779,14 @@ icon_state = "cement4" }, /area/lv522/outdoors/colony_streets/south_east_street) +"taS" = ( +/obj/structure/platform_decoration{ + dir = 8 + }, +/turf/open/asphalt/cement{ + icon_state = "cement14" + }, +/area/lv522/outdoors/n_rockies) "taW" = ( /obj/structure/platform{ dir = 8 @@ -43740,7 +48795,7 @@ icon_state = "p_stair_full" }, /obj/effect/landmark/lv624/fog_blocker/short, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_1) "tbl" = ( /turf/closed/shuttle/dropship2/tornado/typhoon{ @@ -43769,6 +48824,17 @@ icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) +"tbK" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1; + pixel_y = -1 + }, +/turf/open/floor{ + dir = 4; + icon_state = "whiteyellowfull" + }, +/area/lv522/oob/w_y_vault) "tcj" = ( /obj/structure/machinery/light, /turf/open/floor/shiva{ @@ -43871,6 +48937,19 @@ icon_state = "47" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) +"tdM" = ( +/obj/structure/platform{ + dir = 1 + }, +/obj/structure/platform{ + dir = 8 + }, +/obj/structure/platform_decoration{ + dir = 5; + layer = 3.51 + }, +/turf/open/gm/river, +/area/lv522/atmos/sewer) "tdS" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_full" @@ -43939,6 +49018,12 @@ }, /turf/open/asphalt/cement, /area/lv522/outdoors/colony_streets/south_east_street) +"teE" = ( +/obj/structure/bed/chair/comfy, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "teL" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_full" @@ -43975,14 +49060,23 @@ icon_state = "floor_plate" }, /area/lv522/landing_zone_1/ceiling) -"tfP" = ( -/obj/structure/stairs/perspective{ - dir = 5; - icon_state = "p_stair_full" +"tfK" = ( +/obj/structure/surface/table/almayer, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/corsat{ + icon_state = "plate" }, -/turf/open/asphalt/cement{ - icon_state = "cement4" +/area/lv522/atmos/east_reactor/south) +"tfO" = ( +/obj/item/prop/colony/usedbandage{ + dir = 9; + pixel_x = 5; + pixel_y = 15 }, +/turf/closed/wall/strata_ice/dirty, +/area/lv522/oob) +"tfP" = ( +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/n_rockies) "tfV" = ( /turf/closed/shuttle/dropship2/tornado/typhoon{ @@ -43990,11 +49084,11 @@ }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "tfW" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, -/turf/open/floor/corsat{ - icon_state = "plate" +/turf/open/floor/prison{ + dir = 8; + icon_state = "cell_stripe" }, -/area/lv522/atmos/cargo_intake) +/area/lv522/atmos/reactor_garage) "tfZ" = ( /obj/effect/spider/spiderling/nogrow, /turf/open/floor/prison{ @@ -44044,6 +49138,9 @@ /area/lv522/landing_zone_forecon/UD6_Tornado) "thi" = ( /obj/effect/decal/cleanable/blood/xeno, +/obj/structure/platform{ + dir = 8 + }, /turf/open/asphalt/cement{ icon_state = "cement1" }, @@ -44081,7 +49178,7 @@ /area/lv522/outdoors/colony_streets/central_streets) "tiJ" = ( /obj/item/explosive/grenade/incendiary/molotov, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/central_streets) "tiM" = ( /obj/structure/bed/chair{ @@ -44125,8 +49222,11 @@ }, /area/lv522/indoors/c_block/garage) "tjx" = ( -/obj/structure/largecrate/random/mini, -/turf/open/auto_turf/shale/layer0, +/obj/structure/largecrate/random/barrel, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_marked" + }, /area/lv522/landing_zone_2/ceiling) "tjM" = ( /obj/structure/pipes/standard/manifold/fourway/hidden/green, @@ -44210,8 +49310,14 @@ /obj/structure/prop/ice_colony/ground_wire{ dir = 8 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) +"tlv" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor/corsat{ + icon_state = "brown" + }, +/area/lv522/atmos/east_reactor/south) "tlz" = ( /obj/structure/bed/chair{ dir = 1 @@ -44345,7 +49451,9 @@ /obj/structure/platform{ dir = 8 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/asphalt/cement{ + icon_state = "cement1" + }, /area/lv522/outdoors/colony_streets/south_east_street) "tns" = ( /obj/structure/machinery/landinglight/ds1{ @@ -44390,6 +49498,12 @@ icon_state = "greenfull" }, /area/lv522/indoors/b_block/bridge) +"tos" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/turf/open/asphalt/cement, +/area/lv522/landing_zone_2/ceiling) "tov" = ( /obj/item/stack/tile/plasteel{ name = "ceiling tile"; @@ -44470,6 +49584,11 @@ icon_state = "white_cyan3" }, /area/lv522/indoors/a_block/medical/glass) +"tpV" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/toolbox/mechanical/green, +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv522/atmos/way_in_command_centre) "tpZ" = ( /obj/structure/curtain/red, /turf/open/floor/prison, @@ -44481,6 +49600,15 @@ icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_east_street) +"tqh" = ( +/obj/structure/bed/chair/comfy{ + dir = 1 + }, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "brown" + }, +/area/lv522/atmos/east_reactor/south) "tqG" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic, /obj/structure/pipes/standard/simple/hidden/green{ @@ -44624,6 +49752,15 @@ icon_state = "greenfull" }, /area/lv522/indoors/b_block/bridge) +"ttf" = ( +/obj/effect/landmark/corpsespawner/forecon_spotter, +/obj/item/weapon/gun/rifle/m41a{ + current_mag = null + }, +/obj/effect/spawner/gibspawner/human, +/obj/effect/decal/cleanable/blood, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/nw_rockies) "tth" = ( /obj/structure/bed/chair/dropship/passenger{ dir = 4 @@ -44657,7 +49794,7 @@ icon_state = "p_stair_full" }, /obj/effect/landmark/lv624/fog_blocker/short, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_1) "tue" = ( /obj/structure/machinery/cryo_cell, @@ -44729,7 +49866,7 @@ /obj/structure/barricade/wooden{ dir = 8 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/central_streets) "tvx" = ( /obj/effect/decal/cleanable/dirt, @@ -44807,12 +49944,22 @@ /area/lv522/indoors/a_block/medical) "twT" = ( /obj/structure/cargo_container/grant/right, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/central_streets) "twY" = ( /mob/living/simple_animal/mouse, /turf/open/organic/grass, /area/lv522/indoors/a_block/garden) +"txo" = ( +/obj/structure/bed/chair/comfy{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/corsat{ + dir = 10; + icon_state = "brown" + }, +/area/lv522/atmos/east_reactor/south) "txs" = ( /turf/open/floor/corsat{ dir = 1; @@ -44828,6 +49975,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/dorms/glass) +"tyb" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/sewer) "tyc" = ( /obj/structure/surface/rack, /obj/item/storage/bag/ore, @@ -44875,6 +50031,15 @@ }, /turf/open/floor/wood, /area/lv522/indoors/a_block/fitness/glass) +"tyU" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/sewer) "tzd" = ( /turf/closed/shuttle/elevator{ dir = 4 @@ -44969,7 +50134,7 @@ /area/lv522/indoors/a_block/garden) "tBb" = ( /obj/structure/prop/dam/drill, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) "tBw" = ( /obj/structure/prop/invuln/lifeboat_hatch_placeholder{ @@ -44988,7 +50153,7 @@ /obj/structure/barricade/wooden{ dir = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/central_streets) "tBM" = ( /turf/open/shuttle/dropship{ @@ -45023,6 +50188,16 @@ icon_state = "marked" }, /area/lv522/indoors/a_block/hallway) +"tCa" = ( +/obj/item/trash/uscm_mre{ + pixel_x = 10; + pixel_y = -2 + }, +/obj/item/trash/uscm_mre{ + pixel_y = 10 + }, +/turf/closed/wall/strata_ice/dirty, +/area/lv522/oob) "tCh" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -45038,7 +50213,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) "tCs" = ( /obj/structure/machinery/prop/almayer/computer/PC{ @@ -45262,7 +50437,7 @@ pixel_x = -8; pixel_y = 7 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) "tGh" = ( /obj/effect/decal/cleanable/dirt, @@ -45273,7 +50448,7 @@ dir = 1; icon_state = "fab_2" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/north_street) "tGm" = ( /obj/structure/machinery/door/airlock/almayer/generic{ @@ -45286,6 +50461,11 @@ "tGo" = ( /turf/open/floor/wood, /area/lv522/indoors/c_block/casino) +"tGw" = ( +/turf/open/asphalt/cement{ + icon_state = "cement9" + }, +/area/lv522/landing_zone_2) "tGy" = ( /obj/structure/bed/chair/comfy, /obj/item/stack/sheet/wood, @@ -45345,6 +50525,13 @@ icon_state = "squares" }, /area/lv522/indoors/c_block/mining) +"tHC" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/filt) "tHJ" = ( /obj/structure/platform{ dir = 8 @@ -45418,8 +50605,23 @@ icon_state = "p_stair_full" }, /obj/structure/pipes/standard/manifold/hidden/green, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) +"tJM" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 5 + }, +/obj/structure/machinery/light/small{ + dir = 8 + }, +/obj/structure/machinery/camera/autoname{ + dir = 4 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, +/area/lv522/indoors/a_block/fitness) "tJN" = ( /obj/structure/bed/chair, /turf/open/floor/prison, @@ -45434,7 +50636,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) "tKf" = ( /obj/structure/machinery/washing_machine{ @@ -45478,6 +50680,16 @@ /obj/effect/spawner/random/toolbox, /turf/open/floor/plating, /area/lv522/indoors/c_block/garage) +"tKR" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/prop/almayer/computer/PC{ + dir = 8; + pixel_y = 3 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/reactor_garage) "tKS" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/lv624/fog_blocker/short, @@ -45548,6 +50760,16 @@ icon_state = "plate" }, /area/lv522/atmos/cargo_intake) +"tLX" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor{ + dir = 4; + icon_state = "whiteyellowfull" + }, +/area/lv522/oob/w_y_vault) "tMk" = ( /turf/open/floor/prison, /area/lv522/indoors/a_block/bridges/dorms_fitness) @@ -45612,9 +50834,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, /area/lv522/indoors/c_block/casino) +"tMV" = ( +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/east_reactor/south) "tNc" = ( /obj/structure/prop/ice_colony/ground_wire, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/south_street) "tNl" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -45631,17 +50858,18 @@ /area/lv522/indoors/a_block/hallway) "tNQ" = ( /obj/structure/largecrate, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) "tNT" = ( -/obj/structure/desertdam/decals/road_edge{ - icon_state = "road_edge_decal3"; - pixel_y = -12 +/obj/structure/prop/vehicles/crawler{ + icon_state = "crawler_covered_bed"; + unacidable = 0; + unslashable = 0 }, -/obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/barricade/handrail/wire, -/turf/open/floor/wood, -/area/lv522/indoors/a_block/fitness/glass) +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/reactor_garage) "tOe" = ( /obj/structure/platform{ dir = 8 @@ -45662,7 +50890,10 @@ dir = 8; icon_state = "p_stair_full" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/north_east_street) +"tOt" = ( +/turf/closed/wall/strata_outpost, /area/lv522/outdoors/colony_streets/north_east_street) "tOv" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -45679,6 +50910,15 @@ }, /turf/open/floor/prison, /area/lv522/indoors/c_block/mining) +"tOM" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + dir = 8; + icon_state = "browncorner" + }, +/area/lv522/atmos/east_reactor/south) "tOV" = ( /obj/structure/cargo_container/watatsumi/leftmid, /turf/open/asphalt/cement{ @@ -45707,7 +50947,7 @@ /obj/structure/platform{ dir = 4 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_1) "tPr" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -45723,7 +50963,7 @@ /obj/structure/prop/ice_colony/ground_wire{ dir = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) "tPx" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -45763,6 +51003,12 @@ icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/outdoor_bot) +"tQw" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/east_reactor/west) "tQE" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ dir = 1; @@ -45807,6 +51053,12 @@ icon_state = "greenfull" }, /area/lv522/landing_zone_1/ceiling) +"tRS" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "tSb" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -45815,11 +51067,11 @@ icon_state = "N"; pixel_y = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_west_street) "tSm" = ( /obj/structure/cargo_container/kelland/right, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/east_central_street) "tSn" = ( /obj/structure/girder, @@ -45858,12 +51110,29 @@ icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) +"tTl" = ( +/obj/structure/prop/almayer/computers/sensor_computer3{ + layer = 2.9 + }, +/obj/structure/machinery/door_display/research_cell{ + id = "Reactor_entry_1"; + pixel_x = 5; + pixel_y = -7; + req_access = null + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "tTr" = ( /obj/item/lightstick/red/spoke/planted{ pixel_x = -13 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/w_rockies) +"tTv" = ( +/turf/closed/wall/r_wall/biodome/biodome_unmeltable, +/area/lv522/atmos/way_in_command_centre) "tTD" = ( /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/east_central_street) @@ -45934,11 +51203,17 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) "tUM" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/dorms) +"tVa" = ( +/obj/structure/window/framed/strata/reinforced, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/way_in_command_centre) "tVj" = ( /obj/structure/largecrate/random/barrel/white, /obj/effect/landmark/lv624/fog_blocker/short, @@ -45951,7 +51226,7 @@ /obj/structure/barricade/wooden{ dir = 4 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/central_streets) "tVw" = ( /obj/effect/decal/cleanable/dirt, @@ -45991,7 +51266,7 @@ /area/lv522/indoors/a_block/fitness) "tWE" = ( /obj/structure/pipes/standard/manifold/hidden/green, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) "tWX" = ( /obj/item/storage/backpack, @@ -46048,6 +51323,14 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) +"tXp" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor/corsat{ + dir = 4; + icon_state = "browncorner" + }, +/area/lv522/atmos/east_reactor/south) "tXG" = ( /obj/structure/bed/chair{ dir = 8 @@ -46149,7 +51432,7 @@ /obj/structure/prop/ice_colony/ground_wire{ dir = 4 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_street) "tZJ" = ( /obj/structure/reagent_dispensers/water_cooler/stacks{ @@ -46171,7 +51454,7 @@ dir = 4 }, /obj/effect/landmark/lv624/fog_blocker/short, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_1) "tZP" = ( /obj/item/prop/alien/hugger, @@ -46224,6 +51507,10 @@ icon_state = "marked" }, /area/lv522/indoors/a_block/dorms/glass) +"uaY" = ( +/obj/effect/decal/cleanable/dirt, +/turf/closed/wall/strata_outpost, +/area/lv522/outdoors/colony_streets/windbreaker/observation) "ubd" = ( /obj/structure/closet/boxinggloves, /turf/open/floor/prison{ @@ -46255,6 +51542,11 @@ icon_state = "kitchen" }, /area/lv522/indoors/a_block/fitness) +"ubF" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv522/atmos/sewer) "ubH" = ( /obj/structure/stairs/perspective{ dir = 6; @@ -46308,11 +51600,17 @@ icon_state = "greenfull" }, /area/lv522/indoors/a_block/fitness) +"ucY" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/way_in_command_centre) "udi" = ( /obj/structure/platform{ dir = 8 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_1) "udv" = ( /obj/structure/surface/table/almayer, @@ -46359,6 +51657,15 @@ icon_state = "brown" }, /area/lv522/atmos/cargo_intake) +"udU" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 9 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/cargo_intake) "uea" = ( /obj/structure/surface/table/almayer, /obj/structure/window/reinforced, @@ -46389,7 +51696,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) "uew" = ( /obj/item/tool/screwdriver, @@ -46456,7 +51763,8 @@ /area/lv522/indoors/a_block/security) "ueY" = ( /obj/structure/machinery/door/airlock/almayer/maint{ - dir = 1 + dir = 1; + welded = 1 }, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ id = "LV_522_Hydro-Lockdown"; @@ -46519,15 +51827,16 @@ }, /area/lv522/indoors/a_block/hallway) "ugi" = ( -/obj/item/lightstick/red/spoke/planted{ - pixel_x = -9; - pixel_y = -2 +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 5 }, -/obj/structure/prop/ice_colony/ground_wire{ - dir = 4 +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor/corsat{ + dir = 8; + icon_state = "brown" }, -/turf/open/auto_turf/shale/layer0, -/area/lv522/outdoors/colony_streets/central_streets) +/area/lv522/atmos/cargo_intake) "ugn" = ( /obj/structure/prop/invuln/ice_prefab/roof_greeble{ icon_state = "vent2"; @@ -46570,6 +51879,7 @@ /area/lv522/landing_zone_2) "ugN" = ( /obj/item/storage/backpack/marine/satchel/scout_cloak, +/obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat, /area/lv522/atmos/east_reactor/south) "ugR" = ( @@ -46577,7 +51887,7 @@ /turf/open/floor/carpet, /area/lv522/indoors/c_block/casino) "ugV" = ( -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_street) "ugX" = ( /obj/effect/decal/cleanable/dirt, @@ -46606,20 +51916,12 @@ /turf/open/floor/prison, /area/lv522/indoors/c_block/mining) "uhx" = ( -/obj/structure/prop/invuln/overhead_pipe{ - dir = 4; - name = "overhead pipe"; - pixel_x = 16; - pixel_y = -6 - }, -/obj/structure/prop/invuln/overhead_pipe{ - dir = 6; - name = "overhead pipe"; - pixel_x = -8; - pixel_y = -6 +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 }, -/turf/open/floor/plating/plating_catwalk/prison, -/area/lv522/atmos/cargo_intake) +/turf/open/floor/corsat, +/area/lv522/atmos/east_reactor/south) "uhF" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/weapon/pole/fancy_cane, @@ -46674,7 +51976,7 @@ dir = 1; icon_state = "fab_2" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/central_streets) "uih" = ( /obj/effect/decal/cleanable/dirt, @@ -46706,8 +52008,7 @@ }, /area/lv522/indoors/a_block/admin) "uiK" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/w_rockies) "uiM" = ( /turf/open/floor/prison, @@ -46748,15 +52049,15 @@ /obj/structure/prop/ice_colony/ground_wire{ dir = 4 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_2) "uje" = ( /obj/effect/decal/cleanable/blood/oil, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/south_east_street) "ujg" = ( -/obj/structure/window/framed/colony, -/turf/open/floor/corsat, +/obj/structure/window/framed/strata/reinforced, +/turf/open/floor/plating, /area/lv522/atmos/east_reactor/south) "ujq" = ( /obj/structure/surface/table/reinforced/prison, @@ -46867,7 +52168,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) "unt" = ( /turf/closed/wall/mineral/bone_resin, @@ -46892,7 +52193,7 @@ dir = 1; icon_state = "p_stair_full" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_1) "unQ" = ( /obj/structure/surface/rack, @@ -46908,6 +52209,12 @@ /obj/structure/pipes/vents/pump, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) +"unU" = ( +/obj/structure/prop/dam/crane/damaged, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/reactor_garage) "unX" = ( /obj/item/weapon/twohanded/folded_metal_chair, /obj/structure/pipes/standard/simple/hidden/green{ @@ -46976,6 +52283,13 @@ icon_state = "marked" }, /area/lv522/indoors/b_block/bridge) +"upa" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/corsat{ + dir = 8; + icon_state = "brown" + }, +/area/lv522/atmos/east_reactor/south) "upc" = ( /obj/structure/machinery/suit_storage_unit{ pixel_x = -9 @@ -47054,7 +52368,7 @@ /turf/open/floor/plating, /area/lv522/indoors/a_block/admin) "uqt" = ( -/obj/structure/largecrate, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/floor/corsat{ icon_state = "marked" }, @@ -47093,6 +52407,13 @@ }, /turf/open/floor/prison, /area/lv522/indoors/c_block/mining) +"urp" = ( +/obj/structure/platform{ + dir = 1 + }, +/obj/structure/largecrate/random, +/turf/open/asphalt/cement, +/area/lv522/outdoors/n_rockies) "uru" = ( /turf/closed/shuttle/dropship2/tornado{ icon_state = "66" @@ -47186,6 +52507,11 @@ icon_state = "greenfull" }, /area/lv522/landing_zone_1/ceiling) +"utq" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/obj/item/stack/sheet/metal, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/north_east_street) "utx" = ( /obj/structure/surface/table/almayer, /obj/item/ashtray/plastic{ @@ -47205,6 +52531,20 @@ icon_state = "greenfull" }, /area/lv522/landing_zone_1/ceiling) +"utH" = ( +/obj/effect/spawner/gibspawner/xeno, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_x = -1; + pixel_y = 2 + }, +/obj/effect/decal/cleanable/blood/xeno{ + icon_state = "xgib3" + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "utR" = ( /obj/structure/machinery/power/apc/weak{ dir = 1 @@ -47239,6 +52579,12 @@ /obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/plating, /area/lv522/landing_zone_1/tunnel) +"uul" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/floor/corsat{ + icon_state = "browncorner" + }, +/area/lv522/atmos/east_reactor/south) "uur" = ( /obj/effect/decal/cleanable/blood/oil/streak, /turf/open/floor/strata{ @@ -47295,7 +52641,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "SW-out" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_street) "uvk" = ( /obj/structure/prop/server_equipment/yutani_server/broken{ @@ -47308,6 +52654,15 @@ icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) +"uvt" = ( +/obj/item/ammo_magazine/rifle/heap{ + current_rounds = 0 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "uvC" = ( /obj/structure/closet/crate/trashcart, /obj/item/trash/buritto, @@ -47351,7 +52706,7 @@ }, /area/lv522/landing_zone_forecon/UD6_Tornado) "uwT" = ( -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) "uwY" = ( /obj/item/stack/rods, @@ -47375,13 +52730,19 @@ icon_state = "white_cyan1" }, /area/lv522/indoors/a_block/medical/glass) +"uxd" = ( +/obj/effect/spawner/gibspawner/xeno, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/nw_rockies) "uxf" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/floor/corsat{ icon_state = "marked" }, /area/lv522/atmos/cargo_intake) "uxi" = ( /obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/floor/corsat{ icon_state = "marked" }, @@ -47398,7 +52759,7 @@ icon_state = "SE-out"; pixel_x = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) "uya" = ( /turf/open/floor/prison{ @@ -47463,10 +52824,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms) -"uzk" = ( -/obj/structure/largecrate/random/barrel/white, -/turf/open/floor/plating/plating_catwalk/prison, -/area/lv522/outdoors/nw_rockies) "uzr" = ( /obj/structure/stairs/perspective{ dir = 8; @@ -47475,13 +52832,19 @@ /obj/structure/platform, /turf/open/floor/plating, /area/lv522/landing_zone_1/tunnel) -"uzI" = ( -/obj/structure/platform_decoration, -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" +"uzD" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/prop/almayer/computer/PC{ + pixel_x = 4; + pixel_y = 6 }, -/turf/open/auto_turf/shale/layer0, -/area/lv522/landing_zone_2) +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) +"uzI" = ( +/turf/closed/wall/solaris/reinforced/hull/lv522, +/area/space) "uzK" = ( /obj/item/stack/rods, /turf/open/floor/prison{ @@ -47509,7 +52872,7 @@ icon_state = "SE-out"; pixel_x = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) "uAd" = ( /turf/open/floor/corsat{ @@ -47580,6 +52943,12 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/security) +"uDC" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/corsat, +/area/lv522/atmos/east_reactor/east) "uDF" = ( /obj/structure/largecrate/random, /turf/open/floor/prison, @@ -47739,8 +53108,18 @@ /area/lv522/landing_zone_1) "uFz" = ( /obj/item/clipboard, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) +"uFA" = ( +/obj/structure/surface/table/almayer, +/obj/item/paper_bin{ + pixel_x = -7; + pixel_y = 7 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "uFB" = ( /obj/structure/prop/invuln/ice_prefab{ dir = 10; @@ -47773,6 +53152,12 @@ icon_state = "marked" }, /area/lv522/indoors/c_block/mining) +"uFT" = ( +/turf/open/floor/corsat{ + dir = 10; + icon_state = "brown" + }, +/area/lv522/atmos/reactor_garage) "uGa" = ( /obj/effect/decal/cleanable/dirt, /obj/item/storage/pill_bottle/tramadol/skillless{ @@ -47788,14 +53173,29 @@ /obj/effect/decal/warning_stripes{ icon_state = "SW-out" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) +"uGj" = ( +/obj/structure/barricade/deployable{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "uGl" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) +"uGK" = ( +/obj/structure/machinery/door/airlock/almayer/maint, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/reactor_garage) "uGO" = ( /obj/structure/coatrack{ pixel_x = 11; @@ -47876,7 +53276,7 @@ /area/lv522/indoors/a_block/hallway) "uIe" = ( /obj/structure/ore_box, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) "uIk" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -47884,6 +53284,13 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/b_block/bridge) +"uIn" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_marked" + }, +/area/lv522/landing_zone_2) "uIo" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/prison{ @@ -48008,8 +53415,13 @@ }, /area/lv522/indoors/a_block/bridges/op_centre) "uKD" = ( -/turf/closed/wall/strata_outpost/reinforced, -/area/lv522/oob/w_y_vault) +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/filt) "uKE" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 @@ -48026,7 +53438,7 @@ /obj/structure/barricade/wooden{ dir = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/east_central_street) "uKS" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -48097,7 +53509,8 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/auto_turf/shale/layer0, +/obj/structure/prop/ice_colony/ground_wire, +/turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/central_streets) "uMc" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -48117,6 +53530,10 @@ icon_state = "radiator_tile2" }, /area/lv522/indoors/a_block/kitchen) +"uMr" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison, +/area/lv522/landing_zone_2) "uMM" = ( /obj/item/prop/alien/hugger, /turf/open/floor/prison, @@ -48144,7 +53561,7 @@ /area/lv522/indoors/c_block/casino) "uNg" = ( /obj/item/tool/pickaxe, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) "uNp" = ( /turf/open/floor/carpet, @@ -48284,6 +53701,15 @@ icon_state = "floor_marked" }, /area/lv522/landing_zone_1/ceiling) +"uPv" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/prop/almayer/computer/PC{ + pixel_y = 3 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "uPy" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -48326,11 +53752,11 @@ }, /area/lv522/indoors/a_block/corpo/glass) "uQi" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 9 +/obj/item/clothing/suit/storage/marine/smooth, +/turf/open/floor/corsat{ + icon_state = "plate" }, -/turf/open/auto_turf/shale/layer0, -/area/lv522/outdoors/colony_streets/north_west_street) +/area/lv522/atmos/east_reactor/south) "uQn" = ( /obj/structure/platform{ dir = 1 @@ -48447,16 +53873,16 @@ }, /area/lv522/outdoors/colony_streets/north_west_street) "uSo" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison{ - dir = 4; - icon_state = "greenfull" +/obj/item/storage/backpack/marine/satchel{ + desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; + icon = 'icons/obj/janitor.dmi'; + icon_state = "trashbag3"; + name = "trash bag"; + pixel_x = -4; + pixel_y = 6 }, -/area/lv522/indoors/a_block/fitness) +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/north_west_street) "uSv" = ( /obj/effect/acid_hole, /turf/closed/wall/strata_outpost, @@ -48483,13 +53909,17 @@ icon_state = "marked" }, /area/lv522/indoors/a_block/corpo) +"uSJ" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 5 + }, +/turf/open/floor/prison, +/area/lv522/indoors/a_block/dorm_north) "uSY" = ( /obj/structure/machinery/colony_floodlight{ layer = 4.3 }, -/turf/open/asphalt/cement{ - icon_state = "cement4" - }, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/n_rockies) "uSZ" = ( /obj/item/toy/beach_ball/holoball{ @@ -48499,7 +53929,7 @@ /obj/structure/holohoop{ dir = 4 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) "uTd" = ( /obj/structure/machinery/landinglight/ds1/delaytwo{ @@ -48523,6 +53953,13 @@ /obj/structure/window_frame/strata, /turf/open/floor/plating, /area/lv522/indoors/a_block/corpo) +"uTy" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat{ + dir = 8; + icon_state = "brown" + }, +/area/lv522/atmos/east_reactor/south) "uTI" = ( /obj/structure/machinery/light{ dir = 8 @@ -48602,11 +54039,12 @@ /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms/glass) "uVa" = ( -/obj/effect/spawner/gibspawner/xeno, -/turf/open/asphalt/cement{ - icon_state = "cement1" +/obj/effect/landmark/monkey_spawn, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat{ + icon_state = "marked" }, -/area/lv522/outdoors/colony_streets/north_east_street) +/area/lv522/atmos/filt) "uVj" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ @@ -48699,7 +54137,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "S" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/central_streets) "uWI" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ @@ -48710,7 +54148,7 @@ }, /area/lv522/indoors/b_block/bar) "uWO" = ( -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/nw_rockies) "uWT" = ( /obj/structure/machinery/portable_atmospherics/hydroponics{ @@ -48721,14 +54159,10 @@ }, /area/lv522/indoors/b_block/hydro/glass) "uXa" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, +/obj/structure/largecrate/random/barrel/green, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 10; + icon_state = "floor_marked" }, /area/lv522/landing_zone_2/ceiling) "uXj" = ( @@ -48741,7 +54175,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "S" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_street) "uXu" = ( /obj/structure/stairs/perspective{ @@ -48780,6 +54214,13 @@ icon_state = "greenfull" }, /area/lv522/landing_zone_1) +"uZf" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor/corsat{ + dir = 6; + icon_state = "brown" + }, +/area/lv522/atmos/west_reactor) "uZC" = ( /obj/structure/surface/table/almayer, /obj/item/trash/plate{ @@ -48801,6 +54242,12 @@ icon_state = "greenfull" }, /area/lv522/indoors/a_block/fitness) +"uZV" = ( +/turf/open/floor/prison{ + dir = 8; + icon_state = "cell_stripe" + }, +/area/lv522/atmos/way_in_command_centre) "vae" = ( /obj/item/prop/colony/used_flare, /turf/open/auto_turf/shale/layer1, @@ -48838,11 +54285,12 @@ }, /area/lv522/indoors/c_block/cargo) "vaZ" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 +/obj/item/lightstick/red/spoke/planted{ + pixel_x = -10; + pixel_y = 25 }, -/turf/closed/wall/strata_ice/dirty, -/area/lv522/oob) +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/colony_streets/central_streets) "vbk" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_full" @@ -48855,14 +54303,21 @@ }, /area/lv522/landing_zone_forecon/UD6_Tornado) "vbm" = ( -/obj/structure/prop/invuln/overhead_pipe{ - dir = 6; - name = "overhead pipe"; - pixel_x = -10; - pixel_y = -6 +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 }, -/turf/open/floor/plating/plating_catwalk/prison, -/area/lv522/atmos/cargo_intake) +/obj/item/clothing/mask/facehugger{ + desc = "It has some sort of a tube at the end of its tail. What the hell is this thing?"; + icon_state = "facehugger_impregnated"; + layer = 3; + name = "????"; + stat = 2 + }, +/turf/open/floor/corsat{ + dir = 8; + icon_state = "brown" + }, +/area/lv522/atmos/east_reactor/south) "vbu" = ( /obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison, @@ -48924,6 +54379,18 @@ "vcu" = ( /turf/closed/shuttle/dropship2/tornado/typhoon, /area/lv522/landing_zone_forecon/UD6_Typhoon) +"vcF" = ( +/obj/structure/stairs/perspective{ + dir = 5; + icon_state = "p_stair_full" + }, +/obj/structure/platform{ + dir = 8 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "vcH" = ( /obj/structure/barricade/wooden, /obj/effect/decal/cleanable/dirt, @@ -48939,11 +54406,8 @@ }, /area/lv522/indoors/c_block/mining) "vcR" = ( -/obj/structure/fence, -/turf/open/floor/strata{ - dir = 4; - icon_state = "floor3" - }, +/obj/structure/largecrate/random/mini/med, +/turf/open/floor/prison, /area/lv522/landing_zone_2/ceiling) "vda" = ( /obj/effect/decal/warning_stripes{ @@ -49176,6 +54640,13 @@ /obj/effect/decal/cleanable/blood, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/w_rockies) +"vhr" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "vht" = ( /obj/structure/closet/emcloset, /turf/open/floor/prison{ @@ -49183,6 +54654,13 @@ icon_state = "greenfull" }, /area/lv522/indoors/a_block/fitness/glass) +"vhA" = ( +/obj/item/prop/colony/used_flare, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/lv522/atmos/east_reactor/south) "vhC" = ( /turf/closed/shuttle/dropship2/tornado/typhoon{ icon_state = "4" @@ -49233,7 +54711,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/w_rockies) "viC" = ( /obj/structure/bed/chair/comfy{ @@ -49254,13 +54732,35 @@ icon_state = "cyan2" }, /area/lv522/indoors/a_block/medical) +"viE" = ( +/obj/structure/platform/strata{ + dir = 1 + }, +/turf/closed/wall/strata_ice/dirty, +/area/lv522/oob) "viG" = ( /obj/effect/decal/cleanable/cobweb, /turf/open/asphalt/cement, /area/lv522/outdoors/colony_streets/east_central_street) +"viH" = ( +/obj/structure/bed/chair/comfy{ + dir = 4 + }, +/turf/open/floor/corsat{ + dir = 10; + icon_state = "brown" + }, +/area/lv522/atmos/east_reactor/south) +"viI" = ( +/obj/structure/pipes/vents/pump, +/obj/vehicle/powerloader, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/reactor_garage) "viN" = ( /obj/effect/decal/cleanable/blood/oil/streak, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/w_rockies) "viR" = ( /obj/structure/surface/table/woodentable/fancy, @@ -49297,8 +54797,11 @@ }, /area/lv522/landing_zone_forecon/UD6_Tornado) "vju" = ( -/turf/closed/wall/strata_outpost, -/area/lv522/oob/w_y_vault) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/reactor_garage) "vjv" = ( /turf/closed/shuttle/dropship2/tornado{ icon_state = "69" @@ -49393,12 +54896,9 @@ /turf/open/floor/prison, /area/lv522/indoors/c_block/mining) "vlq" = ( -/obj/structure/bed/chair, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/lv522/indoors/a_block/fitness) +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor/corsat, +/area/lv522/atmos/east_reactor/south) "vlv" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/device/radio/off{ @@ -49537,6 +55037,13 @@ /obj/structure/bed/chair{ dir = 8 }, +/obj/structure/transmitter/colony_net{ + dir = 8; + phone_category = "LV522 Chances Claim"; + phone_color = "red"; + phone_id = "Colony Casino"; + pixel_x = 16 + }, /turf/open/floor/prison{ icon_state = "darkbrownfull2" }, @@ -49579,11 +55086,23 @@ icon_state = "cement2" }, /area/lv522/outdoors/colony_streets/central_streets) +"voX" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/prop/alien/hugger, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_x = -1; + pixel_y = 2 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "vpa" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_street) "vpe" = ( /obj/effect/decal/cleanable/dirt, @@ -49610,6 +55129,15 @@ /obj/structure/window/framed/strata/reinforced, /turf/open/floor/plating, /area/lv522/landing_zone_2/ceiling) +"vpq" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "vpB" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/space_heater/radiator/red{ @@ -49636,6 +55164,15 @@ icon_state = "70" }, /area/lv522/landing_zone_forecon/UD6_Tornado) +"vqe" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "white_cyan1" + }, +/area/lv522/oob/w_y_vault) "vqk" = ( /obj/vehicle/train/cargo/trolley, /obj/structure/machinery/light, @@ -49704,6 +55241,17 @@ icon_state = "blue_plate" }, /area/lv522/indoors/a_block/admin) +"vrE" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + pixel_y = -1 + }, +/turf/open/floor{ + dir = 4; + icon_state = "whiteyellowfull" + }, +/area/lv522/oob/w_y_vault) "vrV" = ( /obj/structure/window/framed/corsat/hull, /turf/open/floor/corsat{ @@ -49738,6 +55286,18 @@ icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/south_west_street) +"vsj" = ( +/obj/structure/reagent_dispensers/fueltank/gas, +/obj/item/tool/weldpack{ + layer = 3.1; + pixel_x = -5; + pixel_y = 13 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/reactor_garage) "vsk" = ( /obj/structure/coatrack{ pixel_x = -6; @@ -49765,6 +55325,18 @@ icon_state = "cement1" }, /area/lv522/outdoors/colony_streets/south_east_street) +"vsy" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "vsG" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -49785,6 +55357,15 @@ icon_state = "marked" }, /area/lv522/indoors/c_block/mining) +"vsZ" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 5 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "vtc" = ( /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/nw_rockies) @@ -49861,6 +55442,15 @@ icon_state = "floor_marked" }, /area/lv522/landing_zone_1/ceiling) +"vuS" = ( +/obj/item/ammo_magazine/rifle/heap{ + current_rounds = 0 + }, +/turf/open/floor/corsat{ + dir = 8; + icon_state = "brown" + }, +/area/lv522/atmos/east_reactor/south) "vuY" = ( /obj/item/clothing/mask/facehugger{ desc = "It has some sort of a tube at the end of its tail. What the hell is this thing?"; @@ -49885,7 +55475,7 @@ /area/lv522/indoors/b_block/bridge) "vwi" = ( /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_street) "vwl" = ( /obj/structure/closet/cabinet, @@ -49939,11 +55529,29 @@ /obj/structure/cargo_container/watatsumi/right, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/north_east_street) +"vxq" = ( +/obj/structure/bed/chair/comfy{ + dir = 4 + }, +/turf/open/floor/corsat{ + dir = 5; + icon_state = "brown" + }, +/area/lv522/atmos/east_reactor/south) "vxv" = ( /obj/structure/surface/table/woodentable/fancy, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/carpet, /area/lv522/indoors/b_block/bar) +"vxD" = ( +/obj/effect/spawner/gibspawner/xeno, +/obj/effect/decal/cleanable/blood/xeno{ + icon_state = "xgib3" + }, +/turf/open/floor/prison{ + icon_state = "cell_stripe" + }, +/area/lv522/atmos/way_in_command_centre) "vxG" = ( /obj/structure/stairs/perspective{ dir = 1; @@ -50018,6 +55626,15 @@ }, /turf/open/floor/plating, /area/lv522/indoors/lone_buildings/engineering) +"vzd" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/lv522/atmos/east_reactor/west) "vzg" = ( /obj/item/stack/rods{ pixel_y = -2 @@ -50077,7 +55694,7 @@ /obj/structure/cargo_container/watatsumi/leftmid{ layer = 3.3 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) "vzE" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ @@ -50122,6 +55739,14 @@ icon_state = "floor_marked" }, /area/lv522/landing_zone_1/ceiling) +"vAX" = ( +/obj/structure/bed/chair/comfy, +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "vBa" = ( /obj/structure/girder/displaced, /turf/open/asphalt/cement{ @@ -50202,6 +55827,15 @@ /obj/structure/bed/chair, /turf/open/floor/prison, /area/lv522/indoors/c_block/garage) +"vCv" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper Dormitories"; + welded = null + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/a_block/dorm_north) "vCy" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -50255,8 +55889,10 @@ /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/hallway) "vDo" = ( -/turf/closed/wall/strata_ice/dirty, -/area/lv522/landing_zone_2) +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/landing_zone_2/ceiling) "vDp" = ( /obj/structure/surface/table/almayer, /obj/item/device/flashlight/lamp{ @@ -50273,9 +55909,13 @@ /turf/open/floor/prison, /area/lv522/indoors/c_block/garage) "vDw" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, -/turf/open/floor/prison, -/area/lv522/atmos/outdoor) +/obj/item/ammo_magazine/rifle/heap{ + current_rounds = 0 + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/stack/sheet/metal, +/turf/open/floor/corsat, +/area/lv522/atmos/east_reactor/south) "vDL" = ( /obj/structure/prop/ice_colony/dense/planter_box{ dir = 5 @@ -50300,7 +55940,7 @@ /obj/structure/pipes/standard/manifold/hidden/green{ dir = 8 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) "vEw" = ( /obj/structure/filingcabinet{ @@ -50351,15 +55991,26 @@ dir = 9; icon_state = "p_stair_full" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) +"vFD" = ( +/obj/structure/platform{ + dir = 8 + }, +/obj/structure/platform, +/obj/structure/platform_decoration{ + dir = 10; + layer = 3.51 + }, +/turf/open/gm/river, +/area/lv522/atmos/sewer) "vFH" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/item/lightstick/red/spoke/planted{ pixel_x = -9; pixel_y = 25 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) "vFJ" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -50409,6 +56060,12 @@ /obj/effect/decal/cleanable/blood/xeno, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/north_east_street) +"vGB" = ( +/obj/structure/window/framed/strata/reinforced, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/outdoors/colony_streets/windbreaker/observation) "vGG" = ( /obj/structure/pipes/standard/manifold/hidden/green, /turf/open/floor/plating/plating_catwalk/prison, @@ -50487,7 +56144,7 @@ /area/lv522/indoors/a_block/dorms) "vHN" = ( /obj/structure/prop/ice_colony/ground_wire, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/central_streets) "vHU" = ( /obj/structure/surface/table/almayer, @@ -50518,6 +56175,16 @@ icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) +"vIe" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, +/area/lv522/indoors/a_block/fitness) "vIg" = ( /obj/structure/machinery/door/airlock/almayer/generic{ dir = 1; @@ -50550,6 +56217,14 @@ icon_state = "brown" }, /area/lv522/atmos/east_reactor/south) +"vIU" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "vJb" = ( /turf/open/floor/prison{ dir = 1; @@ -50592,6 +56267,21 @@ icon_state = "greenfull" }, /area/lv522/indoors/a_block/fitness) +"vJw" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/storage/backpack/marine/satchel{ + desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; + icon = 'icons/obj/janitor.dmi'; + icon_state = "trashbag3"; + name = "trash bag"; + pixel_x = -4; + pixel_y = 5 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "cell_stripe" + }, +/area/lv522/atmos/sewer) "vJD" = ( /obj/structure/window/framed/strata/reinforced, /obj/structure/curtain/red, @@ -50657,6 +56347,10 @@ }, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/central_streets) +"vKP" = ( +/obj/item/stack/sheet/metal, +/turf/open/floor/corsat, +/area/lv522/oob) "vKR" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 @@ -50793,6 +56487,13 @@ "vNk" = ( /turf/closed/wall/strata_outpost, /area/lv522/indoors/c_block/casino) +"vNr" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/corsat, +/area/lv522/atmos/east_reactor) "vNy" = ( /obj/effect/decal/cleanable/blood, /obj/structure/bed/roller, @@ -50921,7 +56622,7 @@ icon_state = "E"; pixel_x = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/nw_rockies) "vPl" = ( /obj/effect/decal/cleanable/dirt, @@ -50966,6 +56667,12 @@ }, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/central_streets) +"vQn" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor/corsat{ + icon_state = "brown" + }, +/area/lv522/atmos/east_reactor) "vQL" = ( /obj/effect/decal/cleanable/blood, /obj/structure/pipes/standard/simple/hidden/green{ @@ -51024,6 +56731,14 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) +"vRv" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/largecrate/random/mini/wooden, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, +/area/lv522/indoors/a_block/fitness) "vRQ" = ( /obj/structure/surface/table/almayer, /obj/item/stack/sheet/metal/medium_stack, @@ -51057,6 +56772,7 @@ /area/lv522/indoors/c_block/mining) "vSJ" = ( /obj/structure/blocker/forcefield/vehicles, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/floor/corsat{ icon_state = "marked" }, @@ -51071,6 +56787,15 @@ }, /turf/open/asphalt/cement, /area/lv522/outdoors/colony_streets/central_streets) +"vSO" = ( +/obj/structure/machinery/power/apc/weak{ + dir = 1 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, +/area/lv522/indoors/a_block/fitness) "vSU" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -51099,13 +56824,22 @@ pixel_x = 12; pixel_y = 6 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/central_streets) "vTx" = ( /turf/open/asphalt/cement{ icon_state = "cement3" }, /area/lv522/outdoors/colony_streets/north_east_street) +"vTK" = ( +/obj/structure/prop/vehicles{ + icon_state = "van_damaged" + }, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "brown" + }, +/area/lv522/atmos/reactor_garage) "vTO" = ( /obj/structure/machinery/landinglight/ds1{ dir = 1 @@ -51203,7 +56937,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "W" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_west_street) "vVh" = ( /obj/structure/machinery/light{ @@ -51238,6 +56972,13 @@ icon_state = "marked" }, /area/lv522/indoors/b_block/bar) +"vVx" = ( +/obj/structure/reagent_dispensers/watertank, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/way_in_command_centre) "vVS" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -51245,15 +56986,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) -"vWc" = ( -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_full" - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/lv522/landing_zone_2/ceiling) "vWe" = ( /obj/structure/barricade/wooden{ dir = 1; @@ -51281,6 +57013,18 @@ icon_state = "marked" }, /area/lv522/indoors/c_block/casino) +"vWv" = ( +/obj/structure/stairs/perspective{ + dir = 5; + icon_state = "p_stair_full" + }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/asphalt/cement{ + icon_state = "cement4" + }, +/area/lv522/outdoors/colony_streets/north_west_street) "vWI" = ( /obj/structure/largecrate/random, /turf/open/floor/prison, @@ -51337,7 +57081,7 @@ /obj/structure/platform_decoration{ dir = 8 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_1) "vYL" = ( /obj/structure/pipes/standard/manifold/hidden/green, @@ -51428,6 +57172,10 @@ }, /turf/open/floor/prison, /area/lv522/indoors/c_block/mining) +"vZY" = ( +/obj/structure/cargo_container/grant/rightmid, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/w_rockies) "wac" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ @@ -51474,7 +57222,7 @@ /obj/structure/platform{ dir = 4 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/asphalt/cement, /area/lv522/outdoors/colony_streets/south_east_street) "waZ" = ( /obj/item/trash/uscm_mre, @@ -51653,7 +57401,7 @@ /obj/structure/platform{ dir = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_1) "wea" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -51684,13 +57432,13 @@ dir = 10; icon_state = "p_stair_full" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_1) "weJ" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) "weM" = ( /obj/structure/cargo_container/horizontal/blue/middle{ @@ -51894,6 +57642,12 @@ icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2) +"whK" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/east_reactor/south) "whR" = ( /obj/item/newspaper, /obj/effect/decal/cleanable/dirt, @@ -51950,7 +57704,7 @@ /obj/structure/stairs/perspective{ icon_state = "p_stair_full" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_1) "wjf" = ( /obj/structure/bed/chair/wood/normal{ @@ -51958,6 +57712,15 @@ }, /turf/open/floor/carpet, /area/lv522/indoors/c_block/casino) +"wjy" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/lv522/atmos/east_reactor/south) "wjE" = ( /obj/structure/platform_decoration{ dir = 8 @@ -51966,7 +57729,7 @@ dir = 6; icon_state = "p_stair_full" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_1) "wjF" = ( /obj/structure/cargo_container/horizontal/blue/middle{ @@ -51981,6 +57744,17 @@ }, /turf/open/floor/prison, /area/lv522/indoors/lone_buildings/outdoor_bot) +"wjP" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 + }, +/turf/open/floor{ + dir = 4; + icon_state = "whiteyellowfull" + }, +/area/lv522/oob/w_y_vault) "wke" = ( /obj/structure/stairs/perspective{ dir = 1; @@ -52164,11 +57938,21 @@ layer = 3.1; pixel_y = 17 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) "woG" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/atmos/filt) +"woR" = ( +/obj/structure/platform_decoration{ + dir = 4 + }, +/turf/open/gm/river, +/area/lv522/atmos/filt) +"woU" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv522/atmos/sewer) "wpa" = ( /obj/structure/prop/server_equipment{ icon_state = "rackframe_broken" @@ -52254,6 +58038,12 @@ icon_state = "greenfull" }, /area/lv522/indoors/b_block/bridge) +"wrc" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 10 + }, +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv522/atmos/reactor_garage) "wrg" = ( /obj/structure/coatrack{ pixel_x = 10; @@ -52313,7 +58103,7 @@ dir = 1; icon_state = "p_stair_full" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) "wsT" = ( /obj/structure/machinery/light{ @@ -52335,6 +58125,12 @@ icon_state = "cement4" }, /area/lv522/outdoors/colony_streets/north_street) +"wsY" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/central_streets) "wth" = ( /obj/structure/prop/ice_colony/ground_wire{ dir = 1 @@ -52424,7 +58220,7 @@ /area/lv522/indoors/a_block/corpo) "wvd" = ( /obj/structure/prop/dam/crane/damaged, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) "wvq" = ( /obj/structure/machinery/seed_extractor, @@ -52436,6 +58232,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/lone_buildings/outdoor_bot) +"wvB" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "brown" + }, +/area/lv522/atmos/east_reactor/south) "wvO" = ( /obj/structure/filingcabinet, /turf/open/floor/strata{ @@ -52466,6 +58270,13 @@ /obj/structure/pipes/standard/manifold/fourway/hidden/green, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/dorms) +"wwi" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/east_reactor/west) "wwn" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/tool/shovel/etool/folded, @@ -52500,6 +58311,11 @@ icon_state = "marked" }, /area/lv522/oob) +"wwG" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/toolbox/emergency, +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv522/atmos/way_in_command_centre) "wwJ" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -52613,14 +58429,16 @@ }, /area/lv522/indoors/b_block/hydro) "wyA" = ( -/obj/structure/prop/invuln/overhead/flammable_pipe/fly{ - icon_state = "flammable_pipe_2" - }, /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/floor/corsat, -/area/lv522/atmos/east_reactor) +/obj/item/weapon/gun/rifle/m41a{ + current_mag = null + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "wyE" = ( /obj/structure/surface/table/almayer, /obj/effect/landmark/objective_landmark/medium, @@ -52677,7 +58495,7 @@ icon_state = "N"; pixel_y = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_west_street) "wzJ" = ( /obj/structure/machinery/light, @@ -52703,6 +58521,21 @@ icon_state = "68" }, /area/lv522/landing_zone_forecon/UD6_Tornado) +"wAB" = ( +/obj/structure/surface/table/almayer, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/reactor_garage) +"wAE" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "brown" + }, +/area/lv522/atmos/east_reactor/south) "wAM" = ( /obj/structure/cargo_container/horizontal/blue/middle, /obj/structure/largecrate/supply/floodlights{ @@ -52741,8 +58574,26 @@ /area/lv522/landing_zone_2) "wBA" = ( /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) +"wBG" = ( +/obj/structure/shuttle/engine/heater{ + dir = 8; + pixel_x = -4 + }, +/obj/structure/prop/invuln/overhead/flammable_pipe/fly{ + dir = 8; + icon_state = "flammable_pipe_3"; + pixel_x = -3 + }, +/turf/closed/wall/mineral/bone_resin, +/area/lv522/atmos/west_reactor) +"wBR" = ( +/obj/structure/powerloader_wreckage, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/reactor_garage) "wCr" = ( /turf/closed/shuttle/dropship2/tornado{ icon_state = "64" @@ -52834,6 +58685,9 @@ icon_state = "blue" }, /area/lv522/indoors/a_block/admin) +"wDj" = ( +/turf/closed/wall/strata_outpost, +/area/lv522/outdoors/colony_streets/windbreaker/observation) "wDk" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ @@ -52841,6 +58695,20 @@ icon_state = "blue" }, /area/lv522/indoors/a_block/admin) +"wDu" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/transmitter/colony_net{ + dir = 8; + phone_category = "LV522 Chances Claim"; + phone_color = "red"; + phone_id = "Colony Botany"; + pixel_x = 16 + }, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, +/area/lv522/indoors/b_block/hydro) "wDy" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor{ @@ -52884,12 +58752,14 @@ }, /area/lv522/landing_zone_2) "wEz" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, -/turf/open/floor/corsat{ - dir = 6; - icon_state = "brown" +/obj/structure/prop/server_equipment/yutani_server{ + density = 0; + pixel_y = 16 }, -/area/lv522/atmos/cargo_intake) +/turf/open/asphalt/cement{ + icon_state = "cement12" + }, +/area/lv522/outdoors/nw_rockies) "wEE" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/surface/table/almayer, @@ -52923,6 +58793,25 @@ /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison, /area/lv522/indoors/c_block/cargo) +"wFv" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, +/obj/structure/platform{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) +"wFA" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_marked" + }, +/area/lv522/atmos/outdoor) "wFB" = ( /obj/structure/window/framed/strata/reinforced, /turf/open/floor/corsat{ @@ -52960,6 +58849,16 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/prison, /area/lv522/indoors/c_block/casino) +"wGq" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + pixel_y = -1 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "wGE" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/prop/almayer/computer/PC{ @@ -52980,6 +58879,16 @@ icon_state = "darkredfull2" }, /area/lv522/indoors/a_block/kitchen/glass) +"wGH" = ( +/obj/item/prop/colony/usedbandage{ + dir = 5; + pixel_y = 8 + }, +/obj/item/prop/colony/usedbandage{ + dir = 10 + }, +/turf/closed/wall/strata_ice/dirty, +/area/lv522/oob) "wGJ" = ( /obj/item/stack/sheet/wood, /turf/open/floor/prison, @@ -53065,6 +58974,19 @@ }, /turf/open/floor/prison, /area/lv522/indoors/c_block/mining) +"wIx" = ( +/obj/effect/spawner/gibspawner/xeno, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/obj/effect/decal/cleanable/blood/xeno{ + icon_state = "xgib3" + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "wIE" = ( /obj/structure/flora/bush/ausbushes/ppflowers, /turf/open/organic/grass, @@ -53090,6 +59012,12 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) +"wJk" = ( +/obj/structure/surface/table/almayer, +/turf/open/floor/strata{ + icon_state = "blue1" + }, +/area/lv522/outdoors/colony_streets/windbreaker/observation) "wJq" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/c_block/mining) @@ -53142,6 +59070,9 @@ }, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/central_streets) +"wLp" = ( +/turf/closed/wall/mineral/bone_resin, +/area/lv522/atmos/east_reactor/west) "wLN" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/drinks/coffee, @@ -53232,13 +59163,13 @@ }, /area/lv522/indoors/lone_buildings/engineering) "wOu" = ( -/obj/structure/desertdam/decals/road_edge{ - icon_state = "road_edge_decal3"; - pixel_y = 16 +/obj/structure/pipes/standard/manifold/hidden/green{ + dir = 8 }, -/obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor/wood, -/area/lv522/indoors/a_block/fitness/glass) +/turf/open/asphalt/cement{ + icon_state = "cement12" + }, +/area/lv522/outdoors/n_rockies) "wOC" = ( /obj/structure/surface/table/almayer, /obj/effect/landmark/objective_landmark/close, @@ -53262,17 +59193,26 @@ }, /area/lv522/indoors/lone_buildings/outdoor_bot) "wPA" = ( -/obj/structure/window/framed/solaris/reinforced, +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper Dormitories"; + welded = null + }, /turf/open/floor/corsat{ icon_state = "marked" }, /area/lv522/outdoors/colony_streets/windbreaker/observation) +"wPL" = ( +/obj/structure/platform_decoration/strata{ + dir = 8 + }, +/turf/closed/wall/strata_ice/dirty, +/area/lv522/oob) "wPN" = ( /obj/item/lightstick/red/spoke/planted{ pixel_x = 11; pixel_y = 25 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_2) "wPR" = ( /turf/open/floor/wood{ @@ -53282,6 +59222,15 @@ "wQa" = ( /turf/open/auto_turf/shale/layer1, /area/lv522/landing_zone_2) +"wQs" = ( +/obj/structure/bed/chair/comfy{ + dir = 8 + }, +/turf/open/floor/corsat{ + dir = 5; + icon_state = "brown" + }, +/area/lv522/atmos/east_reactor/south) "wQy" = ( /turf/open/floor/prison{ dir = 10; @@ -53304,6 +59253,15 @@ icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) +"wRf" = ( +/obj/structure/machinery/door/airlock/almayer/maint, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/sewer) "wRk" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -53327,7 +59285,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 10 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) "wRC" = ( /obj/structure/machinery/light, @@ -53358,6 +59316,15 @@ icon_state = "marked" }, /area/lv522/indoors/a_block/bridges/garden_bridge) +"wSb" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor) "wSr" = ( /obj/structure/surface/table/reinforced/prison, /turf/open/floor/strata{ @@ -53385,14 +59352,8 @@ dir = 10; icon_state = "p_stair_full" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_1) -"wSH" = ( -/obj/structure/pipes/standard/manifold/hidden/green{ - dir = 1 - }, -/turf/open/auto_turf/shale/layer0, -/area/lv522/outdoors/n_rockies) "wSW" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -53446,6 +59407,10 @@ icon_state = "white_cyan1" }, /area/lv522/indoors/a_block/corpo) +"wTv" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv522/atmos/west_reactor) "wTx" = ( /obj/structure/cargo_container/kelland/left, /turf/open/floor/prison{ @@ -53482,6 +59447,13 @@ icon_state = "white_cyan1" }, /area/lv522/indoors/a_block/corpo) +"wTV" = ( +/obj/structure/prop/vehicles, +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/reactor_garage) "wUj" = ( /obj/structure/closet/crate/miningcar/yellow, /obj/item/ore/coal, @@ -53494,6 +59466,15 @@ icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) +"wUp" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "wUx" = ( /obj/structure/barricade/deployable{ dir = 8 @@ -53506,6 +59487,12 @@ /obj/structure/closet/toolcloset, /turf/open/floor/plating, /area/lv522/oob) +"wVf" = ( +/obj/structure/machinery/power/apc/weak{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv522/atmos/west_reactor) "wVo" = ( /obj/item/lightstick/red/spoke/planted{ pixel_x = -9; @@ -53514,7 +59501,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/south_east_street) "wVF" = ( /obj/structure/machinery/door_control/brbutton{ @@ -53533,6 +59520,14 @@ }, /turf/open/floor/plating, /area/lv522/oob) +"wWc" = ( +/obj/structure/surface/table/almayer, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/corsat{ + dir = 8; + icon_state = "browncorner" + }, +/area/lv522/atmos/east_reactor/south) "wWe" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet, @@ -53614,7 +59609,7 @@ /obj/structure/platform_decoration{ dir = 4 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) "wYU" = ( /obj/structure/stairs/perspective{ @@ -53662,6 +59657,16 @@ /obj/structure/window/framed/strata/reinforced, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) +"wZz" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, +/area/lv522/landing_zone_2/ceiling) "wZH" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/snacks/cheesyfries, @@ -53721,6 +59726,15 @@ icon_state = "darkredfull2" }, /area/lv522/indoors/a_block/kitchen/glass) +"xaN" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, +/area/lv522/landing_zone_2/ceiling) "xaQ" = ( /obj/structure/surface/table/almayer, /obj/item/weapon/gun/lever_action/r4t{ @@ -53752,13 +59766,13 @@ /obj/structure/prop/ice_colony/ground_wire{ dir = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) "xbM" = ( /obj/structure/prop/vehicles/crawler{ icon_state = "crawler_fuel" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/south_east_street) "xbN" = ( /obj/structure/machinery/sleep_console, @@ -53838,7 +59852,7 @@ layer = 3.5; pixel_y = 10 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) "xdn" = ( /obj/structure/surface/table/almayer, @@ -53865,7 +59879,7 @@ pixel_x = 6; pixel_y = 7 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) "xdD" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -53892,7 +59906,7 @@ /obj/structure/prop/ice_colony/ground_wire{ dir = 4 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) "xeg" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -53900,6 +59914,9 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/bridges) +"xei" = ( +/turf/closed/wall/strata_ice/dirty, +/area/space) "xen" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, @@ -53942,6 +59959,13 @@ /area/lv522/outdoors/colony_streets/north_east_street) "xfS" = ( /obj/structure/surface/table/woodentable/fancy, +/obj/structure/transmitter/colony_net{ + dir = 1; + phone_category = "LV522 Chances Claim"; + phone_color = "red"; + phone_id = "Colony Private Casino"; + pixel_y = -6 + }, /turf/open/floor/wood, /area/lv522/indoors/c_block/casino) "xfW" = ( @@ -53957,12 +59981,26 @@ }, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms) +"xgl" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/north_command_centre) "xgA" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/c_block/bridge) +"xgE" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "xgH" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -54095,14 +60133,11 @@ }, /area/lv522/indoors/a_block/dorms) "xiY" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/floor/corsat{ - dir = 9; - icon_state = "brown" + icon_state = "squares" }, -/area/lv522/atmos/north_command_centre) +/area/lv522/atmos/east_reactor/west) "xje" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -54153,12 +60188,9 @@ }, /area/lv522/indoors/b_block/bar) "xjU" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/obj/item/prop/alien/hugger, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/obj/structure/closet/firecloset/full, +/turf/open/floor/strata{ + icon_state = "blue1" }, /area/lv522/outdoors/colony_streets/windbreaker/observation) "xjY" = ( @@ -54237,7 +60269,7 @@ /area/lv522/indoors/a_block/dorms) "xly" = ( /obj/structure/cargo_container/grant/rightmid, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/central_streets) "xlI" = ( /turf/open/floor/shiva{ @@ -54319,6 +60351,10 @@ icon_state = "whiteyellowfull" }, /area/lv522/indoors/a_block/corpo) +"xmT" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat, +/area/lv522/atmos/west_reactor) "xni" = ( /obj/structure/bed/chair{ dir = 1 @@ -54410,6 +60446,18 @@ icon_state = "white_cyan1" }, /area/lv522/indoors/a_block/corpo) +"xnX" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 5 + }, +/obj/structure/platform_decoration{ + dir = 1 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/sewer) "xoj" = ( /obj/structure/largecrate/random/barrel/red, /obj/effect/decal/cleanable/dirt, @@ -54418,10 +60466,7 @@ }, /area/lv522/indoors/lone_buildings/storage_blocks) "xpg" = ( -/obj/structure/prop/server_equipment/yutani_server, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, +/turf/closed/wall/strata_outpost/reinforced, /area/lv522/outdoors/nw_rockies) "xpu" = ( /obj/structure/platform, @@ -54437,7 +60482,7 @@ dir = 1; icon_state = "p_stair_full" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) "xpX" = ( /obj/structure/barricade/deployable{ @@ -54539,6 +60584,16 @@ }, /turf/open/floor/plating, /area/lv522/landing_zone_2) +"xsE" = ( +/obj/structure/platform{ + dir = 4 + }, +/obj/structure/platform, +/obj/structure/platform_decoration{ + dir = 6 + }, +/turf/open/gm/river, +/area/lv522/atmos/sewer) "xtb" = ( /turf/closed/wall/strata_outpost, /area/lv522/indoors/a_block/fitness) @@ -54604,6 +60659,28 @@ icon_state = "kitchen" }, /area/lv522/indoors/b_block/bar) +"xuD" = ( +/obj/structure/surface/table/almayer, +/obj/item/paper_bin/wy{ + pixel_x = 7; + pixel_y = 7 + }, +/obj/item/device/flashlight/lamp{ + pixel_x = -8; + pixel_y = 10 + }, +/obj/item/tool/pen, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) +"xuQ" = ( +/obj/structure/largecrate/random/secure, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/way_in_command_centre) "xuU" = ( /turf/open/floor/corsat{ dir = 9; @@ -54690,7 +60767,7 @@ pixel_x = -7; pixel_y = 27 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) "xxq" = ( /turf/open/asphalt/cement{ @@ -54741,9 +60818,18 @@ icon_state = "cement1" }, /area/lv522/outdoors/colony_streets/north_west_street) +"xxW" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/cargo_intake) "xyf" = ( /obj/structure/cargo_container/kelland/left, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) "xyi" = ( /obj/structure/closet/emcloset, @@ -54758,6 +60844,11 @@ icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) +"xyC" = ( +/obj/structure/machinery/landinglight/ds2/delaythree, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/lv522/landing_zone_2) "xyL" = ( /obj/structure/window/framed/strata/reinforced, /turf/open/floor/corsat{ @@ -54810,7 +60901,7 @@ dir = 5; icon_state = "p_stair_full" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) "xzV" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -54903,20 +60994,13 @@ /turf/open/floor/prison, /area/lv522/indoors/c_block/t_comm) "xBL" = ( -/obj/structure/prop/invuln/overhead_pipe{ - dir = 4; - name = "overhead pipe"; - pixel_x = -10; - pixel_y = -6 +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 }, -/obj/structure/prop/invuln/overhead_pipe{ - dir = 1; - name = "overhead pipe"; - pixel_x = -8; - pixel_y = 15 +/turf/open/asphalt/cement{ + icon_state = "cement12" }, -/turf/open/floor/plating/plating_catwalk/prison, -/area/lv522/atmos/cargo_intake) +/area/lv522/outdoors/n_rockies) "xBS" = ( /obj/structure/stairs/perspective{ dir = 6; @@ -54945,6 +61029,12 @@ }, /turf/open/floor/carpet, /area/lv522/indoors/a_block/executive) +"xCS" = ( +/obj/structure/machinery/light, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "xCT" = ( /turf/open/floor/prison, /area/lv522/indoors/a_block/dorm_north) @@ -54965,8 +61055,11 @@ "xDt" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/prop/ice_colony/ground_wire, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) +"xDu" = ( +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv522/indoors/a_block/corpo/glass) "xDC" = ( /obj/structure/prop/invuln/ice_prefab{ dir = 1; @@ -55040,6 +61133,13 @@ }, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/north_west_street) +"xEk" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat{ + dir = 4; + icon_state = "brown" + }, +/area/lv522/atmos/cargo_intake) "xEp" = ( /obj/structure/cargo_container/kelland/right, /turf/open/floor/prison{ @@ -55055,9 +61155,13 @@ /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms) "xED" = ( -/obj/effect/landmark/lv624/fog_blocker/short, -/turf/closed/wall/mineral/bone_resin, -/area/lv522/oob) +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "Reactor_entry_1" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/way_in_command_centre) "xEH" = ( /obj/structure/machinery/landinglight/ds1{ dir = 1 @@ -55067,9 +61171,24 @@ icon_state = "greenfull" }, /area/lv522/landing_zone_1) +"xFg" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 10 + }, +/turf/open/asphalt/cement{ + icon_state = "cement1" + }, +/area/lv522/outdoors/colony_streets/north_street) "xFp" = ( /turf/open/asphalt/cement, /area/lv522/outdoors/colony_streets/north_east_street) +"xFt" = ( +/obj/structure/pipes/standard/manifold/hidden/green, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "browncorner" + }, +/area/lv522/atmos/east_reactor/south) "xFv" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -55111,7 +61230,7 @@ pixel_x = 13; pixel_y = 29 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) "xGC" = ( /obj/item/reagent_container/glass/bucket/janibucket, @@ -55120,6 +61239,22 @@ icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) +"xGR" = ( +/obj/structure/machinery/door/airlock/almayer/maint, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/way_in_command_centre) +"xGX" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/lv522/atmos/east_reactor/south) "xHj" = ( /obj/structure/prop/invuln/minecart_tracks, /obj/structure/closet/crate/miningcar{ @@ -55171,13 +61306,21 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) -"xJB" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" +"xJg" = ( +/obj/structure/machinery/light, +/turf/open/floor/strata{ + icon_state = "blue1" }, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/area/lv522/outdoors/colony_streets/windbreaker/observation) +"xJt" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic, +/turf/open/floor/corsat{ + icon_state = "marked" }, +/area/lv522/atmos/way_in_command_centre) +"xJB" = ( +/obj/structure/largecrate/random/barrel/red, +/turf/open/floor/prison, /area/lv522/landing_zone_2/ceiling) "xJF" = ( /obj/structure/window_frame/strata, @@ -55264,6 +61407,14 @@ /obj/item/prop/alien/hugger, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms) +"xLi" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "xLm" = ( /turf/open/floor/corsat{ icon_state = "plate" @@ -55292,6 +61443,15 @@ /obj/item/prop/alien/hugger, /turf/open/floor/prison, /area/lv522/outdoors/colony_streets/north_west_street) +"xLr" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1 + }, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/sewer) "xLU" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 6 @@ -55302,7 +61462,7 @@ /obj/structure/prop/invuln/ice_prefab{ dir = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/central_streets) "xMl" = ( /obj/structure/filingcabinet{ @@ -55331,6 +61491,13 @@ icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) +"xME" = ( +/obj/structure/surface/table/almayer, +/turf/open/floor/corsat{ + dir = 4; + icon_state = "browncorner" + }, +/area/lv522/atmos/east_reactor/south) "xMO" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, @@ -55364,6 +61531,13 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison, /area/lv522/indoors/b_block/hydro) +"xNt" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "brown" + }, +/area/lv522/atmos/east_reactor/south) "xNu" = ( /obj/structure/platform_decoration{ dir = 8 @@ -55383,6 +61557,15 @@ icon_state = "marked" }, /area/lv522/indoors/a_block/hallway) +"xNG" = ( +/obj/structure/machinery/computer/crew/colony{ + density = 0; + pixel_y = 16 + }, +/turf/open/floor/strata{ + icon_state = "blue1" + }, +/area/lv522/outdoors/colony_streets/windbreaker/observation) "xNR" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ @@ -55476,11 +61659,7 @@ /turf/closed/shuttle/elevator, /area/lv522/indoors/c_block/mining) "xPH" = ( -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_full" - }, -/turf/open/auto_turf/shale/layer0, +/turf/open/floor/prison, /area/lv522/landing_zone_2/ceiling) "xPK" = ( /obj/structure/largecrate/random, @@ -55515,13 +61694,15 @@ /area/lv522/indoors/a_block/executive) "xPY" = ( /obj/structure/fence, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, /turf/open/floor/prison{ icon_state = "floor_plate" }, /area/lv522/atmos/outdoor) "xQc" = ( -/obj/structure/window/framed/corsat, -/turf/open/floor/corsat, +/turf/closed/wall/r_wall/biodome/biodome_unmeltable, /area/lv522/atmos/east_reactor/south) "xQi" = ( /obj/structure/closet/firecloset/full, @@ -55541,6 +61722,10 @@ icon_state = "marked" }, /area/lv522/indoors/a_block/medical) +"xQq" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood/ship, +/area/lv522/atmos/way_in_command_centre) "xQw" = ( /obj/structure/surface/table/almayer, /obj/item/paper_bin{ @@ -55572,7 +61757,7 @@ /area/lv522/outdoors/colony_streets/north_street) "xRn" = ( /obj/item/clothing/head/hardhat, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) "xRo" = ( /obj/structure/machinery/space_heater/radiator/red{ @@ -55681,7 +61866,7 @@ /area/lv522/indoors/b_block/hydro) "xSv" = ( /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) "xSA" = ( /obj/structure/machinery/light{ @@ -55697,6 +61882,24 @@ /obj/structure/largecrate/random/barrel/green, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/central_streets) +"xSE" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "cell_stripe" + }, +/area/lv522/atmos/way_in_command_centre) +"xSL" = ( +/obj/structure/bed/chair/comfy{ + dir = 4 + }, +/turf/open/floor/corsat{ + dir = 9; + icon_state = "brown" + }, +/area/lv522/atmos/east_reactor/south) "xSN" = ( /turf/open/floor/corsat{ icon_state = "marked" @@ -55774,6 +61977,10 @@ icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) +"xUq" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/corsat, +/area/lv522/atmos/reactor_garage) "xUx" = ( /turf/open/floor/corsat{ icon_state = "plate" @@ -55803,8 +62010,14 @@ /obj/structure/prop/ice_colony/ground_wire{ dir = 4 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) +"xVB" = ( +/obj/structure/machinery/deployable/barrier, +/turf/open/floor/shiva{ + icon_state = "radiator_tile2" + }, +/area/lv522/atmos/way_in_command_centre) "xVG" = ( /obj/structure/largecrate/random, /obj/effect/decal/warning_stripes{ @@ -55927,6 +62140,14 @@ }, /turf/open/floor/prison, /area/lv522/indoors/a_block/kitchen/glass) +"xXv" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 5 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/sewer) "xXz" = ( /obj/structure/foamed_metal, /obj/effect/decal/cleanable/dirt, @@ -56011,6 +62232,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/bridges/corpo) +"xZE" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/prison, +/area/lv522/atmos/way_in_command_centre) "xZL" = ( /obj/structure/machinery/conveyor{ dir = 5; @@ -56061,10 +62288,20 @@ icon_state = "N"; pixel_y = 1 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) +"yai" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "yaj" = ( -/turf/closed/wall/r_wall/biodome/biodome_unmeltable, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat, /area/lv522/atmos/east_reactor/south) "yak" = ( /obj/structure/machinery/portable_atmospherics/canister/empty/oxygen, @@ -56076,9 +62313,17 @@ }, /area/lv522/indoors/c_block/mining) "yar" = ( -/turf/open/floor/prison{ +/obj/structure/fence, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/strata{ dir = 4; - icon_state = "darkyellowfull2" + icon_state = "floor3" }, /area/lv522/landing_zone_2/ceiling) "yat" = ( @@ -56096,13 +62341,38 @@ icon_state = "marked" }, /area/lv522/indoors/a_block/security) +"yaw" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/reactor_garage) +"yaC" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "yaF" = ( /obj/effect/spawner/gibspawner/xeno, /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) +"yaH" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv522/atmos/sewer) "yba" = ( /obj/structure/largecrate/random{ layer = 2.9 @@ -56125,7 +62395,7 @@ /area/lv522/oob) "ybj" = ( /obj/item/prop/alien/hugger, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) "ybt" = ( /obj/structure/surface/table/almayer, @@ -56138,7 +62408,7 @@ }, /area/lv522/indoors/a_block/security/glass) "ybz" = ( -/turf/closed/wall/shiva/prefabricated, +/turf/open/asphalt/cement, /area/lv522/landing_zone_2) "ybM" = ( /obj/structure/surface/table/reinforced/prison, @@ -56158,6 +62428,13 @@ icon_state = "marked" }, /area/lv522/indoors/lone_buildings/storage_blocks) +"ycc" = ( +/obj/structure/largecrate/random/barrel, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, +/area/lv522/landing_zone_2/ceiling) "yct" = ( /obj/structure/surface/rack, /obj/effect/decal/cleanable/dirt, @@ -56174,6 +62451,10 @@ icon_state = "darkredfull2" }, /area/lv522/indoors/a_block/kitchen) +"ycw" = ( +/obj/structure/girder/reinforced, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/north_east_street) "ycE" = ( /turf/open/floor/carpet, /area/lv522/indoors/b_block/bar) @@ -56190,7 +62471,7 @@ /obj/structure/prop/ice_colony/ground_wire{ dir = 4 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) "ycO" = ( /obj/structure/machinery/light, @@ -56200,9 +62481,13 @@ }, /area/lv522/indoors/b_block/bridge) "ycV" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, -/turf/open/floor/corsat, -/area/lv522/atmos/cargo_intake) +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/asphalt/cement{ + icon_state = "cement15" + }, +/area/lv522/outdoors/n_rockies) "ydb" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, @@ -56272,6 +62557,11 @@ icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_west_street) +"yeH" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/surface/table/almayer, +/turf/open/floor/prison, +/area/lv522/outdoors/colony_streets/windbreaker/observation) "yeM" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -56296,6 +62586,14 @@ "yfu" = ( /turf/open/floor/prison, /area/lv522/indoors/lone_buildings/storage_blocks) +"yfz" = ( +/obj/structure/largecrate/random/mini, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_marked" + }, +/area/lv522/landing_zone_2/ceiling) "yfH" = ( /obj/structure/window/framed/strata/reinforced, /turf/open/floor/plating, @@ -56343,6 +62641,13 @@ }, /turf/open/floor/prison, /area/lv522/indoors/c_block/casino) +"ygu" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/corsat{ + dir = 4; + icon_state = "brown" + }, +/area/lv522/atmos/east_reactor/west) "ygw" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, @@ -56350,6 +62655,11 @@ icon_state = "floor_plate" }, /area/lv522/indoors/a_block/security) +"ygD" = ( +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/outdoors/colony_streets/windbreaker/observation) "ygJ" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic, /turf/open/floor/corsat{ @@ -56368,7 +62678,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "S" }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_street) "yhy" = ( /obj/structure/surface/table/reinforced/prison, @@ -56383,6 +62693,14 @@ icon_state = "white_cyan1" }, /area/lv522/indoors/a_block/medical/glass) +"yhz" = ( +/obj/structure/window_frame/corsat, +/obj/effect/spawner/gibspawner/xeno, +/obj/effect/decal/cleanable/blood/xeno{ + icon_state = "xgib3" + }, +/turf/open/floor/corsat, +/area/lv522/atmos/east_reactor/south) "yhG" = ( /obj/structure/bed/chair{ dir = 8 @@ -56413,7 +62731,10 @@ }, /area/lv522/indoors/a_block/dorms) "yim" = ( -/turf/open/auto_turf/shale/layer0, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/n_rockies) "yiu" = ( /turf/open/floor/corsat{ @@ -56429,10 +62750,7 @@ }, /area/lv522/indoors/a_block/dorms) "yiM" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/central_streets) "yiZ" = ( /obj/structure/prop/vehicles/crawler{ @@ -56442,8 +62760,23 @@ pixel_x = 6; pixel_y = 6 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/east_central_street) +"yje" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/sewer) +"yjg" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/engidoor/glass/colony, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/east_reactor/south) "yjm" = ( /obj/structure/largecrate/random, /turf/open/asphalt/cement, @@ -56522,7 +62855,7 @@ dir = 4 }, /obj/item/tool/weldingtool, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) "yjL" = ( /turf/open/floor/prison{ @@ -56635,6 +62968,15 @@ icon_state = "greenfull" }, /area/lv522/landing_zone_1/ceiling) +"yld" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/effect/alien/resin/sticky, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/lv522/atmos/east_reactor/south) "ylm" = ( /turf/open/asphalt/cement{ icon_state = "cement12" @@ -56659,7 +63001,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 6 }, -/turf/open/auto_turf/shale/layer0, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/n_rockies) "ylY" = ( /obj/structure/pipes/standard/manifold/hidden/green, @@ -57623,10 +63965,10 @@ cpy cpy cpy cpy -cpy -cpy -cpy -cpy +dvO +orm +orm +wPL cpy cpy cpy @@ -57849,15 +64191,14 @@ cpy cpy cpy cpy +dvO +hJq +kiT +tfO +viE cpy cpy cpy -cpy -cpy -cpy -cpy -cpy -vtc auG auG cpy @@ -57868,6 +64209,7 @@ cpy cpy cpy cpy +cpy auG vtc vtc @@ -58076,25 +64418,25 @@ cpy cpy cpy cpy +hJq +qZf +wGH cpy -cpy -cpy -cpy -cpy +viE cpy cpy vtc vtc vtc vtc -vtc +cpy cpy cpy cpy auG auG vtc -jiW +vtc vtc vtc vtc @@ -58302,12 +64644,12 @@ cpy cpy cpy cpy +aVg +adl cpy cpy -cpy -cpy -cpy -cpy +pOK +rQL cpy auG vtc @@ -58315,13 +64657,13 @@ vtc vtc vtc vtc -vtc +cpy cpy vtc vtc vtc vtc -jiW +vtc vtc vtc vtc @@ -58529,11 +64871,11 @@ cpy cpy cpy cpy +aVg +tCa cpy -cpy -cpy -cpy -cpy +qIu +viE cpy cpy auG @@ -58542,13 +64884,13 @@ vtc vtc vtc vtc +rXr vtc vtc vtc vtc vtc -vtc -jiW +uWO uWO vtc vtc @@ -58565,7 +64907,7 @@ uWO vtc vtc auG -jiW +vtc cpy cpy cpy @@ -58756,26 +65098,26 @@ cpy cpy cpy cpy +aVg cpy +cJA cpy +viE cpy -cpy -cpy -cpy -vtc -vtc +jXp vtc vtc vtc vtc vtc vtc +rXr vtc uWO uWO uWO uWO -jiW +uWO uWO uWO vtc @@ -58792,11 +65134,11 @@ uWO uWO vtc vtc -jiW -auG vtc -vtc -wms +auG +cpy +cpy +cpy rWS sRA sRA @@ -58962,10 +65304,6 @@ abo cpy cpy cpy -saC -cpy -cpy -cpy cpy cpy cpy @@ -58987,22 +65325,26 @@ cpy cpy cpy cpy +hGJ +kFP cpy +pOK +rQL cpy -vtc +sNk vtc vtc uWO gxN hIZ hIZ -hIZ +jiW hSi uWO uWO uWO uWO -jiW +uWO uWO uWO uWO @@ -59019,14 +65361,14 @@ uWO uWO uWO vtc -jiW vtc -jrT vtc -wnl -kVG -sRA -sRA +jrT +cpy +cpy +kBT +uiK +mZM sRA sRA rWS @@ -59046,8 +65388,8 @@ sfZ vcu kor rWS -gQN -gQN +uiK +uiK rWS ePl cpy @@ -59188,9 +65530,6 @@ cpy cpy cpy cpy -saC -saC -saC cpy cpy cpy @@ -59214,6 +65553,9 @@ cpy cpy cpy cpy +hGJ +mTE +rQL cpy cpy vtc @@ -59229,7 +65571,7 @@ hIZ hIZ mAW hIZ -cJA +hIZ hIZ hIZ hIZ @@ -59246,14 +65588,14 @@ jXT hIZ ivz hIZ -idH +hIZ hSi vtc -uWO -wnu -nvB -sRA -sRA +cpy +cpy +vZY +pXH +bQq sRA rWS pRK @@ -59271,11 +65613,11 @@ sci sFS tcz vfl -gQN +uiK rWS rWS sRA -gQN +uiK rWS cpy cpy @@ -59414,11 +65756,11 @@ cpy cpy cpy cpy -saC -saC -saC -saC -saC +cpy +cpy +cpy +cpy +cpy tiQ tiQ tiQ @@ -59449,14 +65791,14 @@ uWO uWO gEB uWO -uWO +gOJ cpy lQS uWO uWO mwp uWO -jiW +uWO uWO dHR dJJ @@ -59473,14 +65815,14 @@ vtc vtc vtc vtc -jiW -lMH vtc +lMH vtc -jRY -noL -jTB +cpy +cpy +kLQ sRA +jHa sRA obe pRM @@ -59640,8 +65982,8 @@ cpy cpy cpy cpy -saC -saC +cpy +cpy tiQ tiQ tiQ @@ -59683,7 +66025,7 @@ mgJ mwp uWO uWO -jiW +aRH vPk vPk vPk @@ -59700,13 +66042,13 @@ dXa auG vtc vtc -jiW +vtc lMH jrT vtc -noL -noL -noL +cpy +cpy +cpy pps pxY pIu @@ -59725,8 +66067,8 @@ tSJ scw uEr vgM -gQN -gQN +uiK +uiK sRA sRA sRA @@ -59866,9 +66208,9 @@ cpy cpy cpy cpy -saC -saC -saC +cpy +tiQ +tiQ tiQ saC saC @@ -59904,13 +66246,13 @@ uWO gEB uWO uWO -uWO +rXr uWO uWO uWO uWO aRH -hJq +cKF bIJ bIJ bIJ @@ -59927,13 +66269,13 @@ jus eXO emm vtc -jiW +vtc lMH vtc uWO -noL -noL -noL +cpy +cpy +cpy ppF pys pIO @@ -60091,22 +66433,22 @@ cpy cpy cpy cpy +cpy +tiQ +tiQ +tiQ saC saC saC saC saC -saC -saC -saC -saC -fTs -fTs -fTs fTs fTs fTs +bSM fTs +dWE +dWE saC saC saC @@ -60115,7 +66457,7 @@ saC saC tiQ tiQ -cpy +tiQ cpy cpy cpy @@ -60129,9 +66471,9 @@ vtc uWO uWO gEB +idH uWO -uWO -uWO +rXr uWO uWO uWO @@ -60155,12 +66497,12 @@ fTi ksf kPO jYu -gEB -vtc -vtc -uWO -vtc -vtc +hvE +sLZ +sLZ +sLZ +cpy +cpy pqZ pyO qst @@ -60317,20 +66659,20 @@ cpy cpy cpy cpy +tiQ +tiQ +tiQ saC saC saC saC saC saC -saC -saC -saC -uIW uIW uIW uIW uIW +dxU uIW uIW saC @@ -60344,7 +66686,7 @@ saC saC tiQ tiQ -cpy +tiQ cpy cpy cpy @@ -60357,7 +66699,7 @@ uWO uWO gEB uWO -uWO +ttf cpy cpy uWO @@ -60386,9 +66728,9 @@ lMH vtc vtc vtc -noL -noL -kgb +vtc +cpy +cpy rWS rWS pUc @@ -60406,8 +66748,8 @@ sdE sIx rFp vhC -gQN -gQN +uiK +uiK sRA rWS ien @@ -60460,9 +66802,9 @@ ien umf vXc vXc -ruU -ruU -ruU +yiM +yiM +yiM ien cpy cpy @@ -60543,6 +66885,8 @@ cpy cpy cpy cpy +tiQ +tiQ saC saC saC @@ -60550,18 +66894,16 @@ saC saC saC saC -saC -saC -uIW -uIW -uIW uIW uIW uIW uIW uIW +dxU uIW uIW +kkc +kkc saC saC saC @@ -60572,22 +66914,22 @@ saC saC saC tiQ +tiQ cpy cpy cpy cpy cpy -cpy +cKG auG vtc vtc -uWO gEB +uWO lfS cpy cpy cpy -cpy uWO uWO cpy @@ -60613,9 +66955,9 @@ lMH ibu vtc vtc -noL -noL -kib +vtc +cpy +cpy rWS sRA pUc @@ -60633,7 +66975,7 @@ xic qOi tbl vhJ -gQN +uiK sRA sRA ien @@ -60682,7 +67024,7 @@ ylo ylo ylo ylo -spo +ien ien vXc vXc @@ -60769,8 +67111,8 @@ cpy cpy cpy cpy -saC -saC +tiQ +tiQ saC saC saC @@ -60789,7 +67131,7 @@ uIW iJA uIW uIW -uIW +kkc saC saC saC @@ -60800,19 +67142,19 @@ saC saC saC tiQ +tiQ cpy cpy cpy cpy -cpy -xXV +lqb xXV xXV xXV gJD -acq -tiQ -cpy +xXV +nNL +xpg cpy cpy cpy @@ -60841,9 +67183,9 @@ jXT jXT jXT noL -noL -kib -sRA +cpy +cpy +cpy sRA sRA qtc @@ -60861,8 +67203,8 @@ sIK uEX vhO hPM -gQN -gQN +uiK +uiK ien sON ezH @@ -60909,9 +67251,9 @@ wky xig tyl ylo -spo -umf -vXc +ien +ien +ien vXc vXc vXc @@ -60995,8 +67337,8 @@ bMX cpy cpy cpy -saC -saC +cpy +tiQ saC saC saC @@ -61016,11 +67358,11 @@ uIW uIW uIW uIW -uIW -uIW +kkc +kkc saC -uIW -uIW +kkc +kkc saC saC hnD @@ -61032,14 +67374,14 @@ tiQ tiQ tiQ tiQ -saC -khB -kqr -kxh +lqb +lqb +lqb +lqb gYM -kqr lqb -cpy +lqb +xpg cpy cpy cpy @@ -61070,7 +67412,7 @@ vtc lMH vtc wms -sRA +cpy sRA sRA sRA @@ -61136,8 +67478,8 @@ sau xig ofS ylo -rMF -jPv +ien +ien vXc vXc vXc @@ -61222,16 +67564,14 @@ bMX cpy cpy cpy +tiQ +tiQ saC saC saC saC saC saC -saC -saC -uIW -uIW uIW uIW uIW @@ -61239,6 +67579,7 @@ uIW uIW uIW uIW +dxU uIW uIW uIW @@ -61248,6 +67589,7 @@ uIW uIW uIW uIW +dxU uIW uIW doP @@ -61256,17 +67598,17 @@ saC saC saC saC -saC -saC -saC -saC -fTS -fTS -fTS -hkT +tiQ +tiQ +tiQ +tiQ bzC +kBq +oiW +niU +ljq bzC -tiQ +xpg cpy cpy cpy @@ -61294,15 +67636,15 @@ vtc uWO uWO vtc -lMH -vtc -wnl +mnr +jXT +nYM kVG -rWS -sRA -sRA -sRA -sRA +bWt +wbt +wbt +wbt +kXe sRA sRA sRA @@ -61364,10 +67706,10 @@ wHi cAW ylo ylo -mcG +ien +vXc +vXc vXc -cpy -cpy umf vXc vXc @@ -61464,6 +67806,7 @@ uIW uIW uIW uIW +dxU uIW uIW uIW @@ -61473,8 +67816,7 @@ uIW uIW uIW uIW -uIW -uIW +dxU uIW uIW uIW @@ -61483,19 +67825,19 @@ hnD saC saC saC -saC -saC -saC -saC -tKb -xuU -hAk -kQR -fTS +tiQ +tiQ +tiQ +tiQ bzC -cpy +oiW +oiW +niU +oiW +bzC +xpg cKG -sDS +rtI ncS mWc cpy @@ -61506,9 +67848,9 @@ bQG bQG bQG cjE -uWO -uWO -uWO +vtc +vtc +vtc uWO uWO uWO @@ -61521,7 +67863,7 @@ vtc vtc uWO vtc -lMH +vtc vtc wnu nvB @@ -61529,7 +67871,7 @@ sRA sRA sRA sRA -sRA +kXo sRA cpy cpy @@ -61590,11 +67932,11 @@ hYf wHi vBM yfu -iPD -spo +ylo +ien +ien +vXc vXc -cpy -cpy umf umf vXc @@ -61691,7 +68033,7 @@ dnQ fzL fzL fzL -fzL +dMu fzL fzL fzL @@ -61701,7 +68043,7 @@ fzL ssn uIW uIW -iJA +pgy uIW uIW uIW @@ -61710,19 +68052,19 @@ hTh saC saC saC -saC -saC -saC -xuU -hAk -txs -xZw +tiQ +tiQ +tiQ +bzC +bzC +oiW +oiW niU -fTS +kBq bzC -cpy -sDS -eqE +xpg +pMT +rJI xmj mWc uWO @@ -61732,15 +68074,15 @@ uWO uWO uWO uWO +vtc +vtc +vtc uWO uWO uWO uWO -uWO -uWO -uWO -uWO -uWO +vtc +vtc uWO uWO auG @@ -61748,7 +68090,7 @@ vtc vtc uWO uWO -lMH +vtc vtc cpy cpy @@ -61756,7 +68098,7 @@ sRA rWS sRA sRA -rWS +iXI cpy cpy cpy @@ -61817,14 +68159,14 @@ bZd yfu bZd wHi -iPD -spo +ylo +ien +vXc vXc vXc -cpy cpy umf -ruU +yiM fXx nJv xVd @@ -61917,65 +68259,65 @@ uIW hTh uPc uPc -uPc -kmd +kcb +kcb mTd mTd uPc uPc kmd -uPc +saC bco uIW uIW -uIW +dxU uIW uIW uIW uIW doP hnD +fop saC -saC -saC -saC -fTS -xeG -xZw -oiW -xZw -cIC +tiQ +tiQ bzC bzC -tiQ -sDS +bzC +oiW +ljq +niU +oiW +bzC +xpg +pPt eqE xmj mWc uWO +vtc +vtc +vtc uWO uWO uWO uWO +vtc uWO uWO uWO uWO uWO -uWO -uWO -uWO -uWO -uWO -uWO -uWO +vtc +vtc +vtc uWO uWO vtc vtc auG uWO -lMH +vtc vtc kBD cpy @@ -61983,7 +68325,7 @@ cpy sRA sRA rWS -rWS +iXI sRA cpy cpy @@ -61993,7 +68335,7 @@ sRA sRA sRA sRA -efH +uiK sRA sRA sRA @@ -62044,14 +68386,14 @@ yfu bZd bZd yfu -iPD -spo +ylo +ien vXc vXc cpy cpy umf -ruU +yiM fXx nJv nJv @@ -62144,15 +68486,15 @@ uIW hTh uPc tKo -naC +wBG tiQ mTd mTd tKo naC tiQ -uPc -bco +saC +saC uIW uIW kkc @@ -62162,28 +68504,28 @@ uIW uIW uIW doP -saC -saC +fop +fop tiQ tiQ -eZq -xeG -xZw -xZw +bzC +bzC +bzC +nvd bgc mjs nvd bzC -ajm -sDS +xpg +pPt sDS xmj mWc uWO uWO -uWO -uWO -oTX +vtc +vtc +uxd uWO aNw uWO @@ -62194,15 +68536,15 @@ uWO uWO uWO uWO -uWO -uWO +vtc +vtc uWO uWO uWO vtc auG uWO -gEB +uWO vtc kBD cpy @@ -62210,17 +68552,17 @@ cpy sRA rWS rWS -sRA +kXo sRA sRA cpy cpy rWS sRA -efH -efH -efH -efH +uiK +uiK +uiK +uiK nCt sRA sRA @@ -62271,14 +68613,14 @@ bZd yfu bZd yfu -iPD -spo -vXc +ylo +ien +ien vXc cpy vXc vXc -ruU +yiM fAA nJv vir @@ -62365,23 +68707,23 @@ saC saC saC saC -uIW -uIW -uIW -hTh +saC +dxU +dxU +lcP tiQ tiQ tiQ tiQ -mTd -mTd +dpg +dpg tiQ tiQ tiQ tiQ -fDS -uIW -uIW +saC +saC +kkc kkc kkc uIW @@ -62390,19 +68732,19 @@ uIW uIW uIW uIW -saC -saC -tiQ -fmB -xeG -xZw -xZw -xrA +fop +fop +xmT +fTS +fTS +fTS +fTS +fTS hkT fTS bzC -ajm -sDS +xpg +xpg eqE xmj mWc @@ -62429,25 +68771,25 @@ uWO uWO vtc vtc -gEB +uWO vtc kBT -efH -efH -sRA -efH +uiK +uiK sRA +uiK sRA -efH -efH +bKq +goY +rsF rWS rWS sRA -efH -efH -efH -efH -efH +uiK +uiK +uiK +uiK +uiK cpy sRA sRA @@ -62499,13 +68841,13 @@ qpc snI jub ylo -spo +ien vXc vXc vXc vXc -ruU -ruU +yiM +yiM taj nJv cfd @@ -62605,31 +68947,31 @@ mTd tJk saQ tiQ -uPc -bco -uIW -uIW -uIW -uIW -uIW +saC +saC +saC +saC +kkc +kkc +kkc uIW uIW uIW uIW uIW -saC -saC -tiQ +fop +fop +xmT tKb jRZ -iOl -xZw -xrA +xuU +hAk +kyb hkT -tiQ -tiQ -tiQ -sDS +bzC +bzC +bzC +xpg eqE xmj mWc @@ -62656,25 +68998,25 @@ uWO uWO vtc vtc -mnr -hIZ +vtc +uWO prT kWD -pMg +tTr pUR uiK uiK uiK uiK ruH -uiK -uiK -uiK -uiK -uiK -uiK -uiK -uiK +goY +goY +goY +goY +goY +goY +goY +goY rsF sRA sRA @@ -62726,13 +69068,13 @@ hsz jnr ylo ylo -mcG +ien vXc vXc vXc -ruU -ruU -ruU +yiM +yiM +yiM fXx nJv nJv @@ -62833,20 +69175,20 @@ uPc uPc kmd uPc -bcP -fzL -fzL -fzL -fzL -fzL +saC +saC +saC +saC +saC +gFG fzL fzL fzL fzL -saC -saC -saC -tiQ +fop +fop +fop +xmT jqz fTS xeG @@ -62855,8 +69197,8 @@ kxm hkT fTS bzC -jPI -sDS +xpg +xpg mGH xmj mWc @@ -62887,18 +69229,18 @@ vtc uWO kLQ sRA -efH -efH +uiK +uiK hKE hKE jsM -efH +uiK hRu -efH -efH +uiK +uiK nCt -efH -efH +uiK +uiK tTr hKE hKE @@ -62952,14 +69294,14 @@ ylo ylo ylo ylo -rMF -sql -vXc +ien +ien +ien vXc -ruU -ruU -ruU -ruU +yiM +yiM +yiM +yiM fCU kvq izp @@ -63061,20 +69403,20 @@ vAi vAi fTO uIW +saC +saC +saC +saC +saC uIW uIW uIW uIW -uIW -uIW -uIW -uIW -uIW -saC -saC -saC -tiQ -tiQ +fop +fop +fop +xmT +fop fTS xeG xZw @@ -63082,8 +69424,8 @@ xrA kOE lgf bzC -ajm -sDS +xpg +pPC eqE xmj mWc @@ -63113,24 +69455,24 @@ vtc vtc uWO kNj -nzR -kXB -lqY -efH -efH -efH -efH +sRA +uiK +uiK +uiK +uiK +uiK +uiK hRu -efH -efH -efH -efH +uiK +uiK +uiK +uiK orE -efH -efH -efH +uiK +uiK +uiK hRu -efH +uiK sRA wnu sjY @@ -63180,13 +69522,13 @@ dbc xyN xyN sql -vXc -ruU -ruU -ruU -ruU -ruU -ruU +ien +yiM +yiM +yiM +yiM +yiM +yiM fXx xvQ sXM @@ -63290,18 +69632,18 @@ uPc uIW mTd giF -mTd -mTd -mTd -mTd -uIW -uIW -saC saC saC saC saC saC +uIW +fop +fop +fop +fop +chm +fop fTS xeG xZw @@ -63309,8 +69651,8 @@ xrF fTS fTS bzC -sxV -sDS +xpg +xpg sDS xmj mWc @@ -63339,25 +69681,25 @@ uWO uWO vtc vtc -ntL -lhb -lko -lvH -efH -efH -efH -efH +sRA +sRA +rWS +uiK +uiK +uiK +uiK +uiK hRu rGi -efH -efH -efH -efH -efH -efH +uiK +uiK +uiK +uiK +uiK +uiK sRA rtr -uiK +goY wbt wov wov @@ -63397,7 +69739,7 @@ rwE rwE rwE hWI -jPr +yiM vXc vXc vXc @@ -63407,13 +69749,13 @@ dbc umf umf vXc -ruU -ruU -ruU -ruU -ruU -ruU -ruU +ien +yiM +yiM +yiM +yiM +yiM +yiM fXx nJv xVd @@ -63519,25 +69861,25 @@ mTd dWT dWT vAi -vAi -mTd -uIW -uIW saC saC saC saC saC -saC -fTS +fop +fop +fop +chm +chm +hLT xeG xZw xrA fTS -tiQ -tiQ -tiQ -dLh +bzC +bzC +bzC +xpg eqE xmj mWc @@ -63566,26 +69908,26 @@ uWO uWO uWO vtc -ntL +bBB nFO lhC lxj sRA -efH -efH -efH +uiK +uiK +uiK hRu -efH -efH -efH -efH +uiK +uiK +uiK +uiK keb -efH +uiK sRA kor vae -efH -efH +uiK +uiK sRA clY xfe @@ -63619,28 +69961,28 @@ ydA tbJ uIr jPv -ruU -ruU -ruU -ruU -ruU +yiM +yiM +yiM +yiM +yiM +eYT eYT -amS kXc -rXb -rXb -rXb -oaj -rXb -rXb -rXb -rwE -rwE -rwE -rwE -jPr -ruU -ruU +vXc +vXc +vXc +dbc +vXc +vXc +ien +ien +ien +yiM +yiM +yiM +yiM +yiM fXx gbB nJv @@ -63747,15 +70089,15 @@ vAi dWT vAi vAi -mTd -uIW -uIW -uIW saC saC saC saC saC +fop +chm +chm +chm saC kih uQI @@ -63763,8 +70105,8 @@ pLj kOJ lhD bzC -uzk -sDS +xpg +xpg eqE hQh mWc @@ -63789,31 +70131,31 @@ uWO uWO mWc uWO -uWO +vtc uWO uWO uWO kRf lhb -llc -lBE +lhb +ckK sRA sRA -efH -efH +uiK +uiK hRu -efH -efH -efH -efH +uiK +uiK +uiK +uiK nCt sRA asn sRA iWo -efH -efH -efH +uiK +uiK +uiK wKj xfr clY @@ -63847,28 +70189,28 @@ nLm nLm rMF jPv -ruU -ruU -ruU -ruU +yiM +yiM +yiM +yiM arP -ruU -ruU +yiM +yiM puY vXc vXc dbc vXc vXc -ruU -ruU -ruU -ruU -ruU yiM -ruU -ruU -ruU +ien +yiM +yiM +yiM +yiM +yiM +yiM +yiM pUv xyN xyN @@ -63976,12 +70318,12 @@ bXq vAi mTd uIW -uIW -uIW -saC saC saC saC +chm +chm +chm tiQ saC kiD @@ -63990,8 +70332,8 @@ tCh kOQ lhD bzC -sxV -sDS +xpg +pPt sDS ncS sGt @@ -64015,32 +70357,32 @@ uWO iTW uWO mWc -uWO -uWO -uWO +vtc +vtc +vtc uWO uWO kSR -llc lBE -rWS +lBE +oOD rWS sRA sRA -efH +uiK hRu -efH -efH +uiK +uiK orE sRA sRA sRA -efH -efH +uiK +uiK viN rGi -efH -efH +uiK +uiK hJZ jGh xyf @@ -64074,29 +70416,29 @@ jOr nLm nLm spo -ruU -ruU -ruU -ruU -ruU -ruU -ruU -ruU +yiM +yiM +yiM +yiM +yiM +yiM +yiM +yiM vXc vXc dbc vXc -ruU -qFP -qQi -qQi -arP -ruU yiM -ruU -ruU -ruU -qFP +yiM +ien +yiM +yiM +yiM +yiM +yiM +yiM +yiM +dwd qQi qQi puY @@ -64204,22 +70546,22 @@ vAi mTd uIW uIW -uIW saC saC saC +chm saC tiQ saC -isu -mdZ +oJS +oJS tCh isu lhD bzC -sxV -sDS -eqE +xpg +xpg +rJI ncS sGt uWO @@ -64243,29 +70585,29 @@ uWO gcY nkv uWO -uWO -uWO +vtc +vtc uWO uWO kTn -efH -sRA -rWS +fiB +cwN +cJm rWS rWS kQW wbt rvh -efH -efH +uiK +uiK rWS asn sRA -efH -efH +uiK +uiK asn -efH -efH +uiK +uiK sRA ien ien @@ -64301,11 +70643,11 @@ jfZ ftA nLm spo -ruU -ruU -ruU -ruU -ruU +yiM +yiM +yiM +yiM +yiM wdy iPR iPR @@ -64314,12 +70656,12 @@ iPR dbc jPv vXc -vXc -ruU -ruU -ruU -ruU -pxQ +ien +ien +ien +yiM +yiM +pWR rwE rwE rwE @@ -64438,15 +70780,15 @@ saC saC tiQ tiQ -isu -kQw -gCV -isu -tiQ -tiQ -tiQ -sDS -eqE +oJS +oJS +oJS +oJS +bzC +bzC +bzC +xpg +rJI bkE sGt uWO @@ -64471,12 +70813,12 @@ iod uWO uWO uWO -uWO +vtc uWO uWO kUJ -rWS -sRA +mDw +cqe ien sRA sRA @@ -64489,10 +70831,10 @@ asn asn ien asn -efH +uiK ien -efH -efH +uiK +uiK ien ien ien @@ -64528,10 +70870,10 @@ uOs kcS ltI spo -ruU -ruU -ruU -ruU +yiM +yiM +yiM +yiM wdy gbB nLm @@ -64542,17 +70884,17 @@ nLm rMF jPv vXc -vXc -ruU -ruU -ruU +ien +yiM +yiM +yiM +wsY +yiM +yiM +yiM +yiM +yiM yiM -ruU -ruU -ruU -ruU -ruU -ruU vXc vXc wdy @@ -64625,7 +70967,7 @@ bMX (36,1,1) = {" bMX tiQ -saC +tiQ saC saC saC @@ -64657,25 +70999,25 @@ uIW uIW uIW uIW -uIW -tiQ -tiQ +saC +saC +saC saC saC tiQ tiQ tiQ -isu -irx -irx -isu -tiQ -tiQ +oJS +oJS +oJS +oJS +bzC +bzC +xpg xpg -dJn -dJn +rLB bkE -mWc +wEz uWO uWO bdX @@ -64769,16 +71111,16 @@ nLm nLm rVa jPv +ien vXc vXc -vXc -ruU yiM -ruU -ruU -ruU -ruU -ruU +wsY +yiM +yiM +yiM +yiM +yiM vXc vXc wdy @@ -64852,7 +71194,7 @@ bMX (37,1,1) = {" bMX cpy -saC +tiQ saC saC saC @@ -64883,24 +71225,24 @@ fTs fTs fTs fTs -fTs -fTs -fTs -tiQ -tiQ +eLV +saC +saC +saC +saC saC tiQ jqz tiQ isu -fTS -fTS -isu -tiQ -tiQ -tiQ -sDS -eqE +oJS +oJS +oJS +bzC +bzC +bzC +xpg +rJI bkE mWc uWO @@ -64995,16 +71337,16 @@ wan wEQ nLm nLm -rMF -jPv -vXc +ien +ien +ien vXc umf xTV umf -ruU -ruU -ruU +yiM +yiM +yiM vXc vXc wdy @@ -65110,23 +71452,23 @@ uIW uIW uIW uIW -uIW -uIW -uIW -dnQ -fGJ +eLV +eLV +saC +saC +saC saC tiQ xZL jSR pyo xuU -kyb -isu -fTS +oJS +oJS +oJS bzC -ajm -sDS +xpg +xpg eqE ncS mWc @@ -65223,14 +71565,14 @@ uDP kDH nLm nLm -spo +ien vXc vXc vXc wYa vXc vXc -ruU +yiM vXc umf wdy @@ -65329,20 +71671,20 @@ mTd tKo naC tiQ -uPc +wVf nDz uIW uIW uIW -saC -uIW -iJA -uIW -uIW +eLV uIW -hTh -vAi -vAi +eLV +eLV +eLV +eLV +saC +saC +saC tiQ jsy loD @@ -65350,10 +71692,10 @@ lSs uLk mwf kOU -fTS +oJS bzC -ajm -sDS +xpg +pPC sDS ncS mWc @@ -65377,7 +71719,7 @@ eaE uWO uWO ilK -uWO +vtc uWO uWO uWO @@ -65450,12 +71792,12 @@ fjP vJT pfV nLm -spo +ien vXc -cpy vXc -wYa vXc +wYa +cpy vXc vXc vXc @@ -65534,15 +71876,15 @@ bMX bMX cpy tiQ -saC +tiQ saC saC ssn uIW iJA uIW -uIW -uIW +chm +chm saC uIW uIW @@ -65557,18 +71899,18 @@ tiQ tiQ tiQ tiQ -nDz -uIW -uIW -uIW -saC +dgI +dxU +dxU +smK +eLV +eLV +eLV +eLV +eLV +eLV saC saC -uIW -uIW -dnQ -fGJ -vAi tiQ tiQ isu @@ -65577,10 +71919,10 @@ xZw xZw xrA fTS -fTS +oJS bzC -ajm -sDS +xpg +xpg eqE xmj mWc @@ -65603,9 +71945,9 @@ eaE eaE uWO uWO -uWO -uWO -uWO +vtc +vtc +vtc pit ien ien @@ -65676,17 +72018,17 @@ tUM uOs uOs vJT -pMd -spo -afn +nLm +ien +ien +vXc +jue +wYa cpy cpy -wYa -vXc vXc vXc -vXc -ruU +yiM fXx rMF vVs @@ -65761,41 +72103,41 @@ bMX bMX cpy cpy +tiQ saC -saC -vAi -bcP -ssn -uIW -uIW -uIW +dWT +bIY +dwG +dxU +chm +chm saC saC saC uIW hTh -uPc +wTv tJk saQ tiQ mTd mTd tJk -saQ +rUX tiQ fwo nDz uIW uIW -saC -saC -saC +eLV +eLV +eLV uIW uIW -dnQ -fGJ -vAi -vAi +eLV +eLV +saC +saC tiQ xZL pyo @@ -65803,11 +72145,11 @@ iWZ xZw xZw xrA -fTS -tiQ -tiQ -tiQ -dLh +ldi +bzC +bzC +bzC +xpg eqE xmj mWc @@ -65830,9 +72172,9 @@ jvf eaE uWO uWO -uWO -uWO -uWO +vtc +vtc +vtc uWO uWO ien @@ -65903,17 +72245,17 @@ uOs uOs lsD wyE -pMd -spo +nLm +ien +vXc +vXc upz -cpy -cpy tDd wLh -vXc -ruU -ruU -ruU +cpy +yiM +yiM +yiM fXx rMF vVs @@ -65990,41 +72332,41 @@ cpy cpy tiQ tiQ -vAi +dWT vAi bco uIW -uIW +chm saC saC saC saC uIW hTh -uPc +wTv uPc uPc kmd mTd mTd uPc -uPc -kmd +saC +saC uPc nDz uIW uIW uIW -saC +eLV uIW uIW uIW hTh -vAi -vAi +eLV +eLV tiQ tiQ -isu +hhu loD uEl xZw @@ -66033,8 +72375,8 @@ xrF kPG lgf bzC -sxV -dLh +xpg +xpg eqE xmj mWc @@ -66058,8 +72400,8 @@ eaE uWO uWO oTX -uWO -uWO +vtc +vtc uWO uWO ien @@ -66131,16 +72473,16 @@ vJT whn tek nLm -spo +ien +vXc +vXc vXc wth -cpy -vaZ wYa -ruU -ruU -ruU -ruU +yiM +yiM +yiM +yiM fXx mBF mBF @@ -66225,10 +72567,10 @@ uIW saC saC saC -uIW -uIW -doP -fTs +chm +kkc +mjq +dWE dWE fTs fTs @@ -66236,13 +72578,13 @@ fTs fTs fTs fTs -fTs +bSM fTs fGH uIW uIW uIW -uIW +dxU uIW uIW dnQ @@ -66250,18 +72592,18 @@ fGJ vAi tiQ tiQ -xZL -pyo -iWZ -xZw +kgC +gCV +kfu xZw xZw -xrA +kQw +pRT kQK fTS bzC -ajm -sDS +xpg +pPt sDS xmj mWc @@ -66286,7 +72628,7 @@ uWO iTW uWO aNw -uWO +vtc uWO ien ien @@ -66315,7 +72657,7 @@ wKR qFE wcR hJZ -slO +eUt qQh nLm nLm @@ -66358,16 +72700,16 @@ oDu nLm nLm nLm -spo +ien +ien +umf vXc -kyz -cpy vaZ wYa -ruU -ruU -ruU -ruU +yiM +yiM +yiM +yiM fXx rMF vVs @@ -66445,16 +72787,15 @@ cpy cpy cpy tiQ -vAi +dWT vAi bcP ssn uIW saC -uIW -uIW -uIW -uIW +chm +chm +chm kkc kkc uIW @@ -66464,62 +72805,63 @@ uIW uIW uIW uIW +dxU uIW gmt uIW uIW iJA -uIW +dxU uIW dnQ fGJ vAi vAi tiQ -xZL -pyo -loD -uEl -xZw -xZw -xZw +fDS +gCV +gPQ +hry +kfF +kfF xrA -hkT +kPG +lER nCX bzC -ant -lUK +nDM +nDM jII aFA ylm -yim -yim -yim -yim +tfP +tfP +tfP +tfP bIe -yim -yim +tfP +tfP eaE eaE eaE -yim +tfP jsQ eaE fXS eaE -yim +tfP eaE -yim -yim +tfP +tfP oeX -yim -yim -yim -bgV +tfP +tfP +tfP +tfP ien -ydA -ydA -ydA +hJZ +hJZ +gHz vne ydA ydA @@ -66542,7 +72884,7 @@ iPu wBA wBA wBA -uQi +ldM oNQ nLm fcv @@ -66585,16 +72927,16 @@ fVB cxC rzG nLm -spo +ien vXc umf -cpy -vaZ +vXc +vXc wYa umf -ruU -ruU -ruU +yiM +yiM +yiM fXx rMF vVs @@ -66677,26 +73019,26 @@ vAi vAi bcP ssn -uIW -uIW -uIW -uIW -uIW -uIW +chm +chm +chm +chm +kkc +kkc uIW uIW uIW saC saC -uIW -uIW -uIW +kkc +kkc +kkc uIW gmt uIW uIW uIW -uIW +dxU dnQ fGJ vAi @@ -66704,22 +73046,22 @@ vAi tiQ tiQ isu -loD -uEl -xZw -xZw +gPQ +hry +kfF +kfF saC -xZw xrA -hkT -tiQ -tiQ -tiQ +rAL +bzC +bzC +bzC +bzC nDM jII aFA ylm -yim +tfP ylC qyG qyG @@ -66741,12 +73083,12 @@ qyG qyG qyG gMc -yim +tfP uSY -xtb -xtb -xtb -xtb +ien +pAp +hJZ +oNQ xtb xtb xtb @@ -66761,15 +73103,15 @@ xtb xtb xtb rvI -hJZ +clY hJZ hJZ hJZ slO hJZ hJZ -hJZ -hJZ +clY +clY oNQ nLm qZh @@ -66812,16 +73154,16 @@ bGL koj aMI nLm -spo +ien +vXc vXc vXc -cpy xLU pnE vXc umf -ruU -ruU +yiM +yiM fXx mBF mBF @@ -66905,25 +73247,25 @@ vAi vAi bcP fzL -ssn -iJA -uIW -uIW -uIW -uIW -uIW +chm +chm +chm +chm +kkc +dxU +dxU saC saC uIW uIW -uIW +dxU uIW uIW gmt uIW uIW dnQ -fzL +dMu fGJ vAi vAi @@ -66933,26 +73275,26 @@ xZL pyo iWZ xZw -xZw +kfF saC saC -xZw xrA -hkT -fTS -irx -irx -irx +lrG +rUl +aCR +lqb +lqb +lqb lUK aFA ylm +tfP yim -rNM bou bcf -yim -yim -yim +tfP +tfP +tfP eaE erw eaE @@ -66963,17 +73305,17 @@ nZF nZF nZF nZF +tfP +tfP +tfP +tfP yim -yim -yim -yim -rNM -yim -hxu -xtb -daz +tfP +ien +ien +ien pAp -knW +oNQ xtb qtE qNM @@ -67039,8 +73381,8 @@ sKH weR nLm nLm -spo -vXc +ien +ien vXc vXc wYa @@ -67048,7 +73390,7 @@ vXc vXc vXc vXc -ruU +yiM fXx rMF mBF @@ -67132,10 +73474,10 @@ vAi bXq vAi vAi -bcP -ssn +chm +chm saC -uIW +chm uIW uIW uIW @@ -67143,7 +73485,7 @@ uIW uIW uIW eAg -eOn +cyO eOn eOn fsf @@ -67153,8 +73495,8 @@ fGJ saC tiQ fIQ -eam -eam +pEw +pEw tiQ isu xuU @@ -67163,22 +73505,22 @@ xZw rEV saC saC -xZw bKk +hAk kQR fTS -fTS -lrh -ddy +aCR +sWn +nbT lUK aFA ylm +tfP yim -rNM -yim -yim -yim -yim +tfP +tfP +tfP +tfP eaE eaE eDt @@ -67189,18 +73531,18 @@ eaE fXS eaE eaE -yim -yim +tfP +tfP eFT bcf +tfP yim -rNM -yim -hxu -xtb -wCy -wmk -xqd +tfP +tfP +ien +cwE +hJZ +oNQ xyL qxi oiZ @@ -67268,8 +73610,8 @@ qiJ nLm aiQ vXc -kBq vXc +qfm wYa vXc vXc @@ -67325,7 +73667,7 @@ ofi max ofi ofi -max +ofi ofi ofi osN @@ -67362,7 +73704,7 @@ vAi vAi saC saC -uIW +chm uIW uIW uIW @@ -67381,9 +73723,9 @@ saC tiQ fUT uFG -uFG +nbD tiQ -isu +hlp xeG iYy xZw @@ -67400,12 +73742,12 @@ ddy lUK aFA ylm +tfP yim -rNM -yim -yim -yim -yim +tfP +tfP +tfP +tfP eaE eaE eDt @@ -67416,18 +73758,18 @@ gFp fXS jqa enS +tfP +tfP +tfP +tfP +tfP yim -yim -yim -yim -yim -rNM -yim -rxN -xtb -wCy -gvT -pVx +tfP +tfP +ien +clY +clY +dRK xtb bQl qOn @@ -67495,7 +73837,7 @@ wLN nLm qQM vXc -wth +nRs vXc wYa vXc @@ -67599,15 +73941,15 @@ uIW eQf gFG gFG -fzL -fGJ +gFG +uZf saC saC saC tiQ tiQ -eam -eam +pEw +pEw hOI tiQ isu @@ -67618,7 +73960,7 @@ xZw saC saC saC -xZw +mKQ kRp xWc rTh @@ -67626,13 +73968,13 @@ nWl dgJ aaX atV -bjT +wOu qyG rOf bIe -yim +tfP eFT -yim +tfP dEc eaE eFt @@ -67643,18 +73985,18 @@ eaE fXS hUZ eaE +tfP +tfP +tfP +tfP +pjJ yim -yim -yim -yim -yim -rNM -yim -sTr -vFS -pVx -xTs -pVx +tfP +ien +ien +ien +clY +bry vFS xOb oiZ @@ -67727,7 +74069,7 @@ vXc wYa vXc vXc -ruU +yiM wdy rMF mBF @@ -67814,7 +74156,7 @@ vSJ vSJ vSJ cNV -tiQ +cNV saC saC saC @@ -67824,9 +74166,9 @@ bcP fzL fzL eTZ -vAi -vAi -vAi +dWT +dWT +dWT saC saC tiQ @@ -67842,10 +74184,10 @@ xeG iYy xZw xZw -xZw +mKQ saC -xZw -xZw +mKQ +mKQ uHn xZw xrA @@ -67853,35 +74195,35 @@ lrh ddy lUK aFA -ylm -yim -yim -yim -yim -yim +xBL +tfP +tfP +tfP +tfP +tfP bcf dEM dZM liD fXS fXS -yim +tfP fXS fXS jtu gSw -yim -yim -yim +tfP +tfP +tfP ylm +pjJ yim -wSH -qyG -rgd -uwk -cZN -pAN -uZO +tfP +tfP +ien +clY +clY +jDc uwk fvk tqU @@ -67938,7 +74280,7 @@ trj nLm nLm nLm -uOs +nDS uMM uOs fjP @@ -67952,8 +74294,8 @@ vXc wth vXc wYa -ruU -ruU +yiM +yiM wdy rMF mBF @@ -68041,15 +74383,15 @@ xho xho xho xho -tiQ +cNV saC saC saC tiQ dWT -vAi -bXq -vAi +bet +sHy +bet eUs tiQ tiQ @@ -68070,8 +74412,8 @@ iYy xZw xZw xZw -xZw -xZw +mKQ +mKQ xZw kRw udR @@ -68080,35 +74422,35 @@ lrh ddy lUK rnp -ylm -yim -yim -yim +xBL +tfP +tfP +tfP bIJ -yim -yim +tfP +tfP dYK eaE eaE bex eaE -yim +tfP eaE eaE eaE eaE eFT -yim +tfP bIJ ylm -yim -rNM +pjJ yim tfP -xtb -xqd -jLF -xqd +tfP +ien +sjY +clY +vWv xtb eAD dKC @@ -68177,9 +74519,9 @@ nLm qQM vXc puY -ruU yiM -ruU +wsY +yiM wdy gbB mBF @@ -68268,7 +74610,7 @@ yeS xho yeS xho -tiQ +cNV saC saC saC @@ -68298,22 +74640,22 @@ xZw xZw xZw xZw -xZw -rEV +kQw +iyl kRJ -fTS -fTS -lrh +aCR +aCR +lqb ddy wgn eZv -ylm -yim -yim -yim +xBL +tfP +tfP +tfP bIJ bIJ -yim +tfP abV abV eUf @@ -68324,18 +74666,18 @@ abV jmW ugu abV -yim +tfP bIJ bIJ ylm -yim -rNM -yim -hxu -xtb -xWF -pAW -xqd +pjJ +lCH +tfP +ien +ien +ien +sjY +hip xyL vht oiZ @@ -68403,10 +74745,10 @@ wan nLm aiQ vXc -ruU -ruU yiM -ruU +yiM +wsY +yiM fXx mBF mBF @@ -68495,7 +74837,7 @@ kwJ faZ kwJ xho -tiQ +cNV saC saC saC @@ -68511,7 +74853,7 @@ saC saC saC tiQ -gxM +dAf uFG xdF htX @@ -68519,28 +74861,28 @@ hDh jFa hDy iti -xeG +fKu iZg +hHj xZw xZw -mmj -mmj xZw xrA -hkT -fTS -irx -irx -irx +kPG +udU +aCR +lqb +lqb +lqb jUq sbm -ylm -yim +xBL +tfP bcf -yim -yim -yim -yim +tfP +tfP +tfP +tfP cpy inU cpy @@ -68548,21 +74890,21 @@ cpy gGx inU inU -yim -yim +tfP +pjJ inU inU inU inU bcU -yim -rNM -yim -hxu -xtb -psq -pCW -xqd +pjJ +lCH +tfP +tfP +ien +sjY +clY +oNQ xtb qyI mDX @@ -68630,10 +74972,10 @@ nLm nLm spo vXc -ruU -ruU yiM -ruU +yiM +wsY +yiM fXx rMF vVs @@ -68722,7 +75064,7 @@ kwJ xho kwJ xho -tiQ +cNV saC saC saC @@ -68743,53 +75085,53 @@ gZd hjB iKC hDh -hON +dFY hDy -fTS -xeG +fBU +gat +gXR +hHj +xZw xZw xZw -jtf -jTb -kjU -mmj xrA -hkT -tiQ -tiQ -tiQ +rAL +bzC +bzC +bzC +bzC +nDM gWI inU -inU -bcU -yim -yim -yim -yim -yim +ycV +tfP +tfP +tfP +tfP +tfP cpy cpy cpy fgf cpy -cKF +tfP hzA ihy -yim -yim -yim -yim -yim -yim -yim -yim -rNM -yim -hxu -xtb -xtb -pDG -xyL +tfP +tfP +pjJ +pjJ +pjJ +pjJ +pjJ +pjJ +lCH +tfP +tfP +ien +sjY +clY +oNQ xtb xtb xtb @@ -68801,18 +75143,18 @@ xtb xtb xtb xtb -pVx +fZl uEC uEC uEC nZv xtb tvO -spe -vwi -vwi -vwi -vwi +jXQ +iKF +iKF +iKF +iKF tOv nLm fVB @@ -68856,11 +75198,11 @@ mNX aoH nLm spo -ruU -ruU -ruU yiM -ruU +yiM +yiM +wsY +yiM fXx rMF vVs @@ -68944,22 +75286,22 @@ cpy cpy cpy tiQ -xho +cNV kwJ xho kwJ -xho -tiQ +cNV +cNV saC saC saC saC saC -otQ -otQ -otQ -eVg -otQ +uqt +uqt +uqt +qvQ +saC saC saC saC @@ -68979,22 +75321,22 @@ xZw xZw xZw kkr -kkr -xrA -hkT +kUs +lrG +lWa fTS bzC -ant +nDM +nDM ylm +pjJ yim -yim -yim -yim -yim -yim -yim -yim -yim +tfP +tfP +tfP +tfP +tfP +tfP cpy cpy cpy @@ -69002,28 +75344,28 @@ cpy cpy hIp ijv -yim -yim -yim -inp -yim -yim -yim -yim -rNM -yim -hxu +tfP +tfP +pjJ +kcL +pjJ +pjJ +pjJ +pjJ +lCH +tfP +ien +ien +ien +clY +oNQ xtb xtb -cgB -pMT -rrN -qyM xtb -qYv +vSO cgB hwf -rrN +tJM qYv qYv qYv @@ -69036,10 +75378,10 @@ pVx xtb tvO fjr -ugV -ugV -ugV -ugV +fjr +fjr +fjr +fjr tPx nLm fVB @@ -69083,11 +75425,11 @@ vJT tsx nLm spo -ruU -ruU -ruU yiM -ruU +yiM +yiM +wsY +vXc fXx mBF mBF @@ -69099,7 +75441,7 @@ hMI pCg nAa pZV -mbG +ike wDy mMI mBF @@ -69171,12 +75513,12 @@ cpy cpy cpy tiQ -xho +cNV yeS xho yeS -xho -tiQ +cNV +cNV saC saC tiQ @@ -69186,7 +75528,7 @@ ksm ksm ksm goK -saC +ixD saC tiQ tiQ @@ -69211,16 +75553,16 @@ kyK kSC lgf bzC -ant +nDM +pRh ylm -yim -yim -yim -yim -yim -yim -yim -yim +pjJ +lCH +tfP +tfP +tfP +tfP +tfP pjJ vjW cpy @@ -69228,24 +75570,24 @@ cpy cpy cpy cpy +tfP +tfP +tfP +tfP +pjJ +pjJ +pjJ +pjJ +tfP yim -yim -yim -yim -yim -yim -yim -yim -yim -rNM -yim -uSY -xtb +tfP +tfP +ien +clY +clY +oNQ xtb -kfF -pVx -roT -pVx +aYF qQp xqd xTs @@ -69266,7 +75608,7 @@ emH emH emH tNr -ugV +fjr tPx nLm nLm @@ -69310,11 +75652,11 @@ nLm nLm nLm spo -ruU -ruU -ruU yiM -ruU +yiM +yiM +wYa +vXc fXx rMF vVs @@ -69398,12 +75740,12 @@ cpy cpy cpy tiQ -xho +cNV kwJ xho kwJ -xho -tiQ +cNV +cNV unt ifi gcn @@ -69438,16 +75780,16 @@ xrA hkT fTS bzC -ant +nDM +nDM ylm -yim -yim -yim -yim -yim -yim -yim -yim +pjJ +lCH +pjJ +tfP +pjJ +pjJ +tfP pjJ pjJ vjW @@ -69456,23 +75798,23 @@ cpy cpy vjW inp +tfP +tfP +tfP +tfP +pjJ +pjJ +tfP +tfP yim -yim -yim -yim -yim -yim -yim -yim -rNM -yim -hxu -xtb +tfP +tfP +ien +clY +clY +oNQ xtb -pVx -pVx -roT -uEC +mjW uEC uEC uEC @@ -69493,7 +75835,7 @@ xtb xtb xtb tEJ -ugV +fjr tPx nLm iJS @@ -69537,11 +75879,11 @@ ijB pPV nLm sFp -ruU -ruU -ruU yiM -ruU +yiM +vXc +wYa +vXc fXx rMF vVs @@ -69630,7 +75972,7 @@ kwJ xho kwJ faZ -tiQ +cNV xho dpj otQ @@ -69663,17 +76005,13 @@ klx xZw xrA kTd -tiQ -tiQ -tiQ +bzC +bzC +bzC +nDM ylm -yim -yim -yim -yim -yim -yim -yim +vjW +lCH pjJ pjJ pjJ @@ -69683,23 +76021,27 @@ pjJ pjJ pjJ pjJ -yim -yim -yim -yim +pjJ +pjJ +pjJ +pjJ +tfP +tfP +tfP +pjJ cpy +pjJ +pjJ +tfP yim -yim -yim -rNM -yim -hxu +tfP +ien +ien +ien +clY +oNQ xtb -ptc -xqd -pVx -vsG -qyM +soS qyM raQ raQ @@ -69720,7 +76062,7 @@ wRJ xmk xtb tvO -ugV +fjr tPx nLm kKc @@ -69764,11 +76106,11 @@ pSs hau nLm spo -ruU -ruU +yiM +yiM gAa uLF -ugi +vXc fXx mBF mBF @@ -69857,7 +76199,7 @@ kwJ xho kwJ xho -tiQ +cNV xho drS dNd @@ -69873,59 +76215,59 @@ otQ otQ fGN tiQ -gAJ +bvI hai xdF fXv hup -uFG +msp uFG hDy -fTS +qYk xeG xZw saC saC saC -xZw +mKQ xrA hkT fTS bzC -ant +nDM +nDM ylm -yim -yim -yim -yim -yim -yim -yim -bgV -sQu -sQu -sQu -oaa +vjW +eDS pjJ pjJ pjJ pjJ pjJ -yim -yim +pjJ +pjJ +pjJ +pjJ +pjJ +pjJ +pjJ +pjJ +pjJ +tfP +tfP cpy cpy cpy +pjJ +tfP yim -yim -rNM -yim -hxu -xyL -joe -xTs -vlq -vsG +tfP +tfP +ien +rzq +clY +oNQ +xtb rmt qdc raS @@ -69936,8 +76278,8 @@ uEC xTs tlz xtb -xqd -xTs +mfF +iYa pAW xTs vIb @@ -69947,7 +76289,7 @@ pVx rKt xtb tvO -ugV +fjr tPx nLm nLm @@ -69991,11 +76333,11 @@ nLm nLm nLm afX -ruU -ruU -tiJ +vXc yiM -ruU +tiJ +mAE +vXc fXx rMF uWI @@ -70084,7 +76426,7 @@ yeS xho yeS xho -tiQ +cNV hAr uCr otQ @@ -70112,47 +76454,47 @@ fTS xeG xZw saC -xZw saC -xZw +saC +mKQ xrA kQK fTS bzC -ant +nDM +pRh ylm -yim -yim -yim -yim -yim +vjW +eDS +pjJ +pjJ bgV sQu -gWI -tiQ -gWI -gWI -gWI +sQu +mjR +sQu +sQu +sQu sQu sQu sQu oaa pjJ -yim -yim -yim +pjJ +pjJ +pjJ cpy +pjJ +pjJ +tfP yim -yim -yim -rNM -yim -hxu -xyL +tfP +tfP +ien puV -xTs -vlq -oem +clY +oNQ +xyL qBe mqk hLo @@ -70163,18 +76505,18 @@ siT uEC xqd xtb -xqd -uEC +fnF +siT pAW xTs -xqd +vRv xtb joe uRx jLF xtb tvO -ugV +fjr tPx nLm tsv @@ -70218,11 +76560,11 @@ mPL mPL nLm tiC -ruU -ruU -ruU -mAR -rwE +vXc +vXc +yiM +tDd +rXb hNz qGf aio @@ -70311,7 +76653,7 @@ xho xho xho xho -tiQ +cNV eZY uCr otQ @@ -70337,49 +76679,49 @@ ibT ixf tLQ jbs -xWc -xWc -xWc -xWc -xWc -rTh -kUs +ikr +saC +saC +saC +mKQ +xrA +hkT nCX bzC -ant +nDM +nDM gWI sQu -sQu -sQu +msQ sQu sQu gWI -tiQ -tiQ -tiQ -tiQ -tiQ -tiQ -tiQ -tiQ -tiQ +iAv +bZB +iAv +iAv +iAv +iAv +iAv +iAv +iAv ylm pjJ +pjJ +pjJ +pjJ +pjJ +pjJ +tfP +tfP yim -yim -yim -yim -yim -yim -yim -rNM -yim -hxu +tfP +ien +ien +ien +clY +oNQ xyL -pwC -xTs -vlq -oem xPA igv hLo @@ -70390,7 +76732,7 @@ siT xTs pVx vFS -xqd +vIe uEC roT uEC @@ -70401,7 +76743,7 @@ gvT jLF xyL tvO -ugV +fjr xWL lfe lbg @@ -70447,9 +76789,9 @@ pMd ssl sDq faQ -ruU +yiM sPs -ruU +vXc tvn mBF mBF @@ -70538,8 +76880,8 @@ vSJ vSJ vSJ cNV -tiQ -dcm +cNV +eGs dtr otQ xho @@ -70562,51 +76904,51 @@ hye hRd uFG hDy -fTS -xeG -xZw -uAm -xZw -xZw -xZw -xrF -hkT -tiQ -tiQ -tiQ -api -api -api -api -api -api -tiQ -tiQ -nqQ -tiQ -pgL -nqQ -dvO +xxW +dsc +rov saC -tjR -tiQ +saC +saC +kzc +lit +cyu +bzC +bzC +bzC +nDM +gWI +gWI +bSU +gWI +iAv +iAv +iAv +vZP +iAv +saC +saC +saC +saC +saC +iAv ylm +pjJ +pjJ +tfP +pjJ +pjJ +tfP +tfP +tfP yim -yim -yim -yim -yim -yim -yim -yim -rNM -yim -hxu +tfP +tfP +ien +clY +clY +pPm xtb -pwX -uEC -uEC -fKu xPA bID rSd @@ -70628,7 +76970,7 @@ jxz jLX xOQ xRk -vwi +iKF xWP yiH ukB @@ -70742,7 +77084,7 @@ max max max osN -pNa +aQH awm wfP wfP @@ -70766,8 +77108,8 @@ xho xho xho cNV -dyl -dwG +eGs +otQ otQ xho uAd @@ -70781,59 +77123,59 @@ otQ otQ xho tiQ -gGq +pNc uFG qml uFG uFG -uFG +dRS hDy hDy fTS xeG jiY -uAm -xZw -xZw +saC +saC +saC xZw xrA hkT -fTS nCX -tiQ -jUY -jUY -jUY -jUY +bzC +iAv jUY -tiQ -tiQ -vDw -vDw -eai -eai -saC +smr +smr +kri +iAv +iAv +iAv +xzn +xzn +nrh +nrh saC saC tjR +tjR xPY ylm oeX +tfP +tfP +tfP +tfP +tfP +tfP +tfP yim -yim -yim -yim -yim -yim -yim -rNM -yim -hxu -xtb -pxN -uEC +tfP +uSY +ien +clY +clY pPm -fKu +xtb xPA hLo hLo @@ -70855,7 +77197,7 @@ uEC wmk xtb tvO -ugV +fjr tPx lfe ppy @@ -70900,9 +77242,9 @@ rHu pMd aWo mpN -ruU -tVv -tVv +vXc +grq +grq kqJ mAR wCR @@ -70993,19 +77335,19 @@ xho kwJ xho cNV -aqI +eGs uqt -otQ -xho -uAd +uqt +xgl +dwP saC saC saC saC saC -vDV -xho -xho +cdP +xgl +xgl hDy hDy hDy @@ -71018,31 +77360,31 @@ hDy fTS fTS xeG -uAm +ipB xZw -oiW +saC xZw xZw bKk -hkY -kyb -fTS -tiQ -lVg -fTS -fTS -fTS +kQR fTS -tiQ +bzC +iAv +iAv +sTr +sTr +lrr +iAv +iAv mWw nmK nrh -xzn +nrh xzn xzn fLS -saC xzn +hHd xPY ylm ylC @@ -71054,19 +77396,19 @@ qyG qyG qyG eeY -yim -rxN -xtb -pVx -uEC -pPt -qeJ -wOu -smr -smr -smr -tNT -rLB +tfP +ien +ien +ien +clY +oNQ +xyL +xPA +hLo +hLo +hLo +aiw +cgB siT uEC tlX @@ -71082,7 +77424,7 @@ pVx uEC xtb tvO -ugV +fjr tPx fSq geB @@ -71130,7 +77472,7 @@ tVv qgj tvq ftl -ruU +yiM rwB gBe fXx @@ -71220,8 +77562,8 @@ uTj cBi xho cNV -dcB -uqt +eGs +otQ otQ xho uAd @@ -71241,52 +77583,52 @@ hkT fTS fTS fTS -fTS +glj fTS xuU txs -xZw +uHn xZw xZw tZs xZw xZw -uHn -xrA -fTS -fTS -fTS -fTS -fTS +mcG +aCR +bzC +iAv +iAv +tfW +tfW mBy -fTS -tiQ +iAv +iAv saC eYA -saC -xzn +akp +hHd mTo xkB xzn -saC xzn +hHd xPY ylm -rNM -yim yim +tfP +tfP cpy +tfP +tfP +tfP +tfP yim -yim -yim -yim -gTJ -piW -rgd -plb -cZN -uIO -qgx +pjJ +pjJ +ien +esw +clY +oNQ xtb qBc jZo @@ -71294,7 +77636,7 @@ rbb jZo rwK hzk -uEC +qGh uEC jXc xtb @@ -71309,7 +77651,7 @@ vmo pVx xtb tvO -ugV +fjr tPx nLm tTU @@ -71355,11 +77697,11 @@ nLm vBa ofy sPs -tVv -tVv -ruU -xly +grq +grq yiM +xly +wYa fXx rMF tSL @@ -71448,7 +77790,7 @@ oML xho cNV eGs -dwG +otQ otQ xho uAd @@ -71461,60 +77803,60 @@ oEw yeS oML fTS -uxf +lrh gIH hcV hkY hAk hAk hRj -ick +kfA ick iMS xWc -xWc +itp xWc xWc xWc krw -xWc +ahJ pRf -bKk -hAk -hAk -hAk -hAk -hAk -kyb -fTS saC +bzC +iAv +geP +jqL +jqL +rKz +wAB +iAv saC saC saC -xzn +hHd mTo mTo xzn +hHd xzn -xzn -xPY +jdv ylm -rNM yim +tfP cpy cpy cpy -yim -yim -yim +tfP +tfP +tfP yim pjJ -sTr -pnx -xqd -xTs -uEC -rJI +pjJ +ien +dWc +clY +oNQ +xyL xPA hLo hLo @@ -71536,7 +77878,7 @@ xyL xtb xtb tvO -ugV +fjr tPx nLm nLm @@ -71580,11 +77922,11 @@ rHu nLm nLm afX -ruU +vXc jrL qig -ruU -ruU +yiM +yiM twT voL rMF @@ -71674,7 +78016,7 @@ jJa gTw xho cNV -lxW +eGs dya otQ xho @@ -71695,53 +78037,53 @@ hlf tso tso hRG +kzc xZw xZw xZw +iGc xZw -rEV -xZw -xZw -saC -saC -xZw -uHn -rEV xZw xZw -uAm xZw -lWa -pRT +mKQ saC saC +bzC +iAv +wTV +hAD +lEZ +fNk +wAB +iAv saC saC -vZP +jPC xzn xkB xkB xzn xzn vZP -xPY +jdv ylm -rNM yim +tfP cpy cpy cpy cpy -yim -yim -pjJ -pjJ tfP +tfP +lCH +pjJ +ien +ien +ien +clY +oNQ xtb -pVx -xTs -xTs -rJI xPA hLo hLo @@ -71807,12 +78149,12 @@ nLm nLm rMF sql -ruU -ruU +yiM +yiM sPw -ruU -ruU -ruU +yiM +vXc +vXc rOP tSL tSL @@ -71891,7 +78233,7 @@ bMX cpy cpy cpy -tiQ +cpy tiQ vDV uTj @@ -71901,7 +78243,7 @@ oML xho xho cNV -fcV +eGs dya otQ xho @@ -71915,60 +78257,60 @@ oEw fwX oML fTS -uxf +lrh gMy udR iKw udR udR udR -udR +xEk iyl iOl xZw -xZw -xZw -saC -saC -saC -xZw uHn xZw xZw xZw -uAm -xZw -xrA -fTS -nCX +mKQ saC saC -tjR -xzn -xzn +saC +bzC +iAv +eTn +gbo +bBJ +iuC +axS +iAv +saC +lqd xzn xzn xzn +hHd +hHd xzn xzn -xPY +jdv ylm -rNM yim +tfP cpy cpy cpy cpy -yim +tfP pjJ +lCH pjJ pjJ -hxu +ien +nBs +clY +oNQ xtb -pVx -xTs -xTs -rJI xPA wiz rwx @@ -72035,10 +78377,10 @@ rMF sql vXc bMN -ruU -ruU +yiM +yiM pWR -rwE +rXb uHE oXp tSL @@ -72118,8 +78460,8 @@ bMX cpy cpy cpy +cpy tiQ -xho vDV kmz yeS @@ -72142,60 +78484,60 @@ fpH dOw gTw fTS -uxf +lrh gHF fTS hkT fTS fTS -oJS -oJS -oJS -iOG -jci -xZw -xZw saC saC saC -saC -mOl -hry -xZw +iOG +jci +uHn xZw xZw xZw -xrA saC saC saC saC +bzC +iAv +eTn +iEn +bBJ +iuC +kzG +iAv saC +saC +hHd xzn +hHd +hHd xzn xzn xzn -xzn -xzn -xzn -xPY +jdv ylm -rNM yim +tfP cpy cpy cpy cpy vjW pjJ +lCH pjJ pjJ -hxu +ien +hmM +clY +oNQ xtb -pVx -pDM -pPC -rJI xPA piE hLo @@ -72229,10 +78571,10 @@ lfe nLm ahP wCC -ugV -ugV -ugV -ugV +fjr +fjr +fjr +fjr bPH dox tGl @@ -72244,9 +78586,9 @@ qGK qSk ofd spo -ruU -ruU -ruU +vXc +vXc +vXc mqC pwz dFg @@ -72262,10 +78604,10 @@ sql vXc vXc upz -ruU -ruU yiM -ruU +yiM +wsY +vXc fXx tSL tSL @@ -72345,16 +78687,16 @@ bMX cpy cpy cpy +cpy tiQ -xho -xiY -ote +vDV +uAd yeS yeS oML xho xho -otQ +uqt xho uTj ksm @@ -72364,10 +78706,10 @@ saC saC saC saC -jKu -xho -xho -dyl +gyK +xgl +xgl +xgl hDy hDy hDy @@ -72377,27 +78719,27 @@ hzq hDy hDy hDy -oJS -oJS -xeG -xZw -xZw -saC saC saC -saC -qpD +xeG uHn -oiW xZw xZw saC saC saC +qpD saC -tiQ -saC -xzn +bzC +iAv +gem +sjx +bBJ +iuC +jqL +iAv +saC +hHd nsv jxI jxI @@ -72415,14 +78757,14 @@ cpy cpy cpy pjJ +lCH pjJ -pjJ -hxu +ien +ien +ien +sjY +oNQ xyL -joe -pEp -pRh -rJI qBe sKz hLo @@ -72458,8 +78800,8 @@ wCC ugV ugV kGX -ugV -ugV +fjr +fjr rZc dox tGl @@ -72471,13 +78813,13 @@ uMO rqs ofd spo -ruU +vXc laX dFH -ruU -ruU -ruU -ruU +vXc +vXc +vXc +vXc pUv xyN xyN @@ -72490,9 +78832,9 @@ vXc vXc upz vXc -ruU yiM -ruU +wsY +yiM fXx tSL tSL @@ -72571,17 +78913,17 @@ bMX bMX cpy cpy +cpy +cpy tiQ -tiQ -xho -aEL -yeS +vDV +uAd yeS yeS epI cBi xho -otQ +uqt xho uAd yeS @@ -72594,7 +78936,7 @@ yeS jKu xho otQ -uqt +otQ dyl tiQ gNe @@ -72602,39 +78944,39 @@ uFG qml uFG uFG -uFG +msp hDy hDy -fTS -xeG -xZw -xZw -xZw saC +dsc +rov +kzc saC saC -hdR -hRG -xZw -xZw saC saC saC saC -tiQ -tiQ -tjR +bzC +iAv +eym +iEn +bBJ +iuC +jqL +iAv +lqd xzn sQN xkB xkB -xkB -xzn +wFA +hHd xzn xzn xPY ylm -yim +tfP cpy cpy cpy @@ -72642,14 +78984,14 @@ cpy cpy cpy cpy +lCH pjJ pjJ -hxu -xyL -joe -pEs -xTs -pVx +ien +fkD +clY +oNQ +xtb rmt bBt rcP @@ -72676,17 +79018,17 @@ hNR ugV ugV ugV +fjr +fjr +fjr +fjr ugV ugV ugV ugV ugV ugV -ugV -ugV -ugV -ugV -ugV +fjr rZc dox tGl @@ -72698,14 +79040,14 @@ uMO rqs ofd spo -ruU +vXc rjn bVu -ruU -ruU -ruU -ruU -ruU +vXc +vXc +vXc +vXc +vXc vXc vXc vXc @@ -72718,8 +79060,8 @@ vXc upz vXc vXc +wsY yiM -ruU pUv rMF tSL @@ -72798,17 +79140,17 @@ bMX bMX cpy cpy +cpy +cpy cpn -xho -xho aGg -dLs +dAm dXq ekt eoH eqU cJo -cRN +fsV cJo dAm dLs @@ -72816,7 +79158,7 @@ afA saC saC esB -dLs +sGF dLs fcW xho @@ -72832,36 +79174,36 @@ wyv uFG uFG hDy -fTS +qYk xeG +uHn xZw -xZw -saC saC saC saC -kUF -ljd -lrG -rEV saC saC saC -tiQ -tiQ -tiQ -xzn +bzC +iAv +geP +iEn +bBJ +iuC +eTn +iAv +hHd xzn sQN xkB mTo xkB ufA -xzn +hHd xzn xPY ylm -yim +tfP cpy cpy cpy @@ -72869,14 +79211,14 @@ cpy cpy vjW pjJ +lCH pjJ pjJ -hxu +ien +bHA +clY +oNQ xyL -xqd -pEv -xTs -pVx fwy fwy vmo @@ -72913,7 +79255,7 @@ vwi vwi vwi vwi -vpa +nQx rvx fZy hAg @@ -72925,7 +79267,7 @@ qGK rqs ofd spo -ruU +vXc qbI qlD qpz @@ -72946,8 +79288,8 @@ vXc pEA tpD tBQ -ruU -ruU +yiM +yiM fXx tmA xNR @@ -73025,25 +79367,25 @@ bMX bMX cpy cpy +cpy +cpy cpn -xho -uTj -aGI -yeS +vDV +uAd yeS yeS oML cCC xho -otQ +uqt xho aut dOw ajw bRN -dLs +sGF euN -yeS +saC yeS jKu xho @@ -73052,7 +79394,7 @@ otQ xho tiQ xce -uFG +oKN xdF iKC hCv @@ -73061,22 +79403,22 @@ uFG iwJ fTS xeG -xZw +uHn jwT saC saC saC -kAI -uHn -ljm -xZw -xZw saC saC saC -tiQ -tiQ -tiQ +bzC +iAv +lwc +iEn +bBJ +iyS +eTn +iAv xzn klj lbX @@ -73085,7 +79427,7 @@ klj xzn gBi saC -xzn +hHd xPY ylm pjJ @@ -73096,14 +79438,14 @@ cpy pjJ pjJ pjJ +lCH pjJ -pjJ -hxu -xtb -xqd +ien +ien +ien uSo -fwy -fwy +oNQ +xtb pVx xqd qPT @@ -73141,9 +79483,9 @@ emH tNr ugV spe -vpa -ugV -ugV +nQx +fjr +fjr crH pQE pQE @@ -73152,15 +79494,15 @@ oSH pQE pQE spo -ruU -ruU -ruU -ruU -ruU -ruU -ruU -ruU -ruU +vXc +vXc +vXc +vXc +vXc +vXc +yiM +yiM +yiM trW uFB taH @@ -73169,7 +79511,7 @@ lrm pnO umf vXc -ruU +yiM vXc vXc tDd @@ -73186,7 +79528,7 @@ mCA qYG wyy phu -phu +wDu cKi phu phu @@ -73252,11 +79594,11 @@ bMX bMX cpy cpy +cpy +cpy cpn -faZ +vDV uAd -oEw -yeS yeS yeS oML @@ -73268,8 +79610,8 @@ cCC xho xho uAd -yeS -xho +saC +saC xho yeS jKu @@ -73288,54 +79630,54 @@ kck ixf tLQ jbs -xWc -xWc -xWc -xWc -xWc -kBm -kVa -xWc -xWc -xWc -iGc +jtf +kgb +xZw saC saC -tiQ -tiQ -tiQ -tiQ -fTS -hkT -fTS -fTS -tiQ saC saC saC -xPY +oaj +iAv +jqL +vTK +bBJ +iyS +eTn +iAv +pbi +bKn +jjW +bKn +bKn +iAv +iAv +iAv +iAv +iAv ylm +vjW pjJ pjJ pjJ -vjW -vjW pjJ pjJ pjJ pjJ +lCH pjJ -mZN -xtb -xtb -xtb +pjJ +ien +hJZ +hJZ +oNQ xtb xyL xyL xtb xtb xtb -xtb rMb skQ xtb @@ -73352,7 +79694,7 @@ xyL xtb xtb tEJ -ugV +fjr ugV hNR crH @@ -73368,9 +79710,9 @@ eqb tvO ugV ugV -spe -vpa -ugV +jXQ +nQx +fjr nIu ofd iiL @@ -73379,15 +79721,15 @@ uMO oXF ofd aPS -ruU -ruU -ruU -ruU -ruU -ruU -ruU -ruU -ruU +vXc +vXc +vXc +vXc +vXc +yiM +yiM +yiM +yiM cXq hDI taH @@ -73395,10 +79737,10 @@ taH taH jom vXc -ruU -ruU -ruU -ruU +yiM +yiM +yiM +yiM vXc vXc voL @@ -73479,11 +79821,11 @@ bMX bMX cpy cpy +cpy +cpy cpn -xho -aut -aJT -yeS +vDV +uAd yeS yeS oML @@ -73495,8 +79837,8 @@ dCx dtr xho uAd -xho -kwJ +saC +saC kwJ xho jKu @@ -73513,51 +79855,51 @@ hFS uFG uFG hDy -fTS +gll xeG -xZw +uHn xZw xZw klL -xZw -xZw -xZw -xZw -xZw -xZw -mkb -iQb -tiQ -tiQ -tiQ -tiQ -tiQ -jUY -crX -jUY -jUY -tiQ -tiQ saC saC -xPY -ylm -vjW -pjJ -pjJ -pjJ -pjJ -pjJ -pjJ -pjJ +saC +saC +bzC +iAv +gmb +iEn +fQi +iyS +jqL +iAv +kzG +jqL +qUz +jqL +jqL +gcr +skC +iAv +iAv +iAv +jEX +sQu +sQu +sQu +sQu +sQu +sQu +oaa pjJ +lCH vjW -cpy -cpy -cpy -cpy +pjJ ien -hhD +hJZ +hJZ +jqF +vne hhD ahP xyL @@ -73579,7 +79921,7 @@ hhD hhD hhD wCC -ugV +fjr ugV hNR crH @@ -73595,9 +79937,9 @@ sUN tvO ugV ugV -ugV -spe -vwi +fjr +jXQ +iKF sQL wyI gny @@ -73606,15 +79948,15 @@ qGK xvW jct qQM -ruU -pgm -ruU -ruU -ruU -ruU +vXc pgm -ruU -ruU +vXc +yiM +yiM +yiM +nfk +yiM +yiM gek hXO hXO @@ -73624,9 +79966,9 @@ fVU lNU lNU rVe -ruU -ruU -ruU +yiM +yiM +yiM vXc rOP tSL @@ -73706,11 +80048,11 @@ bMX bMX cpy cpy +cpy +cpy cpn -xho -xho -aEL -yeS +vDV +uAd yeS yeS epI @@ -73722,69 +80064,69 @@ dCx otQ xho uAd -xho -epS +saC +kwJ kwJ xho jKu xho otQ dtr -xho +saC tiQ -hTg +oDU uFG hjB hBB uFG -uFG +dRS hDy hDy -fTS -xeG -xZw -xZw -xZw -xZw -xZw -xZw -xZw -ljq +gvs +hdR +uHn xZw xZw -xrA -hkT -fTS -tiQ -tiQ -tiQ -tiQ -fTS -fTS -fTS -fTS -tiQ +kyz +mKQ saC saC saC -xPY +bzC +iAv +jqL +iEn +bBJ +iyS +jqL +iAv +pkE +fzu +jMK +lEZ +lEZ +uFT +eTn +atO +iAv +iAv +kdf +ciw +ciw +ciw +lPf +qqJ +jEX ylm -vjW -vjW -pjJ -pjJ -pjJ pjJ +lCH pjJ -vjW -vjW -cpy -cpy -cpy -cpy -cpy ien -fjr +ien +ien +hJZ +hJZ +vne fjr crH xyL @@ -73802,12 +80144,12 @@ vkG vKF xyL tvO -ugV -ugV -ugV -ugV -ugV -ugV +fjr +fjr +fjr +fjr +fjr +fjr hNR crH vCy @@ -73821,10 +80163,10 @@ odi dHx tvO ugV -ugV -ugV -ugV -ugV +fjr +fjr +fjr +fjr miz tRd xvW @@ -73833,15 +80175,15 @@ bGT xvW tRd qQM -ruU -qQi +vXc +tpD qQi qQi qQi qQi sMa -ruU -ruU +yiM +yiM cRB trZ trZ @@ -73851,9 +80193,9 @@ trZ trZ trZ bKO -ruU -ruU -ruU +yiM +yiM +yiM vXc rOP tSL @@ -73933,31 +80275,31 @@ bMX bMX cpy cpy +cpy +cpy tiQ -tiQ -xho aKK -yeS +uAd yeS yeS yeS oML xho cNV -hBg +saC otQ otQ xho uAd -xho +xgl kwJ ezU xho jKu xho otQ -otQ -aqI +saC +saC tiQ xce xce @@ -73969,46 +80311,46 @@ hDy iyq fTS xeG -xZw +uHn jxu xZw rEV -xZw -saC -saC -xZw -xZw -xZw -bKk -kQR -fTS -tiQ -tiQ -tiQ -tiQ -xuU -hkY -hAk -hAk -saC +mKQ saC saC saC -tiQ -gWI -gWI -sQu -sQu -sQu +bzC +iAv +vsj +hij +bBJ +iuC +jqL +jjj +eTn +gbo +sFb +pNF +uFT +lrM +uFT +eTn +iAv +iAv +mnQ +rCu +rCu +eHE +aea +mEG +alx ylm +vjW +lCH pjJ pjJ -cpy -cpy -cpy -cpy -cpy -cpy +pjJ +ien ien ien ien @@ -74017,7 +80359,7 @@ crH xyL qxp qPT -uEC +rKt xTs kMr nXl @@ -74029,12 +80371,12 @@ qfD vLu xyL tvO -ugV -ugV -ugV +fjr +fjr +fjr cpy -ugV -ugV +fjr +fjr hNR crH iML @@ -74048,10 +80390,10 @@ oow sUN tvO ugV -ugV +fjr cpy -ugV -ugV +fjr +fjr wsX ofd oWV @@ -74060,14 +80402,14 @@ qGK oWV ofd ubH -ruU -ruU -ruU -ruU -ruU -ruU +vXc +yiM +yiM +yiM +yiM +yiM sMa -ruU +yiM vXc lSq trZ @@ -74078,9 +80420,9 @@ sDa hCV trZ bKO -ruU -ruU -ruU +yiM +yiM +vXc vXc rOP rMF @@ -74111,8 +80453,8 @@ tOo tSL dGD lyD -nax -nax +mPr +hFX bCy tOo wIr @@ -74125,12 +80467,12 @@ wIr wIr dGD lyD -nax -nax -nax -nax -nax -nax +mPr +mPr +mPr +mPr +mPr +mPr nax nax mPr @@ -74161,30 +80503,30 @@ bMX cpy cpy cpy +cpy tiQ -xho -aLJ -bdv +vDV +uAd yeS yeS yeS oML xho -cNV -xho +saC +saC otQ otQ xho uAd -yeS +dEk xho xho yeS jKu xho otQ -uqt -dwP +saC +saC tiQ gxl hai @@ -74196,55 +80538,55 @@ hDy iyC xuU txs -xZw +uHn jBy uAm -xZw +mKQ saC saC saC saC -xZw -rEV -xZw -miH -lgf -tiQ -tiQ -tiQ -hAk -txs -uHn -xZw -xZw -xZw -saC -saC -saC -tiQ -tiQ -saC -saC -tiQ -tiQ +uAm +iAv +bny +gbo +bBJ +iuC +jqL +jjj +jqL +gbo +aIM +bBJ +qYM +bBJ +jmX +mlR +iAv +iAv +joJ +fBg +oDj +joJ +iAv +iAv +alx ylm -pjJ -pjJ -cpy -cpy -cpy -cpy -cpy -cpy -cpy -ien -rxI -fjr +vjW +hdu +nCa +nCa +nCa +nCa +nCa +gtS +oVO +nQx crH xtb xtb xtb -pnx +rMb skQ xtb xtb @@ -74256,13 +80598,13 @@ skQ xtb xtb tvO -ugV -ugV +fjr +fjr cpy cpy cpy -ugV -hNR +fjr +jDO crH yjD mIa @@ -74274,11 +80616,11 @@ cqL oQV ncs tvO -ugV -ugV +fjr +fjr cpy cpy -ugV +fjr crH pQE pQE @@ -74287,12 +80629,12 @@ cXm pQE pQE spo -ruU -ruU -ruU +vXc +yiM +yiM iBY sno -ruU +yiM sMa vXc umf @@ -74305,9 +80647,9 @@ ljW xMu bvK bKO -ruU -ruU -ruU +yiM +yiM +vXc vXc cys rMF @@ -74337,10 +80679,10 @@ oIu oIu oIu lyD -nax -nax -nax -nax +mPr +mPr +hFX +hFX bCy bYV wIr @@ -74351,11 +80693,11 @@ wIr wIr rZK lyD -nax -nax -nax -nax -nax +mPr +mPr +mPr +mPr +mPr nax nax nax @@ -74388,30 +80730,30 @@ bMX cpy cpy cpy +cpy tiQ -xho vDV uAd yeS yeS yeS oML -xho -cNV -xho -otQ +saC +saC +saC +saC otQ xho uAd -yeS +dEk yeS yeS yeS jKu xho -otQ -uqt -eXe +saC +saC +saC tiQ gxl gYT @@ -74423,7 +80765,7 @@ hDy izY xeG xZw -xZw +uHn uAm uAm klW @@ -74431,47 +80773,47 @@ saC saC saC saC -xZw -xZw -bgc -mjs -fTS -tiQ -tiQ +uAm +lLA +qeJ +mQt +idk +cMW +hZO mPe -iOl -xZw -uHn -xZw -xZw -xZw -saC -saC -saC -saC -saC -saC -saC -saC -tiQ -ylm +sgq +lFa +iLn +eZb +nQO +qAS +nQO +ahs +gJK +bzv +eLU +oXk +bWQ +mjF +gXI +joJ +urp +hTf +nYz +nYz +nYz +nYz +nYz +nYz +taS vjW -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -ien -rxI -fjr +oxt +jDO sSn hhD hhD rxu -smY +lnK smY kwc hhD @@ -74483,13 +80825,13 @@ vlN utd qDL tEJ -ugV +fjr cpy cpy cpy cpy cpy -hNR +jDO sSn hhD hhD @@ -74501,11 +80843,11 @@ hhD hhD hhD wCC -ugV +fjr cpy cpy cpy -ugV +fjr crH ofd otj @@ -74514,12 +80856,12 @@ uMO rmi ofd spo -ruU -ruU -ruU +vXc +yiM +yiM qCY iqQ -ruU +yiM puY vXc umf @@ -74532,9 +80874,9 @@ xMu wrg trZ bKO -ruU -ruU -ruU +yiM +vXc +vXc vXc wYa pUv @@ -74549,8 +80891,8 @@ tSL tSL rMF sql -ruU -ruU +yiM +yiM vXc vXc vXc @@ -74563,12 +80905,12 @@ ffo nax nax nax -nax -nax -nax -nax -nax -nax +mPr +mPr +mPr +mPr +hFX +hFX bdL rQg hYL @@ -74577,11 +80919,11 @@ jmv hYL rQg vdp -nax -nax +mPr +mPr tNc -tZF -tZF +gUj +gUj tZF iCb nax @@ -74615,7 +80957,7 @@ bMX cpy cpy cpy -tiQ +cpy tiQ vDV uAd @@ -74624,13 +80966,13 @@ yeS yeS cCQ saC -tiQ saC -iOx +saC +saC saC saC aut -dOw +ejo dOw dOw dOw @@ -74650,55 +80992,55 @@ hDy iBs oQs jcq -xZw -xZw -xZw -saC -saC -saC -saC -xZw -xZw -xZw -xrA -hkT -fTS -tiQ -tiQ -fTS -xeG -xZw -kUF -xZw -xZw -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC +uHn +kib +kjU saC -cpy saC saC saC -cpy -cpy -cpy -ien -ien -ien -fjr -fjr -fjr -fjr -fjr -fjr +mKN +lko +lLA +jqL +tNT +mvI +pZy +wAB +jUY +qUz +rtw +idk +gNs +mCx +ham +jqL +jeb +fBg +mEp +myz +smr +kri +kEj +ldy +joJ +gMe +jkO +oUq +oUq +tVa +tVa +oUq +oUq +oUq +oUq +oUq +jXQ +iKF +iKF +iKF +iKF +iKo fjr fjr fjr @@ -74710,14 +81052,13 @@ vlX utd uep tvO -ugV +fjr cpy cpy cpy cpy -ugV -hNR -ugV +fjr +jDO ugV ugV ugV @@ -74729,10 +81070,11 @@ ugV ugV ugV ugV +fjr cpy cpy cpy -ugV +fjr crH ofd qSk @@ -74741,14 +81083,14 @@ qGK qSk ofd spo -ruU -ruU -ruU +vXc +yiM +yiM qCY uie -ruU -ruU -ruU +yiM +yiM +yiM vXc lSq trZ @@ -74759,9 +81101,9 @@ cia tEC hVw bKO -ruU -ruU -ruU +yiM +vXc +vXc vXc wYa umf @@ -74775,27 +81117,27 @@ rMF tSL rMF sql -ruU -ruU -ruU -ruU +yiM +yiM +yiM +yiM vXc vXc vXc umf vXc vXc -ruU +yiM ffo nax nax -nax -nax -nax -nax -nax -nax -nax +mPr +mPr +mPr +mPr +mPr +mPr +hFX bdL rQg hYL @@ -74804,8 +81146,8 @@ tkf hYL rQg vdp -nax -nax +mPr +mPr tNc nax nax @@ -74844,10 +81186,11 @@ cpy cpy cpy tiQ -vDV -uAd -yeS -bXA +cdP +dwP +dEk +dEk +saC saC saC saC @@ -74857,7 +81200,6 @@ saC saC saC saC -otQ otQ eyh cRN @@ -74871,54 +81213,54 @@ xce hdd xdF hBD -uFG +nbD xce hDy fTS iOO jdl -jcq -xZw +jRY xZw +kqX saC saC saC -xZw -xZw -xZw -xZw xrA -hkT -tiQ -tiQ -tiQ -lgf -xeG -xZw -uHn -xZw -xZw -tiQ -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -cpy -saC -cpy -ien +mOl +uAm +lLA +ntL +jqL +jwx +qce +iAv +iAv +viI +iOw +kzG +bag +dtR +eTn +mlR +iAv +iAv +iAv +joJ +fBg +iby +joJ +iAv +iAv +iAv +oUq +oUq +oAY +lDk +uFA +bJy +oUq +oUq +oUq fjr rxI fjr @@ -74937,12 +81279,12 @@ vlX utd uep tvO -ugV +fjr cpy cpy cpy -ugV -ugV +fjr +fjr hNR ugV xRK @@ -74953,13 +81295,13 @@ emH emH emH tNr -ugV -ugV -ugV -ugV +fjr +fjr +fjr +fjr cpy -ugV -ugV +fjr +fjr lPv ofd aOP @@ -74968,15 +81310,15 @@ qGK qSk ofd spo -ruU -ruU -ruU +yiM +yiM +yiM qCY uie -ruU -ruU -ruU -ruU +yiM +yiM +yiM +yiM lSq trZ gCE @@ -74986,9 +81328,9 @@ xMu mcf hVw bKO -ruU -ruU -ruU +yiM +yiM +vXc vXc wYa vXc @@ -75001,28 +81343,28 @@ xyN xyN xyN sql -ruU -ruU -ruU -ruU -ruU -ruU +yiM +yiM +yiM +yiM +yiM +yiM vXc vXc vXc -ruU -ruU -ruU +yiM +yiM +yiM ffo nax nax -nax -nax -nax -nax -nax -nax -nax +mPr +mPr +mPr +mPr +mPr +mPr +mPr bdL rQg hYL @@ -75031,9 +81373,9 @@ tkf hYL rQg vdp -nax -nax -nax +mPr +mPr +mPr iCb nax nax @@ -75075,7 +81417,9 @@ vDV uAd yeS yeS -yeS +bXA +saC +saC saC saC saC @@ -75084,10 +81428,8 @@ saC saC saC saC -yeS -yeS oEw -yeS +saC saC saC saC @@ -75107,45 +81449,45 @@ jds jjo xZw xZw -xZw -saC -kBJ -xZw -jwT -xZw -xZw -lVG -hkT -fTS -mCK -gHF -fTS -xeG -xZw -uHn -xZw -xZw -tiQ -saC -saC -saC -saC saC saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -ien +kBJ +kXB +mSc +uAm +uAm +lLA +lLA +iAv +iAv +iAv +iAv +fBg +unU +wBR +iAv +iAv +uGK +iAv +iAv +iAv +iAv +iyE +tfW +rdf +vju +vju +rKS +vju +xJt +lbo +lbo +kXY +kXY +lDk +bJy +oUq +oUq fjr fjr fjr @@ -75164,12 +81506,12 @@ vlX vgI uep tvO -ugV -ugV +fjr +fjr cpy -ugV +fjr hxy -vwi +iKF kdo xRK yjp @@ -75181,11 +81523,11 @@ sjy sjy ahP tNr -ugV -ugV -ugV -ugV -ugV +fjr +fjr +fjr +fjr +fjr nVN xlL ofd @@ -75195,15 +81537,15 @@ qGK rqs ofd spo -ruU -ruU -ruU +yiM +yiM +yiM bYS xLY -ruU -ruU -ruU -ruU +yiM +yiM +yiM +yiM lSq trZ iLc @@ -75213,43 +81555,43 @@ ljW uVH hVw bKO -ruU -ruU -ruU +yiM +yiM +yiM vXc wYa vXc vXc vXc jbv -ruU -ruU -ruU -ruU -ruU -ruU -ruU -ruU -ruU -ruU +yiM +yiM +yiM +yiM +yiM +yiM +yiM +yiM +yiM +yiM vXc vXc vXc umf vXc vXc -ruU -ruU +yiM +yiM ffo nax -nax -nax -nax -nax -nax -nax -nax -nax +mPr +mPr +mPr +mPr +mPr +mPr +mPr +mPr bdL rQg pfD @@ -75258,8 +81600,8 @@ tkf hYL rQg vdp -nax -nax +mPr +mPr nax bjX nXX @@ -75310,10 +81652,10 @@ saC saC saC saC -xho -yeS -yeS -oEw +saC +saC +saC +qpD saC saC saC @@ -75335,45 +81677,45 @@ jjU jCq xZw xZw -kqX +saC kBL kAI -xZw -xZw -xZw -bKk -kQR fTS -mCK -gHF -xuU -txs -xZw -hkT -xZw -saC -tiQ -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -ien -ien -ien +hao +uAm +uAm +nzR +bzC +bzC +bzC +iAv +fBg +fBg +iAv +iAv +lLA +lLA +xUq +xUq +iAv +mOh +vju +nMl +wrc +mjF +mGb +eDD +rvg +fAt +spB +kXY +nFc +rqE +kXY +slt +oUq +oUq +oUq fjr fjr fjr @@ -75392,11 +81734,11 @@ utd qDL ahP tNr -ugV -ugV -ugV -hNR -ugV +fjr +fjr +fjr +jDO +fjr ugV crH sjy @@ -75429,8 +81771,8 @@ cWT cWT cWT kEZ -ruU -ruU +yiM +yiM lSq trZ qLJ @@ -75440,8 +81782,8 @@ qhm cia trZ bKO -ruU -ruU +yiM +yiM vXc vXc tDd @@ -75466,17 +81808,17 @@ umf umf vXc vXc -ruU +yiM ffo nax nax -nax -nax -nax -nax -nax -nax -nax +mPr +mPr +hFX +hFX +hFX +mPr +mPr bdL wIr wIr @@ -75486,7 +81828,7 @@ wIr wIr vdp sxg -nax +mPr bjX yhj ylo @@ -75537,11 +81879,11 @@ saC saC saC saC -otQ -otQ +saC +saC otQ eVg -saC +otQ saC saC saC @@ -75558,48 +81900,48 @@ hDy saC xeG xZw -jdD +jTb xZw xZw xZw -fBU +kzc kCM kWa -rEV -xZw -xZw -xZw -mkb -tLQ -mCQ -mKN -jbs -xWc -tLQ -num +mXn fTS +lqY saC saC saC saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -ien +bzC +bzC +iAv +iAv +iAv +gYc +lLA +lLA +lLA +xUq +yaw +vju +qRw +vju +vju +oLK +tKR +gxb +dPl +tVa +dio +kXY +nFc +dwI +kXY +lDk +oUq +oUq rxI fjr fjr @@ -75622,8 +81964,8 @@ xXR emH emH tNr -hNR -ugV +jDO +fjr xRK ahP sjy @@ -75657,7 +81999,7 @@ lVp lVp aHH kEZ -ruU +yiM lSq trZ hVw @@ -75701,9 +82043,9 @@ yhR yhR yhR gGM -nax -nax -nax +hFX +hFX +mPr bdL wIr wIr @@ -75712,8 +82054,8 @@ dgY wIr wIr vdp -nax -nax +mPr +mPr aPe ylo ylo @@ -75764,12 +82106,12 @@ saC saC saC saC -kbV +wLp kbV kbV gPq kbV -saC +kbV saC saC tiQ @@ -75785,49 +82127,49 @@ hDy saC saC xZw -xZw -xZw -xZw -xZw -xZw -xZw -xZw -xZw -xZw -xZw -rEV -xrA -fTS -mCK -gHF -xeG -xZw -tKb -kQK -fTS -xZw -saC -saC -saC -saC -saC -saC +jTB +xWc +xWc +xWc +gnx +xWc +xWc +mXA +ick +lvH +lAA +ugi saC saC saC saC saC saC -iTI -xED -xED -xED -xED -xED -xED -xED -lER -mlp +iAv +iAv +iAv +iAv +iAv +iAv +iAv +iAv +iAv +iAv +iAv +iAv +iAv +iAv +iAv +oUq +jfx +nMX +rmA +nMX +nMX +rRA +oUq +oUq +rxI rxI fjr ugV @@ -75849,8 +82191,8 @@ wrC wrC wrC tvO -hNR -ugV +jDO +fjr crH sjy sjy @@ -75929,8 +82271,8 @@ jmG jmG pqR gGM -nax -nax +hFX +mPr bdL rQg hYL @@ -75939,8 +82281,8 @@ tkf pfD rQg vdp -nax -nax +mPr +mPr uXp ylo fCW @@ -75985,12 +82327,12 @@ gTw xho cNV cNV -dxU -cSb -qUQ +cNV +fxq +fxq saC saC -qUQ +wLp qUQ qUQ qUQ @@ -76011,29 +82353,20 @@ gxM tiQ saC saC -ycV -saC saC -rEV -kmg -xZw xZw xZw +rEV +kmg +kzc xZw xZw xZw xZw -xrA -fTS -ncA -saC -xeG xZw -fTS -kQK -qVN -fTS xZw +uHn +kfF saC saC saC @@ -76043,19 +82376,28 @@ saC saC saC saC -saC -iTI -iTI -uKD -uKD -uKD -uKD -uKD -uKD -uKD -uKD -mwv -uKD +tTv +tTv +tTv +tTv +tTv +tTv +tTv +tTv +tTv +tTv +tTv +oUq +hWC +vcF +vsy +wUp +wUp +rXq +oUq +oUq +oUq +ugV ugV ugV ugV @@ -76076,7 +82418,7 @@ wSr jNY wrC tvO -hNR +jDO xRK ahP sjy @@ -76113,12 +82455,12 @@ lVp jzu vXc vXc -ruU -ruU -ruU -ruU -ruU -ruU +yiM +yiM +yiM +yiM +yiM +yiM vXc vXc vXc @@ -76156,8 +82498,8 @@ jmG jmG jmG xAR -nax -nax +hFX +mPr bdL rQg hYL @@ -76167,7 +82509,7 @@ hYL rQg vdp lbH -sxg +bwF aPe nnG yfu @@ -76212,12 +82554,12 @@ xho cNV cNV cNV -dxU +cNV cSb dcD -dDC -dDC -dDC +moZ +moZ +moZ dDC dDC dDC @@ -76226,42 +82568,35 @@ dDC fhQ fpB dDC -dDC -fXU -gll +saC +saC +saC tiQ iBI uFG -uFG +nbD tiQ tiQ tiQ saC -qTE -ycV saC saC saC xZw xZw xZw +kzc xZw xZw xZw xZw xZw +xZw +uHn +rEV +aKQ saC saC -ncA -saC -saC -xZw -fTS -kQK -fTS -xZw -xZw -xZw saC saC saC @@ -76271,18 +82606,25 @@ saC saC saC saC -xED -uKD -uKD -vju -vju -vju -vju -vju -vju -uKD -mwv -tvO +tTv +men +xVB +onM +men +iQb +pXh +tTv +oUq +tTl +bJN +jbn +kXY +kXY +jWZ +oUq +oUq +ugV +ugV ugV ugV ugV @@ -76303,14 +82645,14 @@ jyw jPk wrC tvO -hNR +jDO crH sjy sjy mhn sDY kTm -ebn +oHR ort wdi wdi @@ -76344,9 +82686,9 @@ qtN qtN qtN vKO -ruU -ruU -ruU +yiM +yiM +yiM vXc wdy rMF @@ -76383,8 +82725,8 @@ dUW dUW jmG xAR -nax -nax +mPr +mPr bdL rQg pfD @@ -76393,7 +82735,7 @@ oLa hYL rQg vdp -nax +mPr qbG aPe nnG @@ -76433,18 +82775,18 @@ cpy cpy cpy tiQ -aQU -cuF +eVg +otQ +otQ cNV cNV cNV cNV -dxU qUQ jth kbV -dQg -dZA +kbV +ear tjg tjg tjg @@ -76452,19 +82794,17 @@ kbV tjg tjg gPq -dEk -fKt -fYP -gll +saC +saC +saC +saC tiQ -xVq -xVq -xVq +dli +dli +dli tiQ tiQ tiQ -qTE -qTE saC saC saC @@ -76472,48 +82812,50 @@ saC saC xZw xZw +saC xZw xZw xZw xZw xZw -xrA -saC -ncA -saC -saC -xZw -fTS -kQK -fTS xZw +uHn xZw -rEV +kfF saC saC saC saC saC saC +mqc saC saC saC +gYK +say +khm +cwr +mLI +pLP +pGe +voX xED -uKD -vju -vju -jbn -jbn +pVH +lDk +har jbn -kIY -vju -vju -mwv -tvO -ugV -ugV -ugV -xRK +awI +kXY +lbo +lbo +tVa +emH +emH +emH +emH +emH +emH ahP beB sLU @@ -76571,9 +82913,9 @@ xkO xkO xkO weQ -ruU +yiM aOi -ruU +yiM vXc fXx jmG @@ -76610,8 +82952,8 @@ jwM nBP jmG xAR -nax -nax +mPr +mPr bdL rQg hYL @@ -76662,85 +83004,85 @@ cpy tiQ wvV xLm -cNV -enT -cNV +xLm +dOa +bDw enT dOa -jur +cuF jth -dEk -dEk +tjg +tjg ear -dFT +tjg tjg tjg kbV tjg tjg gPq -dEk -dEk -fYP -uFG +saC +saC +saC +saC tiQ -xmD +lAK hmV vIS -qTE -qTE -qTE -qTE saC saC saC saC saC saC -udR +saC +saC +saC +saC +saC iOl kmg xZw xZw xZw xZw -xrA -fTS -mCK -saC -xeG -xZw -fTS -kQK -fTS +uHn xZw xZw +pNv saC saC saC saC +pwB +kwg +kwg saC -saC -saC -saC -saC -saC +kwg +gha +aYd +vxD +kwg +kwg +kwg +gha +kXY xED -uKD -vju +pyc +kwg iZS jBr -jEa -jEa -kLk +mPs +oYu +kXY lbo -vju -mwv -tvO -ugV -ugV -ugV -crH +oUq +beB +dhQ +dhQ +dhQ +dhQ +beB beB beB sMY @@ -76800,7 +83142,7 @@ waD qJN vXc vHN -ruU +yiM vXc fXx jmG @@ -76837,8 +83179,8 @@ fhu brk jmG xAR -nax -nax +mPr +mPr bdL rQg hYL @@ -76889,35 +83231,35 @@ cpy tiQ aVo xLm -bDw xLm -bDw +aQU +xLm xLm dOa qUQ jth -dFT -dFT +tjg +tjg ear -dZA -dZA kbV +kbV +kbV +xiY +fKt +fKt +vzd +tQw +saC +saC +saC saC -tjg -tjg -gPq -dFT -dFT -gbQ -qUQ -qjG xmD hna yiu saC saC saC -qTE +saC saC tiQ tiQ @@ -76928,46 +83270,46 @@ saC iOG udR udR +nqE +nqE +udR +iKw +udR udR -iOl -xZw -xrA -fTS -mCK -gHF -xeG -xZw -fTS -kQK -fTS -xZw -xZw -saC -saC -saC -saC -saC -saC saC saC saC saC -xED -uKD -vju -iZS +sse +kwg +mOI +pcH +pcH +pcH +hSQ +pco +jBY +pcH +sGF +pcH +hSQ +nMX +lbt +hzw +pcH +pcH jEa kHd -jEa -jEa +kgR +kXY llJ -lIM +oUq +nrT mHZ -tvO -ugV -ugV -ugV -nIu +bJa +bJa +mHZ +ryT beB pVX sNm @@ -77027,7 +83369,7 @@ xkO cqs vXc vHN -ruU +yiM vXc fXx jmG @@ -77064,8 +83406,8 @@ ild dco jmG xAR -nax -nax +mPr +mPr bdL rQg dni @@ -77097,7 +83439,7 @@ dZw kwj kwj cxo -ppU +sQY nQu nQu jas @@ -77125,11 +83467,11 @@ qUQ jth tjg tjg +ear kbV kbV -kbV -saC -saC +xiY +xiY tjg tjg gPq @@ -77137,64 +83479,64 @@ tjg tjg hJB qUQ -qjG +eLV xmD hna yiu hLY saC saC -qTE +saC saC iDg -iDg +rXa tiQ tiQ tiQ saC kDU fTS -fTS -fTS -xeG -lWa -pRT -fTS -mCK -gHF -iOG -mXn -xZw -hkT -xZw -xZw -uAm -xZw -saC +cOJ saC saC +aCR +hkT +fTS +fTS saC saC saC +men +sse +kwg +jkJ +kwg +mmh +sQS +mPs +cim +mPs saC saC saC +fWD +iTX xED -uKD -vju -vju +pex +lDk +kXY kzd -jEa -jEa -jEa -llJ -lIM -mHZ -tvO -ugV -ugV -ugV -miz +pSK +kgR +kwg +anb +hnG +jSU +xDu +xDu +xDu +raI +jSU mji ijE nTx @@ -77254,7 +83596,7 @@ waD qJN vXc eLG -ruU +yiM vXc fXx jmG @@ -77291,8 +83633,8 @@ gwP psF jmG xAR -nax -nax +mPr +mPr bdL wIr wIr @@ -77301,7 +83643,7 @@ jmv wIr wIr glV -nax +mPr nax nax uvg @@ -77352,75 +83694,75 @@ qUQ jth tjg tjg -kbV -kbV -saC +xiY +xiY saC saC +xiY kbV kbV -gPq -tjg -tjg -hJB -qUQ -qjG -xmD +caN +hgM +hgM +idn +cSh +oVt +dNn hna yiu hLY saC -hxh +lmY iBI iQe pfj jjV -jjV +cuu jVC tiQ tiQ kEx kWH tiQ -qjG -xeG -xrA -fTS -fTS -mCK -gHF -fTS -xeG -xZw -uHn -xZw -xZw -xZw -xZw -xrA saC saC saC +uhx +pwX +pwX saC saC +tTv +men +sse +iZS +jkJ +wIx +jfH +men +iQb +tTv +bUN saC saC saC -xED -uKD -vju -iZS -jEa -jEa -jEa -jEa -llJ -lIM -mHZ -tvO -ugV -ugV -ugV +saC +saC +tTv +mVm +sBH +kXY +wGq +mBL +giV +pcH +jBY +fAt +ixs +lxN +lxN +lxN +fJg ryj qIy jWV @@ -77481,7 +83823,7 @@ xkO weQ vXc vXc -ruU +yiM vXc pUv rMF @@ -77518,8 +83860,8 @@ jtg liN jmG xAR -nax -nax +mPr +mPr bdL wIr wIr @@ -77528,7 +83870,7 @@ jmv wIr wIr vdp -nax +mPr nax nax nax @@ -77579,24 +83921,24 @@ jur jth fsC kbV -kbV +xiY saC saC saC -kbV -kbV +ffr +xiY kbV gPq fsC kbV hJB qUQ -qjG -hdQ +oLU +knt qjG yiu hLY -saC +qJE ujg iCk iQF @@ -77607,47 +83949,47 @@ xmD xmD tiQ kEA +mdZ tiQ -tiQ +saC +saC +saC +yaj qjG qjG -xrA -fTS -tiQ -tiQ -tiQ -fTS -xeG -xZw -uHn -oiW -xZw -xZw -xZw -xrA -fTS -tiQ -tiQ -tiQ saC saC +tTv +nHg +hzV +iZS +jkJ +xLi +men +men +tTv +tTv +tTv saC saC -xED -uKD -vju -iZS -jBr -jEa -jEa +saC +saC +tTv +tTv +mVm +hrl +kXY +oUE +ntQ +dNe kXY lzb -vju -mwv -tvO -ugV -ugV -ugV +oUq +nrT +mHZ +bJa +mHZ +azF ryT beB ijJ @@ -77707,8 +84049,8 @@ eOE eOE upZ vXc -ruU -ruU +yiM +yiM vXc vXc pUv @@ -77745,8 +84087,8 @@ kbF dUq jmG xAR -nax -nax +mPr +mPr bdL rQg pfD @@ -77755,8 +84097,8 @@ tkf pfD rQg vdp -nax -nax +mPr +mPr nax nax nax @@ -77802,28 +84144,28 @@ tDR cqP cEw dOa -qUQ +fxq jth tjg tjg -kbV -kbV +xiY saC saC saC -kbV -kbV +saC +xiY +xiY gPq tjg tjg hJB qUQ -qjG -xmD +oLU +knt qjG yiu hLY -xmD +qJE ujg iDg iRV @@ -77834,48 +84176,48 @@ jWr xmD xmD jVC -qjG -qjG -qjG -qjG -qjG -fTS -saC -saC -saC -fTS -xeG -xZw -kUF -uAm -uAm -xZw -xZw -xrA -fTS -uxf -cpn -saC +miH saC saC saC +qgx +yaj +qjG +qjG +qgx saC -xED -uKD -vju -vju -jbn -jbn -jbn -kIY -vju -vju -mwv -tvO -ugV -ugV -ugV -tPx +tTv +men +kUF +gWu +neI +xLi +men +tTv +tTv +oUq +oUq +oUq +saC +oUq +oUq +oUq +oUq +oUq +uzD +oeU +kXY +aYd +kXY +lbo +sLc +oUq +beB +dhQ +dhQ +dhQ +evN +beB beB beB beB @@ -77928,13 +84270,13 @@ uaH isA jzu vXc -ruU -ruU -ruU -ruU -ruU +yiM +yiM +yiM +yiM +yiM vXc -ruU +yiM vXc vXc vXc @@ -77972,8 +84314,8 @@ gug cho jmG xAR -nax -nax +mPr +hFX bdL rQg hYL @@ -77982,12 +84324,12 @@ tkf hYL rQg vdp +mPr +mPr nax nax nax -nax -nax -nax +mPr mPr mPr mPr @@ -78029,28 +84371,28 @@ spI crm cEx dOa -qUQ +fxq jth tjg tjg -kbV saC saC saC -kbV -kbV -kbV +saC +saC +saC +xiY gPq tjg tjg -fYP +hJB qUQ -qjG -qJE +eLV +knt hna yiu hLY -hdQ +vhr ujg iFB iSc @@ -78061,48 +84403,48 @@ jWB xYD kry jjV -qjG -qjG -qjG -qjG -qjG -mkZ -saC -saC -saC -saC -txs -xZw -uHn -xZw -xZw -xZw -oiW -xrA -tKb -uxf -ybd +miH saC saC saC +pwC +yaj +qjG +qjG saC saC -xED -uKD -uKD -vju -vju -vju -vju -vju -vju -uKD -mSc -tvO -ugV -ugV -fjr -xhd +tTv +tTv +cUA +nMX +pco +jzB +tTv +tTv +oUq +oUq +ucY +hGm +oUq +oUq +oUq +lEd +fHf +oUq +lag +lDk +kXY +aYd +nPV +qpy +oUq +oUq +hhD +hhD +hhD +hhD +xFg +gHD ahP yjp wrC @@ -78156,16 +84498,16 @@ isA jzu vXc vXc -ruU -ruU -ruU -ruU +yiM +yiM +yiM +yiM vXc vXc vXc vXc vXc -ruU +yiM fXx jmG oQN @@ -78199,8 +84541,8 @@ ild jmG jmG xAR -nax -nax +mPr +hFX bdL rQg hYL @@ -78209,12 +84551,12 @@ oLa hYL rQg vdp +mPr +mPr +mPr nax -nax -nax -nax -nax -nax +mPr +mPr mPr mPr mPr @@ -78256,29 +84598,29 @@ bYd cvP dOa dOa -qUQ -jth -kbV -kbV +fxq +gdJ +ear +ear saC saC saC -kbV -fsC -kbV -kbV -gPq -tjg +saC +saC +saC +saC +vzd +fKt fKt fYP -qUQ -qjG -qJE +fxq +saC +knt hna yiu hLY -xmD -hxh +qJE +lmY iFV iDg jey @@ -78289,43 +84631,43 @@ kmP xmD jVC kXa -qjG -qjG -qjG -saC -saC saC saC saC -saC -xZw -xZw -uHn -fTS -fTS -fTS -xZw -xrA -fTS -uxf -ybd -saC +pwC +yaj +qjG +qjG saC saC saC saC +afL +sfc +xSE +bCX +iQb +tTv +oUq +cCL +sGv +xgE +yaC +vIU +kZe +mkh iTI -iTI -uKD -uKD -uKD -uKD -uKD -uKD -uKD -uKD -mwv -uKD +oUq +oUq +nJO +bJy +dio +kkR +lbI +oUq +oUq +pGh +ugV ugV ugV fjr @@ -78381,7 +84723,7 @@ jfO gYX isA jzu -ruU +yiM vXc vXc umf @@ -78390,9 +84732,9 @@ vXc vXc vXc vXc -ruU -ruU -ruU +yiM +yiM +yiM fXx jmG qxm @@ -78426,8 +84768,8 @@ gug jmG tOo lyD -nax -nax +hFX +hFX bdL rQg pfD @@ -78436,12 +84778,12 @@ dgY hYL rQg vdp -nax -nax -nax -nax -nax -nax +mPr +mPr +mPr +mPr +mPr +mPr mPr mPr tEu @@ -78483,75 +84825,75 @@ dOa dOa dOa dZs -jur +fLi jth tjg tjg -kbV saC saC -kbV -kbV -kbV -kbV +saC +saC +saC +saC +saC frL -fxq -fxq -gdJ -qUQ -qTE -qJE +tjg +tjg +hJB +sxU +saC +knt hna yiu saC saC -hxh -hxh +lmY +lmY ujg ujg ujg -hxh -hxh +lmY +lmY kne mqu -hxh +lmY saC +saC +saC +pwC qjG +yaj qjG -qjG -qjG +pwC saC saC saC saC -iOG -iOl -xZw hXt -tso -tso -tso -iQb -xrA -fTS -uxf -ybd -saC -saC -saC -saC saC -saC -iTI -xED -xED -xED -xED -xED -xED -xED -lER -mlp +jkJ +mIq +iQb +tTv +oUq +vVx +fHH +kXY +xZE +kXY +xZE +kXY +gTc +fzK +oUq +oUq +oUq +nBo +oUq +oUq +oUq +oUq +rxI fjr ugV ugV @@ -78565,7 +84907,7 @@ tFk uhF jyx wrC -iPZ +aNn mYo wcO sgT @@ -78608,8 +84950,8 @@ jfO gYX isA jzu -ruU -ruU +yiM +yiM vXc vXc vXc @@ -78652,8 +84994,8 @@ vBd vBd jmG xAR -nax -nax +mPr +hFX tEu bYV wIr @@ -78664,10 +85006,10 @@ wIr wIr rZK gGM -nax -nax -nax -nax +mPr +mPr +mPr +mPr mPr mPr mPr @@ -78708,81 +85050,81 @@ dOa dOa dOa cwq -xLm +dQg dZs -qUQ +fxq ddN tjg tjg -kbV -kbV saC saC -kbV -kbV -kbV +saC +saC +saC +saC +saC gPq tjg tjg -fYP -gnd -qTE -xmD +hJB +saC +saC +knt hna yiu -yiu +saC +saC +saC saC xmD xmD xmD -xmD -xmD -xmD +atz xmD knt xmD saC saC -qjG +saC lrQ qjG qjG yaj +qjG +qgx saC saC saC -saC -xeG -rEV -xZw -nvd -fTS -fTS -uHn -xrA -fTS -uxf -ybd -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -ien +bUN +sse +kwg +jkJ +xLi +iQb +tTv +oUq +oUq +suS +kXY +wwG +hCH +hCH +mzX +har +qvb +oUq +bYZ +kVO +caE +xQq +oUq +oUq +oUq rxI fjr fjr ugV -ugV +fjr jDO crH wrC @@ -78836,11 +85178,11 @@ uWz lVp jzu vXc -ruU -ruU -ruU -ruU -ruU +yiM +yiM +yiM +yiM +yiM vXc wdy rMF @@ -78879,7 +85221,7 @@ ild meb jmG xAR -nax +mPr tEu tOo wIr @@ -78892,8 +85234,8 @@ wIr wIr dGD mcO -nax -nax +mPr +mPr mPr mPr mPr @@ -78935,30 +85277,30 @@ bgg bIr tDR tDR -cDo +eVi dZs qUQ jth tjg tjg -kbV -kbV -kbV -kbV -kbV -kbV +saC +saC +saC +saC +saC +saC kbV gPq kbV kbV -fYP -qUQ -qjG -xmD +hJB +saC +saC +knt hna -yiu -yiu -vIS +wea +jef +uTy vIS vIS vIS @@ -78967,48 +85309,48 @@ vIS gnA gwK knS -yiu +vIS saC saC ljQ pfj -xmD -jVC -yaj +qjG +qjG yaj +qjG +pwC saC saC saC -xeG -xZw -xZw -xZw -xZw -tZs +bUN +utH +kwg +jkJ +xLi nMw -xrA -fTS -uxf -ybd -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -ien -ien -ien +tTv +oUq +hEJ +kgR +aVj +hCH +hCH +tpV +kXY +har +ecK +oUq +xQq +kVO +qfo +nMB +oUq +oUq +oUq +oUq +fjr fjr fjr -ugV fjr jDO crH @@ -79162,30 +85504,30 @@ bgg bIr tDR tDR -cDo +eVi cKw qUQ jth tjg dQm kbV -kbV -kbV -kbV -kbV -kbV +saC +saC +saC +saC +saC fsC gPq kbV kbV -hJB -qUQ -qjG -xmD +saC +saC +saC +knt hna yiu yiu -yiu +xwZ wea yiu mrc @@ -79199,39 +85541,39 @@ saC saC saC lwm -vIS -pfj -jjV -yaj -saC -saC -saC -saC -xZw -xZw -xZw -xZw -rEV -uHn -xrA -fTS -saC -ybd -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC +pwX +pwX +uhx +vlq +vlq saC saC saC -ien +iQb +sse +uZV +neI +xLi +men +tTv +oUq +xuQ +fHH +kXY +aVj +har +qts +nMX +nMX +gvk +sSv +raH +hPQ +sMA +oMo +oUq +oUq +oUq fjr fjr fjr @@ -79390,29 +85732,29 @@ tDR tDR tDR cEM -dZs +eXe jur jth kbV kbV kbV +fKt tjg tjg -tjg -tjg +saC eHR bVF frZ -hgM -hgM -gdX -cSh -pHT -hef +tjg +tjg +saC +saC +saC +gRJ ggH wXA wXA -wXA +xGX wXA wXA gck @@ -79425,40 +85767,40 @@ saC saC saC yiu -lAD -yiu -hLY -xmD -jVC -saC -saC -saC -saC -saC -udR -udR -udR -udR -iKw -wEz -saC -saC -ybd -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC +wea +qjG +qjG +yaj +qjG saC saC saC -ien +tTv +sqH +pwB +kXY +aYd +njn +nmt +tTv +oUq +oUq +acn +vpq +lDk +lDk +kuN +lbo +hrH +wFv +oUq +kVO +pGQ +lXY +fts +oUq +oUq +oUq fjr fjr fjr @@ -79623,7 +85965,7 @@ ddS bVF bVF bVF -hgM +wwi dcy hgM hgM @@ -79631,15 +85973,15 @@ eHS kbV kbV tjg -tjg -hJB -qUQ +saC +saC +saC tiQ -xmD +lAK hna yiu yiu -yiu +xwZ yiu yiu nqe @@ -79651,42 +85993,42 @@ saC saC saC yiu -yiu -pEm -xwZ -lwm +mrc +wXA +pHT +pHT mlE saC saC saC -saC -saC -saC -saC -fTS -fTS -fTS -lgf -tfW -tfW -saC -ybd -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -ien -ien -ien +tiQ +tTv +tTv +leG +leG +hhK +leG +tTv +tTv +tTv +oUq +oUq +oUq +oUq +akn +xGR +oUq +oUq +oUq +oUq +jwV +kVO +qHD +oUq +oUq +oUq +oUq +oUq fjr fjr rxI @@ -79844,13 +86186,13 @@ tDR tDR tDR cDo -dZs +eXe qUQ jth dGV roM roM -roM +ygu duN erZ roM @@ -79858,27 +86200,27 @@ roM roM roM roM -fLi -hJB -qUQ -tiQ saC saC +saC +tiQ +saC +hna yiu yiu -yiu -yiu +saC +saC yiu nqe yiu yiu -yiu -yiu saC -pEm -yiu +saC +saC +saC yiu yiu +nqe yiu yiu saC @@ -79887,32 +86229,32 @@ saC saC tiQ tiQ -saC -saC -saC -saC -saC -saC -saC -nNL -saC -saC -tiQ -tiQ -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -ien +hhQ +ehM +fdE +ayX +lAS +hef +hNf +vsZ +tiQ +tiQ +tiQ +bjd +fSj +qKO +dOt +rSs +oUq +oUq +oUq +oUq +cTU +oUq +oUq +oUq +oUq +oUq rxI fjr fjr @@ -80077,68 +86419,68 @@ del dHc qUQ qUQ -qUQ +jri dEL qUQ qUQ qUQ qUQ qUQ -qUQ -del saC saC -tiQ saC saC -saC -yiu -yiu -yiu -yiu -nqe -yiu -yiu -yiu -pEm -pEm -pEm -yiu -yiu -yiu -yiu -saC -saC -saC -saC -jjV -qJE -tiQ -tiQ tiQ saC saC saC saC saC -fTS -irx -tiQ -tiQ -saC -saC -saC -saC saC saC +wjy +xwZ +xwZ saC saC saC saC +yiu +yiu +nqe +yiu saC saC saC saC +jjV +qJE +tiQ +hhQ +gtX +qjG +vIS +upa +vuS +pfj +ncv +tfK +dXB +tiQ +bjd +eZF +lfj +lfj +yje +bjd +nTj +nTj +nTj +sPH +nTj +nTj +nTj +cpy ien rxI nri @@ -80304,12 +86646,12 @@ dfn dfn dfn jEu -oSX +nTl eWn -svW -svW oSX oSX +oSX +nTl jEu saC saC @@ -80321,50 +86663,50 @@ saC saC saC saC -yiu -yiu +saC +saC nqe yiu yiu yiu -pEm -pEm -pEm -xwZ +saC +saC +saC xwZ xwZ -yiu +mZN +pEm saC saC mxp +jWB +xmD +xQc +xQc +xQc +eoA +ehO +qjG +yiu +yiu jef -pfj -qJE -tiQ -irx -irx -irx -irx -irx -irx -irx vbm -irx -tiQ -tiQ -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC +viH +gjB +tiQ +bjd +pqQ +tdM +vFD +yje +bjd +nTj +qqN +vqe +bjC +vqe +isL +nTj ien ien ien @@ -80452,7 +86794,7 @@ wiE yhi vNi nNA -qic +mtM rqA gXc yhi @@ -80549,50 +86891,50 @@ saC saC saC saC -yiu +pEm nqe yiu yiu yiu -pEm -yiu -yiu +saC +saC +xzu yiu yiu -xzu +ljm saC saC saC -xzu -wea -hLY +cnA +hdQ +xmD +xQc qJE +xQc qJE -mXA -tKb -qVN -uhx -nEd -qET -nEd -xBL -irx -tiQ -tiQ -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC +qJE +qjG +yiu +qjG +qjG +nqe +hLY +oWS +tiQ +bjd +qEQ +lYK +hvh +pqQ +bjd +nTj +qqN +tbK +oan +wjP +isL +nTj +cpy ien rxI nLF @@ -80754,9 +87096,9 @@ xLm tiQ tiQ tiQ -dgb -dgb -dgb +hBg +hBg +hBg tiQ lXC lXC @@ -80776,49 +87118,49 @@ saC saC saC saC -yiu +pEm nqe yiu yiu yiu -yiu -yiu +saC xzu yiu yiu yiu +nqe xzu saC -pEm -xzu -yiu -jef -mLX +eBm +gWg +xmD +xQc +xQc qJE -irx -irx -irx -irx -irx -irx -irx -kfu -irx -tiQ -tiQ -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC +xQc +xQc +gAS +chT +mis +yiu +acD +nqe +hLY +dcM +tiQ +bjd +qEQ +lYK +hvh +pqQ +bjd +nTj +ipH +cbn +aLG +tLX +bjC +nTj ien ien ien @@ -80922,7 +87264,7 @@ ubJ ubJ jmG hMz -uwT +fWG jqr xzK wIr @@ -80979,19 +87321,19 @@ xLm cbB tiQ tiQ +aEL +aEL +aEL +aEL jcl +jVa jcl jcl -jcl -jcl -jcl -mjq -jcl ewp fIe fIe -eVi fIe +aWX fIe fMd ewt @@ -81002,50 +87344,50 @@ tiQ saC saC saC -saC -yiu +pEm +pEm nqe yiu yiu yiu +xwZ yiu -xzu mrc wXA wXA -wXA +mZU wXA hwG -xwZ -xzu -yiu -yiu -mMj +syg +jjV +xmD +cHu +jVC qJE qJE +cHu +cLH +gAS +aox +rKa +fpm +yld +hpI +xmD tiQ -tiQ -tiQ -tiQ -tiQ -tiQ -tiQ -tiQ -tiQ -tiQ -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC +bjd +qEQ +lYK +hvh +pqQ +bjd +nTj +icM +cbn +mNI +tLX +bjC +nTj ien ien ien @@ -81149,8 +87491,8 @@ ubJ ubJ jmG hMz -uwT -uwT +fWG +fWG jqr xzK wIr @@ -81205,19 +87547,19 @@ bsx tiQ tiQ tiQ -oUZ -jcl +aJT +aEL cTX iZI iZI iZI svW -efS +ept hRW ewm hRW gqg -fiA +npd svW swu fMx @@ -81230,55 +87572,55 @@ tiQ tiQ saC saC -saC +pEm mbq wXA wXA wXA -wXA +xGX wXA mAC yiu yiu yiu yiu -nqe -pEm -pEm -mxp -yiu -jef -jWr +cpZ +kda qJE -tiQ -tiQ -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC +xQc +xQc +xmD +mPY +qJE +xQc +xQc +fqU +ecU +tXp +xwZ +lrd +ihf +lyu +tiQ +bjd +eZF +lYK +hvh +eZF +bjd +nTj +ipH +vrE +aJr +tLX +bjC +nTj ien ien ien -saC +cpy ien -saC +cpy ien ien rME @@ -81376,9 +87718,9 @@ ild jwM six hMz -uwT -uwT -uwT +fWG +fWG +fWG jqr xxq xxq @@ -81393,7 +87735,7 @@ qUh uwT uwT uwT -uwT +fWG bqE pIx eso @@ -81431,23 +87773,23 @@ xLm tiQ tiQ cbY -jcl -jcl -iZI +aEL +aEL +aLJ dDS iZI iZI -iZI svW -fLP +svW +aCQ swu eRN swu swu -qZB +hwt svW -swu -swu +svW +eRN swu swu saC @@ -81458,55 +87800,55 @@ tiQ tiQ saC saC +pEm yiu yiu yiu +xwZ yiu yiu yiu yiu yiu yiu -yiu -yiu -nqe -yiu -pEm -pEm -yiu -yiu +wvB +xmD +qJE +xQc +xmD +xmD mPY qJE qJE +xQc +rjl +gyB +aox +yiu +wvB +csS +yai tiQ -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC +bjd +pqQ +lYK +hvh +eZF +bjd +nTj +qqN +gzw +spn +nCC +isL +nTj +cpy +cpy +cpy +cpy +cpy +cpy +cpy ien rMR jGa @@ -81603,9 +87945,9 @@ ild ild qfz hMz -uwT -uwT -uwT +fWG +fWG +fWG uwT uwT uwT @@ -81616,11 +87958,11 @@ uwT uwT uwT uwT -uje -uwT -uwT -uwT +dUY uwT +fWG +fWG +fWG bqE pIx eso @@ -81656,25 +87998,25 @@ cpy tiQ tiQ tiQ -jcl -jcl -iZI -iZI -iZI +aEL +aEL +aLJ +aLJ +aLJ dDS iZI fFw -iZI +fib jcl -fLP +aCQ dXd exB jcl swu -qZB +hwt jcl -swu -fMT +eHp +dHk gKD gpu tra @@ -81686,53 +88028,53 @@ saC saC saC saC +pEm +pEm yiu +xwZ yiu yiu yiu yiu yiu yiu -yiu -yiu -yiu -mbq -lXQ -yiu -xwZ -wea -yiu -jef +wvB +xmD +xQc +xQc +hdQ +iQe +vIS jWr qJE +xQc +xQc +enk +aox +yiu +wvB +pvz +xQc tiQ -tiQ -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC +bjd +pqQ +lYK +hvh +pqQ +bjd +nTj +qqN +bjC +gNN +bjC +isL +nTj +cpy +cpy +cpy +cpy +cpy +cpy ien ien ien @@ -81831,9 +88173,9 @@ jwM qfz xzK eZe -uwT -uwT -uwT +fWG +fWG +fWG uwT uwT uwT @@ -81843,11 +88185,11 @@ uwT uwT uwT uwT -uwT -uwT -uwT +fWG +fWG +fWG uje -uwT +fWG bqE jas jas @@ -81882,26 +88224,26 @@ cpy cpy tiQ tiQ -jcl -jcl -iZI -iZI -iZI +aEL +aEL +aLJ +aLJ +aLJ iZI dDS iZI iZI -iZI -jcl -fLP -evx -svW svW jcl -qZB +aCQ +evx +nTl +nTl jcl -swu hwt +jcl +svW +dYX hRy gqG gOo @@ -81914,53 +88256,53 @@ saC saC saC saC +pEm +saC saC yiu +kVa yiu yiu yiu -yiu -yiu -yiu -wea -yiu -nqe -xzu -pEm -dRy +uul +dZG +xmD +seF +qJE +lrQ dRy yiu mMj qJE qJE +seF +uPv +iSc +qjG +wvB +xmD +dmE tiQ -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC +bjd +eZF +lYK +hvh +pqQ +bjd +nTj +nTj +nTj +nTj +nTj +nTj +nTj +cpy +cpy +cpy +cpy +cpy +cpy +cpy ien tNQ qSH @@ -82059,8 +88401,8 @@ qEc jmG gkY eZe -uwT -uwT +fWG +fWG uwT uwT uwT @@ -82068,13 +88410,13 @@ tUL uwT uwT uwT -uwT -uwT -uwT -uwT -uwT -uwT -uwT +fWG +fWG +fWG +fWG +fWG +fWG +fWG jqr xzK jas @@ -82108,27 +88450,27 @@ cpy cpy cpy tiQ -jcl -jcl -iZI -iZI -bIQ -cce -iZI -dDS -bIQ -cce -iZI -jcl -fLP -emr -svW +aEL +aEL +aLJ +aLJ +aLJ +aLJ +fib +fXU +fib +fib svW jcl +aCQ +emr +nTl +nTl +dBe qZB -jcl -swu -hwt +jVa +svW +dYX jcl jcl gOG @@ -82143,51 +88485,51 @@ saC saC saC saC +vjl +vjl yiu yiu yiu yiu -yiu -yiu -yiu -yiu -nqe -xzu -pEm -pEm -pEm +hLY +knt +kOF +seF +qJE +iQe +baG yiu jef jWr qJE +seF +xuD +ezB +qjG +tOM +egK +gjB tiQ -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC +bjd +pqQ +lYK +hvh +qEQ +bjd +moe +moe +moe +moe +moe +moe +moe +cpy +cpy +cpy +cpy +cpy +cpy +cpy ien rNm jOw @@ -82287,7 +88629,7 @@ jmG jmG hkO eZe -uwT +fWG uwT uwT ixP @@ -82296,13 +88638,13 @@ uwT uwT cpy cpy -uwT -uwT -uwT -uwT -uwT -uwT -uwT +fWG +fWG +fWG +fWG +fWG +fWG +fWG bqE jas wTx @@ -82335,27 +88677,27 @@ cpy cpy tiQ tiQ -jcl +aEL +aLJ +aLJ +dFT +aLJ iZI iZI -fFw -bJE -ccu -ccu -wyA -fvQ +dDS iZI iZI -jcl -fLP -evx svW -svW -jcl -qZB +jVa +fLP +wSb +nTl +nTl jcl -swu hwt +jcl +svW +dYX hRy grz uNT @@ -82369,51 +88711,51 @@ saC saC saC saC -xzu -yiu -yiu -yiu +saC +vjl +vjl +vjl xzu xzu xzu -yiu -yiu -fxh -yiu -dRy +hLY +knt +xQc +xQc +srf dRy -pEm +yiu yiu wea nmX qJE +xQc +xQc +ayX +hna +nqe +feS +iDg tiQ -tiQ -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC +bjd +pqQ +lYK +hvh +qEQ +bjd +bjd +bjd +bjd +bjd +bjd +bjd +alI +alI +alI +cpy +cpy +cpy +cpy ien ien ien @@ -82514,22 +88856,22 @@ ngL jmG jmG dVD -uwT +fWG uwT uwT ixP tKe -uwT +fWG cpy cpy uje -uwT -uwT -uwT +fWG +fWG +fWG dWD -uwT -uwT -uwT +fWG +fWG +fWG xgW jas xqV @@ -82561,28 +88903,28 @@ cpy cpy tiQ tiQ -jcl -jcl +aEL +aEL +aLJ +aLJ +iZI +iZI iZI -bIQ -cce -eAF -cdj iZI cHj -dgq +azz azz eFP fIe egd ejN -ewt -jcl +fLA +fLA eVW -qZB +hwt jcl svW -hwt +rbW tiQ tiQ tiQ @@ -82597,51 +88939,51 @@ saC saC saC saC -jWJ -yiu -yiu -tiQ -tiQ -xzu -yiu -yiu -fxh -yiu -yiu -yiu -tiQ +vjl +vjl +vjl +vjl +vlq +xwZ +syg +iqz +xQc +qJE +qJE +aox +xwZ xwZ pEm -nno +syg qJE qJE +xQc +pwA +kaQ +nqe +hLY +xmD tiQ -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC +bjd +pqQ +lYK +hvh +eZF +bjd +okj +vJw +apd +apd +lfj +bjd +bjd +bjd +alI +cpy +cpy +cpy +cpy +cpy ien iqb kdx @@ -82741,22 +89083,22 @@ vBd nZn jmG fEY -uwT +fWG uwT uwT ixP -tKe -uwT -uwT -uwT -uwT -uwT -uwT -uwT +fBR +fWG +fWG +fWG +fWG +fWG +fWG +fWG hMN -uwT +fWG xbM -uwT +fWG xzK jas myC @@ -82787,29 +89129,29 @@ bMX cpy cpy tiQ -oUZ -jcl +aJT +aEL +aLJ +aLJ iZI iZI -bJE -ccu -ccu -ccu -ccu -wyA -fvQ +iZI +iZI +iZI +dDS +iZI iZI svW jcl -fLP +aCQ swu -eRN +ojn swu swu -qZB -jcl -svW hwt +aEL +svW +dYX hRy ifh gOo @@ -82825,50 +89167,50 @@ saC thU thU thU -kpm -ksv -ksv +saC +saC +dxc ntq -lcP -yiu -pEm +qjG +hLY +knt npb -xwZ -xwZ -pEm -tiQ +xmD +iQe +baG +yiu yiu yiu jef pfj -nwR -tiQ -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC +tRS +yhz +xmD +kaQ +nqe +qjG +hKK +tiQ +bjd +eZF +lYK +hvh +eTQ +qKO +woU +woU +woU +woU +xXv +lfj +bjd +bjd +alI +cpy +cpy +cpy +cpy +cpy ien isa svK @@ -82968,10 +89310,10 @@ ngL nlO jmG fEY +fWG uwT uwT -uwT -uwT +fWG wVo dqB con @@ -83014,29 +89356,29 @@ bMX cpy tiQ tiQ -jcl -iZI +aEL +aLJ +aLJ iZI iZI -dYX ccN cwO cwO cKQ cUg -dgI -dHj iZI +dHj +vNr jcl egt swu -eRN swu swu -qZB -jcl swu hwt +aEL +cWH +dYX jcl jcl gOG @@ -83053,48 +89395,48 @@ tiQ saC saC saC -yiu -yiu -lcP -lcP -yiu -yiu -nqe -yiu -yiu +saC +saC +vjl +qjG +hLY +knt +whK +xmD +hna yiu yiu yiu yiu noD jWB -nxQ -tiQ -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC +tRS +aiO +snP +vxq +dxJ +jWB +pAw +tiQ +bjd +yje +lYK +jZE +hNP +hNP +hNP +hNP +hNP +vFD +dfK +xXv +lfj +bjd +alI +cpy +cpy +cpy +cpy ien ien ien @@ -83198,7 +89540,7 @@ gIh uwT uwT uwT -uwT +fWG rCQ xzK jas @@ -83240,30 +89582,30 @@ bMX bMX cpy tiQ -jcl -jcl -iZI +acq +bJE +aLJ dFR azz -bKb +azz azz azz cFR cKS eJw -eAF -ikr iZI +iZI +fib jcl -fLP +aCQ swu -eRN swu swu -qZB -fsV swu hwt +jcl +mrL +dYX hRy oUC uNT @@ -83278,16 +89620,16 @@ iSF jeD tiQ saC -jYj -yiu -yiu -yiu -yiu -yiu -yiu +saC +saC +saC +qjG +qjG yiu +hLY +knt mad -yiu +xmD juw wea yiu @@ -83296,33 +89638,33 @@ yiu hLY saC saC -tiQ -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC +xQc +mMr +eJq +knt +xmD +jpm +tiQ +bjd +yje +abL +qsW +qsW +qsW +qsW +cgn +mqx +jZE +vFD +pqQ +qpd +bjd +alI +cpy +cpy +cpy +cpy +cpy ien iel iel @@ -83425,7 +89767,7 @@ ciA uwT uwT uwT -uwT +fWG jKa jas jas @@ -83467,30 +89809,30 @@ bMX bMX cpy tiQ -jcl -iZI +afn iZI +bNE dDS iZI -eRg -cdj +fFw +iZI cxu cGY hgy iZI iZI -ipB -fDC +iZI +aLJ jcl -fLP -ijO -gex -eAz +aCQ +bOv lXC -qZB -fsV -swu +eAz +lFk hwt +jcl +mrL +dYX tiQ tiQ tiQ @@ -83505,15 +89847,15 @@ iTn jfK tiQ jEq -jYv -kpo -yiu +saC +qjG +qjG yiu yiu yiu lDc lMN -nqe +whK mnw qjG yiu @@ -83525,31 +89867,31 @@ saC tiQ tiQ tiQ -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC +seF +kne +rCz +yhz +tiQ +bjd +eTQ +aLf +kbb +pMz +yaH +tyU +lYK +mqx +mqx +hvh +pqQ +qpd +bjd +alI +cpy +cpy +cpy +cpy +cpy ien iel iel @@ -83652,7 +89994,7 @@ uwT uwT uwT uwT -uwT +fWG jKa jas rWX @@ -83694,33 +90036,33 @@ bMX bMX cpy tiQ -jcl +aEL aqT azz aZD iZI -bLh -cdP iZI +iZI +clf cHj frH ciS iZI -dHk +iZI fFp -svW -fLP -swu -eRN -swu -swu -qZB -svW -swu -hwt -hRy -ifh -gPQ +nno +nTl +nTl +nTl +nTl +nTl +nTl +lXC +eHp +dYX +jcl +jcl +jcl aCQ lXC lXC @@ -83733,49 +90075,49 @@ tFZ tiQ lKl xmD -hna -yiu -yiu +rVB +mbs +mLX leH lmu lDr lNI -lNA +aqo ugN -qjG -yiu +pHT +lXQ yiu yiu yiu hLY +tRS +cRD +sRx +cRD xmD -ybd -nFt -ybd -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC +knt +xmD +skk +tiQ +bjd +bjd +bjd +wRf +bjd +hKI +hFA +lYK +mqx +mqx +hvh +pqQ +qpd +bjd +alI +cpy +cpy +cpy +cpy ien ien ien @@ -83879,7 +90221,7 @@ uwT uwT uwT uwT -uwT +fWG jKa gSn vpe @@ -83922,33 +90264,33 @@ bMX cpy tiQ jEu -jcl +aEL svW svW -bwU -bLk jcl -cyv +jcl +jcl +jcl aqT jcl eJZ dgO +aEL +nno +nno +nTl +nTl +nTl +nTl +nTl +nTl +lXC +eLx +dYX jcl -svW -svW -fLP jcl -evx -eBy jcl -qZB -svW -svW -hwt -jcl -jcl -gOG -heF +aCQ lXC lXC tiQ @@ -83956,54 +90298,54 @@ tiQ idq jcl jcl -oUZ +kkq tiQ jEu xmD -hna -yiu -kEL +xYD +fxh +ezB saC lmz -juw -yiu -fkL +liK +xmD +saC saC qjG -qjG +yaj yiu kEL yiu noV -xmD -ybd -nFt -ybd -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC +lyu +cRD +ayX +xVq +liK +gyC +pfj +pvz +tiQ +tiQ +bjd +rMD +eZF +bjd +bjd +bjd +lYK +mqx +mqx +hvh +pqQ +qpd +bjd +alI +cpy +cpy +cpy +cpy +cpy ien ssh tNQ @@ -84106,7 +90448,7 @@ cpy cpy uwT uwT -uwT +fWG taQ oVS kwj @@ -84149,32 +90491,32 @@ bMX cpy cpy efy -jcl +bKb aAb hRW -eMm -bMa -cfg +hRW +hRW +hRW hRW gqg hRW eMl -dhJ -hRW -dQv -ccg -egD -swu -eRN -swu -swu -dhJ -aJh -fzx -hwt -hRy -oUC -itp +iOx +cHL +nTl +nTl +nTl +nTl +nTl +nTl +nTl +nTl +nTl +nTl +dYX +jcl +jcl +jcl aCQ lXC lXC @@ -84184,53 +90526,53 @@ ier hRW kHX jcl -aqT +dAG tiQ jYE -hna -yiu +xYD +knt +lAD saC saC -lmY +seF +xQc saC saC -fkL -mnX myV -qjG +yaj qjG yiu yiu hLY +haG +xVq xmD -ybd -nFt -ybd -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC +xVq +xmD +jjl +hLY +vDw +rbZ +jMN +bjd +rMD +eZF +bjd +fSf +cZH +jDN +mqx +amy +hvh +eZF +lfj +bjd +alI +cpy +cpy +cpy +cpy +cpy ien tNQ qSH @@ -84377,30 +90719,30 @@ cpy cpy efy jcl -aCQ +bNT swu bxU -bNE -chm -czC -swu swu -eMz swu swu -lXC -eBy -swu -jcl -evx -jcl -oUZ swu -jcl -lXC -dhJ +cyv +eMz +cyv +gdX +nTl +nTl +nTl +nTl +nTl +nTl +nTl +nTl +nTl +nTl +dZd +hRW hRW -gvs hRW egD lXC @@ -84413,56 +90755,56 @@ iUT kHX evx xQc -xmD -hna -juw -saC +lAK +xYD +ljd saC saC +ncA lDN +pxN saC -fkL -saC -yiu +xQc +sdR +lNA +wXA +vhA +wXA +iyQ +qix +eKK +hef +eKK +hef +iFk +jef +pfj qjG -yiu -juw -yiu -hLY -xmD -ybd -nFt -ybd -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -ien -ien -ien -wPA -wPA -ien -ien +jMN +bjd +nRy +pqQ +bjd +fSf +cZH +mqx +mqx +mqx +hvh +pqQ +qpd +bjd +alI +cpy +cpy +cpy +wDj +wDj +wDj +vGB +vGB +wDj +wDj pZo vGp vGp @@ -84477,7 +90819,7 @@ dHF gLa dHF hAw -dHF +dgd qSH sPh uKy @@ -84603,93 +90945,93 @@ bMX cpy cpy efy -jcl -aCQ -swu -swu -bNT -cil -cAp -swu -ezW -cUh -dhW -oWq -dRf -fIe -oWq -fIe -ewY -eCP -jcl -swu -jcl -lXC +bLh +bQC lXC lXC -ijO lXC lXC lXC lXC +ezW +cUh +dhW +nno +nTl +nTl +nTl +nTl +nTl +nTl +nTl +nTl +nTl +nTl +efS +elx +enr +elx +elx +elx +elx hNj hXA -egD -cHy -jIQ -bXl -jln -jEQ -hef -ggH -wXA -kFo -kFo -kFo -kFo +fvQ +fDC +gwk +hgQ +exB +xQc +xmD +xmD +knt kFo +saC +nwR +oem maj -mqf -yiu -yiu -yiu +maj +seF +knt +hna yiu yiu -hLY +pEm +tlv +qJE +xVq xmD -ybd -nFt -ybd -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -ien +xVq +ayX +hna +yiu +oyK +ayX +vKP +bjd +osm +pqQ +bjd +fSf +cZH +cgn +mqx +mqx +hvh +pqQ +qpd +bjd +alI +cpy +cpy +wDj nJV elX hll hKu ksa kOz -ien +wDj lVZ vGp vGp @@ -84830,30 +91172,30 @@ bMX cpy cpy efy -jcl -aCQ -swu -swu -iRY +bLk +cce +lXC +lXC +ijO ciL -swu -cHy +lXC +crX eBi cUl dhX dIX -lXC -jcl -iRY -jcl -gex -eFk -jcl -swu nTl -lXC -lXC -lXC +nTl +nTl +nTl +nTl +nTl +nTl +nTl +nTl +nTl +nno +nno lXC lXC lXC @@ -84866,50 +91208,50 @@ cHy jIQ bXl jcl -jFt -xmD -hna -yiu -saC -saC +xQc +tMV +tMV +kne +xQc +mkb lnd -saC -saC -fkL +xYD +pAN +maj mql -lcP -yiu +knt +hna yiu yiu yiu -hLY +syg xmD -ybd -fdE -ybd -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -ien +xVq +xmD +xVq +uGj +hna +wea +hLY +dpz +jMN +bjd +lfj +pqQ +bjd +bjd +bjd +lYK +mqx +mqx +hvh +pqQ +qpd +bjd +alI +cpy +cpy +wDj aJS ezo eJR @@ -85016,10 +91358,10 @@ uwT uwT uwT jqr -cpy -cpy -cpy -cpy +xxq +xxq +xxq +xzK jas jas nZx @@ -85057,31 +91399,31 @@ bMX cpy cpy efy -jcl +bMa aCQ swu swu swu -swu +cil swu swu eBH cVc dip -swu -lXC -jcl -swu -emW -evx -jcl -jcl -swu -jcl -lXC -fMT -tra -gwk +gnd +nTl +nTl +nTl +nTl +nTl +nTl +nTl +nTl +nTl +nTl +gKM +jhS +jhS tra egY lXC @@ -85095,51 +91437,51 @@ tCX jcl xQc jjV +xmD +knt +xQc +mlp +nxQ +oKK +pDM +qTE +xQc +wyA hna yiu -saC -saC -saC -saC -saC -nqe -yiu -lcP -yiu -yiu yiu yiu -hLY +syg xmD -ybd -fdE -ybd -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -ien +cRD +uvt +xVq +uGj +gGg +wTq +jWB +lKl +lTi +bjd +lul +dfK +qKO +xLr +xXv +lYK +mqx +mqx +hvh +pqQ +qpd +bjd +alI +alI +alI +wDj rgW eJR -gok +kbH iHD ksk kQc @@ -85243,11 +91585,11 @@ uwT uwT uwT uwT -cpy -cpy -cpy -cpy -cpy +uwT +uwT +uwT +bqE +xzK jas gbh vpe @@ -85284,32 +91626,32 @@ bMX cpy cpy efy -jcl -aDS +bIQ +ccu +tra tra tra tra tra tra -cHL tra cVm -fMT +cAp tra -dRD -ebr -egY -swu -eRN -swu -swu -fkq -aPP -fzz -hwt -hRy -ifh -gPQ +nTl +nTl +nTl +nTl +nTl +nTl +nTl +nTl +nTl +nTl +vQn +aEL +aEL +jcl aCQ lXC lXC @@ -85319,58 +91661,58 @@ aDS tra tCX jcl -jcl +cYe tiQ -jjV +dXo +xYD +kpE +xQc +xQc +nEd +piW +pEp +xQc +xQc +knt hna -xzu -saC -saC -saC -saC -wea -nqe -yiu -yiu +qFW yiu -yiu -yiu -yiu -hLY -xmD -ybd -nFt -ybd -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC +noD +ihf +suG +cRD +lkl +xVq +hdQ +ayX +nqQ +hdQ +asH +tiQ +bjd +dXX +pWC +rMD +bjd +pqQ +lYK +mqx +mqx +hvh +eZF +bjd +bjd +bjd +bjd +bjd +mPj bel ftd -gok +lTd iJE kvM kYL -ien +wDj lYg qSH qSH @@ -85467,14 +91809,14 @@ ybj uwT uwT uwT -uwT -uwT -uwT -cpy -cpy -cpy -cpy -cpy +dqB +con +con +con +con +con +xzK +xzK jas jas gSn @@ -85511,93 +91853,93 @@ bMX cpy tiQ jEu -jcl +bIQ svW svW oUZ jcl jcl -bwU -cRT -jcl -eJZ -hwt jcl -svW -svW -afB jcl -evx jcl +eJZ +hwt jcl -qZB -svW -svW +lXC +lXC +nTl +nTl +nTl +nTl +nTl +nTl +nno +lXC hwt +jVa jcl jcl -gOG -hfE +fkW lXC lXC hOy tiQ +qyp jcl jcl -jcl -jcl +bCd tiQ jEu xmD -hna -xzu -xzu -saC -saC -juw -yiu -mbq -lXQ -yiu +xYD +kpE +xmD +xQc +xQc +seF +xQc +xQc +uQi +knt juw kEL yiu -yiu hLY -xmD -ybd -nFt -ybd -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC saC saC +tiQ +tiQ +tiQ +seF +tMV +rCz +seF +tiQ +tiQ +bjd +bjd +bjd +bjd +bjd +qEQ +abL +cgn +mqx +hvh +dfK +woU +woU +woU +xnX +gib +mPj btP -eJR +axN eJR iMQ -ien -ien -ien +wDj +wDj +wDj pRv xSv xSv @@ -85694,17 +92036,17 @@ uwT uwT uwT uwT -uwT -uwT -uwT -uwT -cpy -cpy -cpy -cpy -cpy -ofF -tkA +bqE +uzI +dDq +dDq +uzI +dDq +dDq +uzI +uzI +uzI +ybz tkA tkA tkA @@ -85737,7 +92079,7 @@ bMX bMX saC tiQ -jcl +bwU aqT azz azz @@ -85751,19 +92093,19 @@ dDS fFw iZI iZI -svW -fLP -swu -eRN -swu -swu -qZB -svW +lXC +nTl +nTl +nTl +nTl +nTl +nTl +lXC swu hwt -hRy -oUC -itp +jVa +jcl +jcl aCQ lXC lXC @@ -85776,53 +92118,53 @@ jhY tiQ jjV xmD -hna -yiu -wea -yiu -yiu -yiu -yiu -yiu -mbq -lXQ -wea -yiu -yiu -yiu -hLY -saC -ybd -nFt -ybd -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC +xYD +fxh +hdQ +tMV +whK +xmD +xmD +xmD +xmD +gyC +kpG saC saC saC saC -bUN +tiQ +tiQ +yai +ayX +ayX +xmD +xmD +kss +tiQ +tiQ +alI +alI +alI +alI +bjd +lwr +rSs +abL +cgn +jZE +hNP +hNP +hNP +efM +caV +pcV +xLr +lAa gjA rtX -ien -ien +wDj +wDj vGp vGp pZo @@ -85918,20 +92260,20 @@ fWG uwT uwT pLu -gVA -aep -aep -gVA -aep -aep -gVA -gVA -gVA -cpy -cpy -cpy -wQa -wQa +uwT +uwT +uwT +bqE +yar +fOX +fOX +rOb +rOb +rOb +xaN +vDo +tos +dhH wQa wQa wQa @@ -85965,26 +92307,26 @@ bMX saC saC saC +aLJ iZI iZI iZI iZI -gat dDS fFw -cIm -hgQ +iZI +iZI dDS iZI -gat +iZI iZI jcl -fLP -lXC -gex -lXC -lXC -qZB +aCQ +pQR +nno +nno +jPz +hwt jcl iRY hwt @@ -86003,52 +92345,52 @@ jic tiQ jjV iQe -kpE -yiu -yiu -yiu -yiu -yiu -yiu -yiu -yiu -nqe -yiu -yiu +vIS +kBm +pEs +qET +aqo +pEs +rmV +gwK +gwK +xFt yiu yiu -hLY -saC -tiQ -tiQ -tiQ -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC saC saC saC +tiQ +kgm +gIZ +iQe +vIS +vIS +pfj +vAX +kJc +tiQ saC saC saC -bUN +alI +bjd +gzY +ama +kbb +abL +qsW +qsW +qsW +qsW +xsE +eZF +tyb +lao +iJE gok -hHj -wPA +rtX +vGB mTa oqn pdv @@ -86056,7 +92398,7 @@ umR qSH qSH qSH -qSH +vGp vGp ecq qSH @@ -86145,20 +92487,20 @@ oTD ycM miZ tXW -aep -yar -yar -yar -yar -yar +uwT +uwT +uwT +bqE yar -aep -wQa -wQa -wQa -wQa -wQa -wQa +fOX +gVA +gVA +xPH +gVA +xaN +vDo +tos +dhH wQa wQa wQa @@ -86191,27 +92533,27 @@ bMX bMX saC saC -jcl -jcl +aGI +bdv +aLJ +aLJ iZI iZI +dDS iZI -bJE -clf -ccu cIr -cLb +iZI eOe -fop -fvQ +iZI +iZI fFw jcl -fLP -swu -eRN -swu +aCQ swu -qZB +mrL +mrL +mrL +hwt jcl swu hwt @@ -86231,59 +92573,59 @@ tiQ xmD hna yiu -yiu -yiu -tiQ -yiu -yiu -kEL +hLY +xmD +tMV +whK +xmD +ajY yiu yiu nqe yiu -tiQ -saC yiu -hLY +yiu saC saC tiQ +dck +hmV +qCE +xSL +txo +jef +pfj +tfK +tiQ saC saC saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -ien -cGd -rtI -hKu -wPA +alI +bjd +bjd +lfj +eTQ +woU +aLf +ubF +ubF +woU +woU +otx +qYy +mPj +rtX +iJE +rtX +vGB ncz otC pgp umR qSH qSH -qSH -qSH +vGp +vGp kqp ecq vTx @@ -86372,20 +92714,20 @@ xbk mRx psQ fWG -aep -cwL -dsa -dsa -bnd -uXa -yar -aep -wQa -eXG -cex -cex -wQa -wQa +uwT +uwT +uwT +bqE +mam +fOX +gVA +gVA +acp +gVA +xaN +vDo +tos +dhH wQa wQa wQa @@ -86419,28 +92761,28 @@ bMX saC saC saC -jcl -iZI -iZI -iZI -dZd +aGI +aLJ +aLJ +aLJ +aLJ dDS iZI iZI iZI dDS fpn -cNB iZI +oim jcl -fLP +aCQ swu -eRN swu -iRY +mrL +lFd qZB -jcl -swu +jVa +pgJ hwt jcl jcl @@ -86458,58 +92800,58 @@ tiQ vjl hna yiu -yiu +hLY +xCS tiQ tiQ +lAK +xNt yiu yiu -wea +nqe yiu yiu -nqe yiu +hLY +xmD +idX +mFg +tqh +iQe +csy +wWc +pfj +syV +kJc tiQ saC saC -jef -saC -saC -tiQ -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -ien +alI +alI +bjd +bjd +bjd +bjd +bjd +bjd +bjd +bjd +bjd +bjd +bjd +mPj rhh rtX xjU -ien +wDj nff oxT pgG umR qSH -qSH -qSH +vGp +vGp kqp xFp tDS @@ -86599,20 +92941,20 @@ qTI fss noT fWG -aep -mWd -rZL -rZL -oiK -xJB -gVA -gVA +uwT +uwT +uwT +bqE +uzI +rOb gVA -eXG -eXG -eXG -wQa -wQa +qpE +acp +xPH +xaN +vDo +tos +dhH wQa wQa wQa @@ -86647,10 +92989,10 @@ saC saC saC saC -jcl -iZI -iZI -bQC +aGI +aLJ +aLJ +dFT cmB azz azz @@ -86660,12 +93002,12 @@ iZI dJs svW jcl -fLP +aCQ swu -eRN swu swu -qZB +swu +hwt jcl svW hwt @@ -86684,66 +93026,66 @@ saC saC saC saC -bkQ -saC -saC +yiu saC saC -yiu -yiu +tiQ +tiQ +xmD +hna yiu mrc mAC yiu yiu -saC -saC -saC -saC -saC +kVa +hLY +hdQ +yjg +xmD +hna +wAE +lmY +lmY +sfM +hLY +xmD tiQ saC saC saC saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -ien -ien -ien +alI +alI +alI +alI +alI +alI +alI +wDj +wDj +wDj +wDj +wDj +wDj +vGB wPA -ien -ien +vGB +wDj qSH qSH qSH umR -qSH -qSH -qSH +vGp +vGp +vGp uRb tDS tDS vzg vUx nmB -nmB +nrL nmB ddP vwQ @@ -86826,20 +93168,20 @@ uwT uwT fWG fWG -gVA -hcv -swD -swD -pur -dDq -vWc +uwT +uwT +uwT +bqE +uzI +rOb +xPH acp -lSF -eXG -eXG -vDo +xPH +xPH +wZz vDo -wQa +tos +dhH wQa wQa wQa @@ -86876,23 +93218,23 @@ saC saC saC saC +cdj +aLJ +aLJ +aLJ iZI iZI -iZI -iZI -iZI -gat dDS fFw iZI svW jcl -fLP -dXd -exB +aCQ +swu +jcl jcl swu -qZB +hwt jcl svW bye @@ -86914,20 +93256,27 @@ saC saC saC saC +tiQ +tiQ saC -saC -saC -wTq +rVB mbs msb wTq wTq wTq wTq -saC -saC -saC -saC +jWB +xmD +tMV +xmD +hna +wAE +lmY +lmY +sfM +hLY +ayX tiQ saC saC @@ -86939,31 +93288,24 @@ saC saC saC saC +wDj +wDj saC saC saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -ien -qSH -qSH -qSH -qSH +wDj +eOT +sOL +sOL +sOL +wDj qSH qSH qSH umR -qSH -qSH -qSH +vGp +vGp +vGp uRb hDZ nuQ @@ -87053,20 +93395,20 @@ uwT uwT fWG fWG +uwT +uwT +uwT +bqE +yar +fOX gVA -cwL -dsa -dsa -bnd -uXa -vWc -acp -lSF -eXG -cex +gVA +gVA +gVA +wZz vDo -wQa -wQa +tos +dhH wQa wQa cex @@ -87104,28 +93446,28 @@ saC saC saC saC -iZI -iZI -iZI -iZI -dZd -cHj -azz -azz -azz +aLJ +aLJ +aLJ +aLJ +fib +gbQ +jYj +jYj +eFP fIe egd -enr -svW -svW +ewt +nTl +nTl jcl -qZB +hwt jcl -swu +svW hwt hRy ifh -gOo +eMm aCQ lXC lXC @@ -87141,20 +93483,27 @@ saC saC saC saC -saC -saC +tiQ +tiQ xmD xmD knt xmD xmD xmD +lkl xmD xmD -saC -saC -saC -tiQ +xmD +idX +iDg +tqh +gGg +xME +hYg +jWB +eIT +kJc tiQ saC saC @@ -87166,31 +93515,24 @@ saC saC saC saC +wDj saC saC saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -ien -qSH -qSH -qSH -qSH +arN +vGB +sOL +eJR +eJR +fQD +vGB qSH qSH qSH umR -qSH -qSH -qSH +vGp +vGp +vGp uRb fRk peS @@ -87273,27 +93615,27 @@ cpy uwT uwT uwT -uwT -uwT +fWG +fWG uwT uwT cpy fWG uwT -aep -mWd -rZL -rZL -oiK -xJB +uwT +uwT +uwT +bqE +yar +fOX gVA gVA gVA -wQa -wQa -wQa -wQa -wQa +qpE +wZz +vDo +tos +dhH cex cex eXG @@ -87332,28 +93674,28 @@ saC saC saC saC +aLJ +aLJ +aLJ iZI -iZI -iZI -cNB dDS iZI -gat iZI -jcl -fLP -evx -svW svW -jcl +jVa +fLP +iOt +nTl +nTl +dBe qZB -jcl -swu +jVa +svW hwt jcl jcl -saC -saC +eRg +fmB saC saC saC @@ -87380,6 +93722,16 @@ tiQ tiQ tiQ tiQ +tiQ +snP +sDf +kpo +wQs +llG +noD +lMF +iDg +tiQ saC saC saC @@ -87390,34 +93742,24 @@ saC saC saC saC +wDj saC saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -ien -ien -ien -qSH -qSH +iJE +hZg +vGB +sOL +rlB +azE +qYp +vGB qSH -cpy qSH qSH umR -qSH -qSH -qSH +vGp +vGp +vGp uRb tDS pKo @@ -87499,28 +93841,28 @@ cpy uwT uwT uwT +fWG +fWG +fWG +fWG uwT +cpy +uIe uwT uwT uwT uwT -cpy -uIe -uwT -aep -hcv -swD -swD -pur -dDq -yar -aep -eXG -wQa -wQa -wQa -cex -cex +bqE +mam +fOX +fOX +rOb +rOb +fOX +wZz +vDo +tos +dhH eXG eXG eXG @@ -87558,28 +93900,28 @@ saC saC saC saC -jcl -iZI -iZI -iZI +cfg +aLJ +aLJ +aLJ iZI dDS iZI -dZd iZI +svW jcl -fLP +aCQ evx -svW -svW +nTl +nTl jcl -qZB +hwt jcl -swu +svW hwt hRy gqG -tiQ +eZq saC saC saC @@ -87603,11 +93945,20 @@ mbM xUx xUx pNo -cPx +uKD mQd -mZU +nbj saC tiQ +mzP +gIZ +gGg +wTq +wTq +jWB +teE +mpQ +tiQ saC saC saC @@ -87618,33 +93969,24 @@ saC saC saC saC +wDj saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -ien -qSH +hhJ +sOL +sOL +vGB +sOL +rlB +eJR +loS +vGB qSH qSH qSH -cpy -cpy -cpy umR -qSH -qSH -qSH +vGp +vGp +vGp uRb tDS sWB @@ -87727,27 +94069,27 @@ uwT uwT uwT uwT +fWG +fWG +fWG uwT +cpy uwT uwT uwT -cpy uwT uwT -aep -yar -yar -yar -yar -yar -yar -aep -eXG -wQa -wQa -eXG -eXG -eXG +bqE +uzI +hcv +hcv +uzI +hcv +hcv +uzI +uzI +uzI +dhH eXG eXG eXG @@ -87786,23 +94128,23 @@ saC saC saC oUZ -jcl -iZI -iZI +aEL +aLJ +aLJ iZI dDS iZI -cNB iZI +fib jcl -fLP +aCQ equ ewt jcl dXd fbC fIe -oWq +ame fDn fDH fFE @@ -87826,16 +94168,22 @@ vrV xUx lFt xUx -mcE -xUx +mdD +woG xUx pNo -cPx -mQw -sZq +xUx +mQd +nbj sZq -saC -saC +tiQ +tiQ +jEF +ayX +ayX +ayX +dpz +cXi tiQ tiQ saC @@ -87848,30 +94196,24 @@ saC saC saC saC +wDj saC saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -saC -ien -qSH +ygD +jJI +uaY +xNG +eJR +eJR +xJg +wDj +aij qSH qSH -cpy -cpy -cpy -cpy umR qSH -qSH -qSH +vGp +vGp uRb hDZ vav @@ -87955,26 +94297,26 @@ uwT tXW uwT uwT +fWG uwT uwT uwT uwT uwT uwT -gVA -aep -aep -gVA -aep -aep -gVA -gVA -gVA -wQa -eXG -eXG -eXG -eXG +uwT +uwT +bqE +cwL +ybz +ybz +cwL +ybz +ybz +ybz +cwL +ybz +dhH wPN eXG eXG @@ -88013,23 +94355,23 @@ saC saC saC saC -jcl -jcl -jcl -iZI +aEL +aEL +aEL +aLJ dDS iZI iZI -iZI svW -fLP +svW +aCQ swu exZ oWq eKj -qZB +hwt +svW svW -swu swu swu eRN @@ -88057,13 +94399,16 @@ mdD woG xWz pNo -cPx -mQw -sZq +xUx +mQd +nbj sZq sZq -saC -saC +tiQ +cPx +cPx +cPx +tiQ tiQ tiQ tiQ @@ -88076,29 +94421,26 @@ saC saC saC saC +sYl saC saC +utq saC qSH qSH +jnE +sOL +rlB +eJR +rtX +lUy +nTp qSH -cYn -saC -saC -saC -ien -ien -ien -qSH -qSH -qSH -qSH -cpy qSH umR qSH -qSH -qSH +vGp +vGp uRb svf ydV @@ -88188,20 +94530,20 @@ uwT uwT uwT uwT -kfv -uwT -uwT -aep uwT uwT uwT +bqE ybz -eXG -eXG -eXG -eXG -eXG -eXG +ybz +ybz +ybz +ybz +ybz +ybz +ybz +ybz +dhH uja uja uja @@ -88213,7 +94555,7 @@ wQa wQa wQa wQa -wQa +eLf jas pVy vpe @@ -88221,8 +94563,8 @@ eso wNX xlV jas -cpy -cpy +dhH +eXG cpy cpy cpy @@ -88242,19 +94584,19 @@ saC saC saC tiQ -jcl -jcl +aEL +aEL cTX iZI iZI iZI svW -eLV +njF tra tra tra eNT -fkW +msf svW swu swu @@ -88276,23 +94618,23 @@ jZS jZS jGm mPz -vrV -saC +tiQ +xUx lFt xUx mdD woG xUx pNo -saC -mQw +xUx +mQd +nbj +sZq sZq sZq sZq sZq sZq -saC -saC tiQ tiQ saC @@ -88307,32 +94649,32 @@ saC saC cYn qSH +shD +cCH qSH qSH -qSH -qSH -qSH +bha cYn -ecq -qSH -ecq -qSH -qSH -qSH qSH +eJR +rlB +iJE +rtX +ygD +nTp qSH qSH umR qSH qSH -qSH +vGp uRb tDS tDS ddC btb tAh -tAh +pJh jLf tAh oew @@ -88418,17 +94760,17 @@ uwT uwT uwT uwT -uwT -uwT -uwT -uwT -eXG -eXG -eXG -eXG -eXG -eXG -eXG +bqE +ybz +ybz +ybz +ybz +ybz +ybz +ybz +ybz +ybz +dhH eXG eXG eXG @@ -88440,7 +94782,7 @@ wQa wQa wQa wQa -wQa +eLf jas jas ozw @@ -88448,8 +94790,8 @@ eso ozw jas jas -cpy -cpy +dhH +eXG cpy cpy cpy @@ -88471,18 +94813,18 @@ saC tiQ tiQ cOZ -jcl +aEL oUZ jcl jcl +jVa jcl -mjq jcl jcl jcl evx -fib jcl +jVa jcl jcl jcl @@ -88503,17 +94845,17 @@ jHb jHb jIR kKh -vrV -saC +tiQ +fdC lFt xUx -mdD -woG +mcE xUx -saC -saC -mQw -sZq +xUx +pNo +fdC +mQd +nbj sZq sZq sZq @@ -88536,17 +94878,17 @@ qSH qSH qSH qSH -qSH -qSH -qSH -qSH -ecq -qSH -ecq -qSH -qSH -qSH -qSH +rtX +eJR +eJR +eJR +eJR +eJR +hcE +sjQ +wJk +wDj +bcl qSH qSH umR @@ -88645,17 +94987,17 @@ uwT uwT uwT uwT -uwT -uwT -uwT -uwT -eXG -eXG -eXG -eXG -wQa -wQa -wQa +bqE +cwL +ybz +ybz +cwL +ybz +ybz +ybz +cwL +ybz +dhH eXG eXG eXG @@ -88667,17 +95009,17 @@ wQa wQa fdh wQa -wQa -eXG +tGw +ybz jas jas ogT jas jas -cpy -cpy -cpy -cpy +ybz +fdf +eXG +eXG cpy cpy cpy @@ -88730,17 +95072,17 @@ jHb jHb jHb kKh -vrV -saC -saC -xUx -mcE -xUx -xUx -saC -saC -mQw -sZq +tiQ +mua +mua +pEv +qVN +pEv +pEv +mua +mua +mua +nbj sZq sZq mZW @@ -88764,15 +95106,15 @@ qSH qSH qSH qSH +eJR qSH qSH -qSH -ecq -qSH -ecq -qSH -qSH -qSH +eJR +iJE +eJR +azE +wJk +wDj qSH qSH qSH @@ -88872,17 +95214,17 @@ uwT uwT uwT uwT -uwT -uwT -uwT -uwT -eXG -eXG -eXG -wQa -cex -wQa -wQa +bqE +uzI +hcv +hcv +uzI +hcv +hcv +uzI +uzI +uzI +dhH wQa eXG eXG @@ -88895,16 +95237,16 @@ fII wQa wQa eXG +tGw +tkA +tkA +tkA +tkA +tkA +fdf eXG eXG eXG -eXG -cpy -cpy -cpy -cpy -cpy -cpy cpy cpy cpy @@ -88924,7 +95266,7 @@ saC saC saC saC -saC +tiQ tiQ tiQ tiQ @@ -88957,17 +95299,17 @@ jIR jHb jHb kKh -vrV +tiQ saC -lFt +plb xWz mcE xUx xUx -saC +pNo cPx -mQw -mZW +ljA +woR sZq sZq mZW @@ -88988,22 +95330,22 @@ qSH qSH qSH qSH +sYl +tOt +iaM +sYl +cCH +yeH +bha +eJR +eJR +eJR +mnx +wDj qSH qSH qSH qSH -qSH -qSH -ecq -qSH -ecq -qSH -qSH -qSH -cpy -qSH -qSH -qSH umR qSH qSH @@ -89099,17 +95441,17 @@ uwT uwT uwT uwT -uwT -uwT -uwT -uwT -wQa -wQa -wQa -wQa -cex -wQa -wQa +bqE +yar +iBl +mDT +swD +fOX +fOX +xaN +vDo +tos +dhH eXG eXG eXG @@ -89129,8 +95471,8 @@ eXG eXG eXG eXG -cpy -cpy +eXG +eXG cpy cpy cpy @@ -89151,18 +95493,18 @@ saC saC saC saC -saC -saC -dkL +tiQ +uMP +epS uMP uMP jEu +nTl oSX oSX -svW -svW -eWn oSX +eWn +nTl tiQ fBP fNm @@ -89184,7 +95526,7 @@ jHb jHb jHb kKh -vrV +tiQ saC lFt xUx @@ -89192,10 +95534,10 @@ mcE xUx xUx pNo -cPx +bVX mQw -mZW -mZW +sZq +sZq sZq sZq sZq @@ -89214,26 +95556,26 @@ qSH qSH qSH qSH -cYn -saC -saC -qSH -qSH +fdS qSH -qSH -ien -ien -ien -vTx -vTx -cpy cpy -cpy -vTx -vTx -qJU -vTx -vTx +tOt +qSH +cYn +xei +hrw +iWg +sOL +sOL +sOL +wDj +ltB +ltB +ltB +ltB +bBW +ltB +ltB nQa qSH qSH @@ -89320,23 +95662,23 @@ uwT uwT uwT uwT -uwT +fWG tXW tXW -kfv -uwT uwT -aep uwT uwT -uwT -ybz -eXG -wQa -wQa -wQa -wQa -eXG +bqE +yar +iBl +mKu +gVA +xPH +gVA +xaN +vDo +tos +dhH eXG eXG eXG @@ -89357,7 +95699,7 @@ eXG eXG eXG eXG -cpy +eXG cpy cpy cpy @@ -89378,18 +95720,18 @@ saC saC saC saC -saC -saC +cpn +uMP ahH -kca -kca -cIV +dJN uMP uMP +epS uMP uMP -eWy uMP +eWy +epS tiQ fCE fOM @@ -89411,7 +95753,7 @@ jHb jHb jHb kKh -vrV +tiQ saC lFt xUx @@ -89422,7 +95764,7 @@ pNo cPx mSl mZX -mZW +sZq sZq sZq nGc @@ -89441,27 +95783,27 @@ qSH qSH qSH qSH -saC -saC -saC -saC -qSH -cYn -saC -saC -ien +cpy +cpy +cpy +cpy +cpy dRL dRL dRL dRL +rJf +vCv +rJf dRL dRL dRL -qhA +rJf +rJf qiG +rJf dRL -dRL -xFp +guE nQa qSH qSH @@ -89547,23 +95889,23 @@ uwT uwT uwT uwT +fWG +fWG uwT uwT uwT +uwT +bqE +mam +kfv +mKu gVA -vcR -vcR -gVA -vcR -vcR -gVA -gVA +xPH gVA -wQa -wQa -wQa -eXG -eXG +xaN +vDo +tos +dhH eXG eXG eXG @@ -89605,18 +95947,18 @@ saC saC saC saC -saC -saC -ahH -uMP +cpn uMP -cIW +dkL +cIm +cWL +cWL ana dSt dSt dSt eWK -fla +fuf tiQ fCN fPV @@ -89638,7 +95980,7 @@ jHb jHb jIR kKh -vrV +tiQ saC lFt iWy @@ -89669,18 +96011,18 @@ qSH qSH qSH qSH -saC -saC -saC -saC -saC -saC -saC +cpy +cpy +cpy dRL dRL -jjq +jNQ dRL dRL +yfP +yfP +niT +dRL dRL dRL sZs @@ -89689,7 +96031,7 @@ qje qSj dRL dRL -xFp +guE nQa qSH qSH @@ -89773,24 +96115,24 @@ uwT uwT uwT uwT +fWG +fWG +uwT uwT uwT uwT fWG -vcR -lPq -tjx -iBl -bgS -bgS +bqE +uzI +rOb xPH acp -lSF -wQa -eXG -eXG -eXG -eXG +acp +xPH +xaN +vDo +tos +dhH eXG eXG wQa @@ -89813,7 +96155,7 @@ eXG eXG eXG eXG -cpy +eXG cpy cpy cpy @@ -89832,18 +96174,18 @@ saC saC saC saC -saC -saC -dkL -dkL -dkL +tiQ +uMP dkL kca kca kca +kca +kca +kca eGL dSy -haR +eWy tiQ tiQ fRd @@ -89865,7 +96207,7 @@ jHb jHb jHb kKh -vrV +tiQ saC lFt kLs @@ -89896,17 +96238,17 @@ qSH qSH qSH cYn -saC -saC -saC -saC -saC -saC -saC +cpy +cpy +cpy dRL -hXy +sLl xCT -hXy +sLl +dRL +yfP +xCT +niT dRL dRL ozJ @@ -89917,7 +96259,7 @@ xCT rsl dRL dRL -xFp +guE nQa qSH qSH @@ -89955,7 +96297,7 @@ gGa gVr klz hMR -hMR +ffO smF hMR pBl @@ -90001,23 +96343,23 @@ uwT uwT uwT cpy +fWG +fWG +uwT uwT uwT fWG -vcR -lPq -lPq -bgS -bgS -bgS -xPH +bqE +uzI +rOb +gVA +gVA acp -lSF -eXG -eXG -eXG -eXG -wQa +gVA +xaN +vDo +tos +dhH wQa cex cex @@ -90059,17 +96401,17 @@ saC saC saC saC -saC -saC -ahH +cpn uMP -cIV +cGd +dXN +dXN mNm mNm kca kca kca -kca +dKF fmv fuf tiQ @@ -90092,7 +96434,7 @@ kba kba jHb kKh -vrV +tiQ saC lFt xUx @@ -90122,19 +96464,19 @@ qSH qSH qSH qSH -dnA -saC -saC -saC -saC -saC -saC -saC +qSH +cpy +cpy +cpy dRL dRL -rqT +dVM dRL dRL +gMV +xCT +nuo +dRL npA oAd xCT @@ -90230,21 +96572,21 @@ uwT cpy cpy fWG +uwT +uwT +uwT fWG -vcR -mKu -lPq -bgS -bgS -bgS +bqE +uzI +fOX +mWd xPH -acp -lSF -eXG -eXG -cex -cex -wQa +xPH +xPH +wZz +vDo +tos +dhH wQa wQa eXG @@ -90286,20 +96628,20 @@ saC saC saC saC -saC -saC -ahH +cpn uMP -cIW -kca -kca -kca -kca -kca +feZ +uMP +uMP +uMP +dkL kca kca -haR kca +cIm +dJN +eWy +uMP tiQ ggM fCE @@ -90320,10 +96662,10 @@ jJj jJj mLp tiQ -xUx -lFt -xUx -mcE +nFt +psq +nUV +mbM xUx xUx pNo @@ -90348,20 +96690,20 @@ saC qSH qSH qSH -dnA -saC -saC -saC -saC -saC -saC -saC -saC +qSH +cpy +cpy +cpy +cpy dRL -imA -elx -hXy +ouv +uSJ +sLl dRL +nem +fzE +yfP +rJf nLi oBf xCT @@ -90371,7 +96713,7 @@ xCT rsq xCT yfP -dRL +rJf fKf qSH qSH @@ -90456,28 +96798,28 @@ uwT uwT cpy cpy +fWG uwT uwT +uwT +fWG +bqE +dsa +kfv +oEc +tjx +vcR gVA -bgS -bgS -bgS -bgS -bgS -xPH -acp -lSF -eXG -cex -cex -wQa -wQa +wZz +vDo +tos +dhH wQa dkX rBd nPb fdT -hIf +rVR hIf rqn iGr @@ -90514,19 +96856,19 @@ saC saC saC tiQ -cYQ -dkL +czC +czC +czC +czC +uMP dkL -tiQ -kca -kca kca aVs cAy cIs -kca -haR -kca +cIm +cNB +uMP tiQ ghr tiQ @@ -90537,23 +96879,23 @@ tiQ vrV vrV vrV -vrV -vrV -vrV -vrV -vrV +tiQ +tiQ +tiQ +tiQ +tiQ vrV vrV vrV tiQ tiQ -afs -lFt -xUx -mcE -mto -xUx -pNo +mua +mua +pMg +rqT +uVa +pMg +mua tiQ tiQ tiQ @@ -90574,19 +96916,19 @@ saC saC qSH cYn -dnA -dnA -saC -saC -saC -saC -saC -saC -saC -saC +qSH +qSH +cpy +cpy +cpy +cpy dRL +gtH +msB +oBx +dVo ipf -jjF +qxX qUq kNM nLW @@ -90685,27 +97027,27 @@ cpy cpy fWG fWG -gVA -bgS -bgS -bgS -bgS -bgS -xPH -acp -lSF -eXG -cex -wQa -wQa -eXG +uwT +uwT +fWG +bqE +dsa +kfv +oEc +uXa +xJB +yfz +wZz +vDo +tos +dhH dkX nPb gRp iGr iGr -qvA -qvA +uIn +uIn rqn qvA lhE @@ -90745,18 +97087,18 @@ cZu cWL dJN cIV -kca -kca +uMP +dkL kca kca mNm kca kca -haR -kca -kca -kca -dKF +cRT +uMP +epS +uMP +uMP saC tiQ tiQ @@ -90772,12 +97114,12 @@ xUx xUx xUx xUx -xUx -xUx +hOH +mua fol -nUD -xUx -mdD +ptc +nUV +bOE woG xUx cNQ @@ -90790,7 +97132,7 @@ xSN xSN xSN xSN -xSN +pMg xSN xSN xSN @@ -90799,23 +97141,23 @@ tiQ tiQ tiQ saC -dnA -dnA -gpM +qSH +qSH +qSH eCe -gOX -saC -saC -saC -saC -saC -saC -saC +qSH +cpy +cpy +cpy dRL -iDO -jAV -hXy +jfG +gQu +sLl dRL +yfP +jAV +yfP +rJf nSA oBR pjT @@ -90825,9 +97167,9 @@ reo xCT xCT yfP -dRL +rJf fKf -qSH +vGp qSH qSH qSH @@ -90912,27 +97254,27 @@ cpy cpy fWG tXW -gVA -bgS -mKu -bgS -bgS -bgS -xPH -acp -lSF -wQa -wQa -wQa -dkX -rBd +uwT +uwT +fWG +bqE +dsa +fOX +qda +rOb +ycc +ycc +wZz +vDo +sbh +hhb nPb hIf jLk jMy qGI -wDa -wDa +uMr +uMr rqn wDa vbF @@ -90972,18 +97314,18 @@ dah kca dKF cIW -kca -kca +uMP +dkL kca kca kca mNm mNm -haR -kca -kca -kca -dKF +dgq +cWL +cWL +cWL +dJN saC saC saC @@ -90993,31 +97335,31 @@ rza rza rza saC -rza +saC rza jJO kbg kqa rza -rza -rza +qqq +mmj nUD xUx xUx -mdD +woG woG xUx xUx cNQ -cPH -rza -rza -rza +cWZ rza +rla rza rza rza rza +qqq +qqq rza rza rza @@ -91032,17 +97374,17 @@ eCe cYn eCe eCe -saC -saC -saC -saC -saC -saC +cpy +cpy dRL dRL -rqT +dVM dRL dRL +gMV +xCT +nuo +dRL odQ oBR ppK @@ -91054,8 +97396,8 @@ hqp dRL dRL fKf -qSH -qSH +vGp +vGp qSH qSH qSH @@ -91136,22 +97478,22 @@ uwT uwT uwT cpy -uwT +fWG tXW uwT -vcR -mKu -mKu -qda -lpP -bgS -xPH -acp -lSF -wQa -dkX -rBd -nPb +uwT +uwT +uwT +bqE +uzI +dDq +dDq +uzI +uzI +uzI +uzI +uzI +uzI hIf hIf hIf @@ -91159,7 +97501,7 @@ wEo pXu kiY dOI -qvA +uIn rqn qvA tur @@ -91169,8 +97511,8 @@ qvA hIf aKn hIf -jGp -rBd +rnq +rnq sfO eXG eXG @@ -91199,7 +97541,7 @@ vEw dXN dKM cYQ -kca +uMP mNm mNm kca @@ -91210,8 +97552,8 @@ haR kca kca kca -hhu -kca +dKF +uMP saC xUx xSN @@ -91220,33 +97562,33 @@ iam nUV nUV nUV -nUV +tHC nUV jKm nUV nUV nUV kKD -nUV -nUV -nUV -oKK -med -mua -woG -xUx -xUx -cWc -xUx -xUx +mnX xUx xUx +woG +mua +mua +woG xUx xUx +cWZ xUx +qro xUx xUx xUx +hOH +hOH +hOH +hOH +hOH xUx xUx ybd @@ -91259,16 +97601,16 @@ eCe qSH qSH eCe -saC -saC -saC -saC -saC -saC +cpy +cpy dRL -hXy +sLl xCT -hXy +sLl +dRL +jjq +xCT +yfP dRL dRL oQt @@ -91279,10 +97621,10 @@ rfk nKh dRL dRL -xFp +qYP jKB -qSH -qSH +vGp +vGp qSH qSH qSH @@ -91362,21 +97704,21 @@ fWG uwT uwT uwT -uwT +fWG uwT tXW uwT -vcR -mKu -mKu -qpE -mDT -tjx -xPH -acp -lSF -dkX -nPb +uwT +uwT +uwT +jqr +xxq +xzK +xzK +uzI +uzI +uzI +uzI hIf hIf hIf @@ -91426,8 +97768,8 @@ tiQ tiQ dKO cYQ -kca -mNm +uMP +uDC mNm mNm kca @@ -91437,8 +97779,8 @@ haR fCP fSe fCP -kca -kca +dKF +uMP hig xUx xSN @@ -91447,35 +97789,35 @@ mdD woG woG xUx -xUx +qro xUx woG woG woG xUx kLc -xUx -woG -woG -xUx -saC -xUx -xUx +pMg woG woG -cWc -xUx -xUx -woG +mua +tiQ +mua +mua woG woG +cWZ xUx -xUx -xUx +qro woG woG woG -mHP +hOH +hOH +hOH +mee +mee +lpy +eqD ybd saC saC @@ -91487,16 +97829,16 @@ qSH qSH qSH eCe -saC -saC -saC -saC -saC +cpy dRL dRL gMV dRL dRL +jgI +mNf +lZq +dRL dRL dRL gMV @@ -91505,12 +97847,12 @@ qQt rge dRL dRL -xFp +qYP jKB -qSH -qSH -qSH -qSH +vGp +vGp +vGp +vGp qSH qSH umR @@ -91593,16 +97935,16 @@ uwT uwT uwT uwT -vcR -bgS -qpE -bgS -qda -qda -xPH -acp +uwT +uwT +uwT +uwT +fWG +bqE +xzK +uzI +uzI uzI -nPb hIf jVq gxp @@ -91656,16 +97998,16 @@ tiQ tiQ tiQ aTK -kca -kca +cGd +cLb mNm foO fuQ fDi fSR ghy -hTk -hTk +eAF +fiA hCU nUV oyM @@ -91674,32 +98016,32 @@ bOE woG woG xUx -xUx +qro xUx woG woG woG xUx xUx -iWy -woG -woG -saC -saC -saC -xUx -woG +mCQ woG -cWc -xUx -xUx woG +tiQ +tiQ +tiQ +mua woG woG +cWZ xUx -xUx -xUx -woG +hOH +lpy +lpy +lpy +hOH +hOH +hOH +mee woG woG xUx @@ -91714,12 +98056,8 @@ qSH qSH qSH cYn -eCe -saC -saC -saC -saC -saC +gwC +cpy dRL dRL dRL @@ -91727,18 +98065,22 @@ dRL dRL dRL dRL -qhA -qiG dRL dRL +dRL +rJf +rJf +qiG +rJf +dRL pGY jKB -qSH -qSH -qSH -qSH -qSH -qSH +vGp +vGp +vGp +vGp +vGp +vGp qSH umR onj @@ -91820,17 +98162,17 @@ uwT uwT uwT uwT -gVA -vcR -vcR -gVA -vcR -vcR -gVA -gVA -gVA +uwT +uwT +uwT +uwT +uwT +bqE +uzI +uzI +uzI gRp -sol +pab xYA aiP xYA @@ -91883,16 +98225,16 @@ dSW tiQ tiQ mNm -kca -kca +uMP +dkL mNm kca haR cUx fSX cUx -kca -kca +dKF +uMP hig xWz xSN @@ -91901,31 +98243,31 @@ xUx xUx xUx iWy -xUx +qro xUx jKo kbu xWz xUx kLs -xUx +pMg xUx mHP woG -saC -xUx +tiQ +mua woG xUx xUx -cWc -xUx -xUx +cWZ +hOH +hOH xUx xUx xUx mHP -xUx -xUx +hOH +hOH xUx xUx dbs @@ -91942,30 +98284,30 @@ qSH qSH qSH eCe -saC -saC -saC -saC -saC -saC -saC +cpy +cpy +cpy +cpy +cpy +cpy +cpy ien ien ien -dHF -dHF -dHF +whD +whD +whD hFL thi -uVa +dHz jKB -qSH -qSH -qSH -qSH -qSH -qSH -qSH +vGp +vGp +vGp +vGp +vGp +vGp +vGp qSH yaF kJh @@ -92052,12 +98394,12 @@ uwT uwT uwT uwT -uwT -uwT -rnq +bqE +xzK +uzI sDz hIf -rFT +gVf xYA xYA xYA @@ -92118,8 +98460,8 @@ hbN kca mNm mNm -kca -kca +dKF +uMP hig xUx xSN @@ -92134,8 +98476,8 @@ aCJ kbJ aCJ aCJ -aCJ -aCJ +hOG +hbj lnF xUx xUx @@ -92144,8 +98486,8 @@ woG xUx xUx mEg -cWZ -aCJ +fXs +hOG aCJ aCJ aCJ @@ -92168,15 +98510,15 @@ qSH qSH qSH qSH -saC -saC -saC -saC -saC -saC -saC -saC -saC +qSH +qSH +cpy +cpy +cpy +cpy +cpy +cpy +cpy ien lyP vGp @@ -92186,13 +98528,13 @@ itJ lTV lTV lTV -xSv -xSv -xSv -xSv -xSv -xSv -xSv +lTV +lTV +lTV +lTV +lTV +lTV +lTV xSv tWE onj @@ -92279,12 +98621,12 @@ fbS fbS fbS fbS -fbS -fbS -rnq +lPq +lPq +uzI sDz -hIf -vJr +rVR +xyC xYA xYA xYA @@ -92337,16 +98679,16 @@ xcU edk eil eof -kca -kca +uMP +dkL kca kca kca kca mNm mNm -kca -gXR +dKF +uMP tiQ saC saC @@ -92360,9 +98702,9 @@ saC saC xUx xUx -xUx -xUx -xUx +hOH +hOH +mua lnU lnF xUx @@ -92395,15 +98737,15 @@ qSH qSH qSH qSH -saC -saC -saC -saC -saC -saC -saC -saC -saC +qSH +qSH +qSH +cpy +cpy +cpy +cpy +cpy +cpy ien mbx vGp @@ -92414,10 +98756,10 @@ vGp vGp vGv vGp -qSH -qSH -qSH -qSH +vGp +vGp +vGp +vGp mTa oqn pdv @@ -92496,7 +98838,7 @@ uwT uwT uwT uwT -uwT +fWG uwT uwT gIr @@ -92510,8 +98852,8 @@ vpp snX snX qvA -hIf -kFB +rVR +qle aIp aIp aIp @@ -92533,7 +98875,7 @@ aIp aIp aIp aIp -yfK +jzZ hIf lSF eXG @@ -92564,15 +98906,15 @@ akM xcU pYP eov +uMP +dkL kca kca kca kca kca kca -kca -kca -kca +dKF saC saC saC @@ -92580,23 +98922,23 @@ saC saC vrV vrV -vrV -vrV -vrV -vrV -vrV +tiQ +tiQ +tiQ +tiQ +tiQ vrV vrV vrV tiQ tiQ -xSN -xSN -xSN -xSN -xSN -xSN -xSN +mua +mua +pMg +pMg +pMg +pMg +mua tiQ tiQ tiQ @@ -92622,14 +98964,14 @@ cYn qSH qSH qSH -saC -saC -saC -saC -saC -saC -saC -saC +qSH +qSH +qSH +qSH +cpy +cpy +cpy +cpy ien ien ien @@ -92642,9 +98984,9 @@ vGp lyP cpy vGp -qSH -qSH -qSH +vGp +vGp +vGp ncz otC pgp @@ -92722,9 +99064,9 @@ uwT uwT uwT uwT -uwT +fWG cpy -uwT +fWG uwT ewf snX @@ -92737,7 +99079,7 @@ yjP oQW snX snX -hIf +rVR sol aIp aIp @@ -92760,7 +99102,7 @@ aIp aIp xYA xYA -jYr +srS hIf lSF eXG @@ -92791,15 +99133,15 @@ dUj edP ekK tiQ +uMP +cGd dXN dXN dXN dXN dXN dXN -dXN -dXN -dXN +dKM saC saC tiQ @@ -92849,15 +99191,15 @@ eCe qSH qSH qSH -saC -saC -saC -saC -saC -saC -saC -saC -saC +qSH +qSH +qSH +qSH +qSH +qSH +cpy +cpy +cpy qBQ kyH fbA @@ -92870,8 +99212,8 @@ cpy cpy lyP vGp -qSH -qSH +vGp +vGp nff oxT pgG @@ -92948,10 +99290,10 @@ uwT uwT uwT uwT -uwT +fWG cpy cpy -uwT +fWG uwT ewf vpp @@ -92987,8 +99329,8 @@ aIp aIp xYA xYA -kcR -hIf +iqX +rVR lSF eXG eXG @@ -93019,12 +99361,12 @@ efR tiQ tiQ bbL -uMP +feZ faK uMP uMP uMP -uMP +feZ uMP saC saC @@ -93076,14 +99418,14 @@ eCe qSH qSH qSH -saC -saC -saC -saC -saC -saC -saC -saC +qSH +qSH +qSH +qSH +qSH +qSH +qSH +cpy cpy rdq saY @@ -93098,8 +99440,8 @@ cpy cpy vGp syW -qSH -qSH +vGp +vGp qSH qSH umR @@ -93175,7 +99517,7 @@ uwT uwT uwT uwT -uwT +fWG cpy cpy cpy @@ -93215,7 +99557,7 @@ aIp xYA xYA wBx -hIf +rVR lSF eXG eXG @@ -93304,13 +99646,13 @@ qSH qSH cYn eCe -saC -saC -saC -saC -saC -saC -saC +qSH +qSH +qSH +qSH +qSH +qSH +cpy ien ien ien @@ -93325,7 +99667,7 @@ cpy cpy cpy cpy -qSH +vGp qSH qSH qSH @@ -93401,7 +99743,7 @@ spW uwT uwT uwT -uwT +fWG cpy cpy cpy @@ -93442,7 +99784,7 @@ aIp aIp aIp yfK -hIf +rVR lSF eXG eXG @@ -93526,17 +99868,17 @@ saC saC saC saC -cYn +ffG qSH qSH eCe cpy cpy -cpy -cpy -saC -saC -cpy +qSH +qSH +qSH +qSH +qSH cpy cpy ien @@ -93627,7 +99969,7 @@ tOe nVR uwT uwT -uwT +fWG cpy cpy cpy @@ -93645,7 +99987,7 @@ fOX mjE snX snX -hIf +rVR sol xYA xYA @@ -93732,7 +100074,7 @@ woG woG xUx pNo -xSN +pMg mUh ngo wbR @@ -93754,16 +100096,16 @@ saC saC saC eCe -qSH +sBX eCe eCe cpy cpy cpy -cpy -cpy -cpy -cpy +qSH +qSH +qSH +qSH cpy cpy ien @@ -93797,9 +100139,9 @@ qSH qSH qSH umR -qSH -qSH -qSH +vGp +vGp +vGp uRb gdO gdO @@ -93854,12 +100196,12 @@ uwT uwT uwT uwT -uwT +fWG cpy cpy cpy cpy -uwT +tXW uwT rTf lum @@ -93872,8 +100214,8 @@ vpp snX snX oYO -hIf -rFT +rVR +gVf xYA xYA xYA @@ -93959,7 +100301,7 @@ xUx xUx xUx pNo -xSN +pMg mUl wbR wbR @@ -93983,15 +100325,15 @@ saC eCe eCe eCe -uwF -cpy -cpy -cpy cpy cpy cpy cpy cpy +qSH +qSH +qSH +qSH ien ien ien @@ -94016,17 +100358,17 @@ lzU gRD qSH qSH -qSH -qSH -qSH -qSH -qSH +vGp +vGp +vGp +vGp +vGp qSH qSH umR qSH -qSH -qSH +vGp +vGp hHh sYk gdO @@ -94081,12 +100423,12 @@ uwT uwT uwT uwT -uwT +fWG cpy cpy cpy cpy -uwT +tXW uwT uwT rTf @@ -94096,11 +100438,11 @@ tni tni tni tni -tni -rnq +cpy +cpy nDt gRp -vJr +xyC xYA aiP xYA @@ -94184,9 +100526,9 @@ lFt kLs xUx xUx -hOH +xUx pNo -xSN +hbj mUl wbR wbR @@ -94206,20 +100548,20 @@ saC saC saC saC -qSH -qSH +sBX +sBX eCe -qSH -cpy -cpy -cpy -cpy -cpy -cpy +ycw cpy cpy cpy cpy +qSH +qSH +qSH +qSH +qSH +qSH ien amc qSH @@ -94245,15 +100587,15 @@ lzU gRD qSH lyP -qSH -qSH -qSH -qSH +vGp +vGp +vGp +vGp qSH umR qSH -qSH -qSH +vGp +vGp vGp mJF oXX @@ -94308,13 +100650,13 @@ uwT uwT uwT uwT -uwT +fWG cpy cpy cpy cpy cpy -uwT +fWG uwT uwT uwT @@ -94322,9 +100664,9 @@ uwT cpy uwT uwT -uwT -uwT -rnq +cpy +cpy +cpy iWN jxD hIf @@ -94354,7 +100696,7 @@ sAt svG eXG eXG -wQa +cpy cpy cpy bMX @@ -94410,10 +100752,10 @@ xUx lFt xUx xUx -hOH -hOH -pNo -xSN +xUx +xUx +djq +hbj mUl wbR wbR @@ -94435,18 +100777,18 @@ saC cYn qSH qSH -qSH -qSH -cpy -cpy -cpy -cpy -cpy +sBX +sDv cpy cpy cpy cpy cpy +qSH +qSH +qSH +qSH +qSH ien poZ qSH @@ -94474,13 +100816,13 @@ gRD qSH lyP vGp -qSH -qSH -qSH +vGp +vGp +vGp umR qSH qSH -qSH +vGp vGp gzT gdO @@ -94535,24 +100877,24 @@ uwT uwT uwT uwT -uwT +fWG cpy cpy cpy cpy cpy cpy -uwT +fWG uwT uwT cpy cpy cpy -uwT -uwT -rnq -rnq -rnq +cpy +cpy +cpy +cpy +cpy iWN jxD hIf @@ -94562,14 +100904,14 @@ qvA qvA qvA dEm -qvA +uIn qvA ugG rqn qvA rRY qvA -wDa +uMr oTL pbO oTL @@ -94581,7 +100923,7 @@ svG eXG eXG eXG -wQa +cpy cpy cpy bMX @@ -94637,10 +100979,10 @@ xUx lFt xUx woG -mee -xUx -pNo -xSN +woG +hOH +djq +hbj mUl wbR wbR @@ -94669,10 +101011,10 @@ cpy cpy cpy cpy -cpy -cpy -cpy -cpy +qSH +qSH +qSH +qSH ien ien ien @@ -94702,12 +101044,12 @@ lzU gRD qSH vGp -qSH -qSH +vGp +vGp qQB uet -uet -uet +aoi +aoi dcc vxG vxT @@ -94761,7 +101103,7 @@ uwT uwT uwT uwT -uwT +fWG cpy cpy cpy @@ -94769,45 +101111,45 @@ cpy cpy cpy cpy -uwT -uwT +tXW uwT uwT cpy cpy -uwT -uwT -uwT -ybz -wQa +cpy +cpy +cpy +cpy +cpy +cpy eXG iWN -jru -jxD -hIf -hIf +rnq +rnq +rVR +rVR hIf qvA qXH -qvA -qvA +uIn +uIn rRY rqn qvA rRY qvA -wDa -pbO +uMr +sQR rNs whG fdT -sAt -jru +rnq +rnq svG eXG eXG eXG -wQa +cpy cpy cpy cpy @@ -94866,7 +101208,7 @@ xUx woG woG xUx -pNo +djq xSN mUl wbR @@ -94896,11 +101238,11 @@ cpy cpy cpy cpy -cpy -cpy -cpy -cpy -cpy +qSH +qSH +qSH +qSH +qSH ien fjk qSH @@ -94929,7 +101271,7 @@ krH oAu lzU gRD -qSH +vGp vGp qSH qSH @@ -94986,8 +101328,8 @@ uwT uwT uwT uwT -uwT -uwT +fWG +fWG cpy cpy cpy @@ -94997,15 +101339,15 @@ cpy cpy cpy cpy -uwT -uwT -uwT -uwT -uwT -uwT -uwT -uwT -ybz +tXW +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy eXG eXG eXG @@ -95013,8 +101355,8 @@ eXG iWN jru jxD -hIf -hIf +rVR +rVR crM wDa ffL @@ -95024,7 +101366,7 @@ wDa sIr wDa wDa -rNs +kXf iGr sAt jru @@ -95034,7 +101376,7 @@ eXG eXG eXG eXG -wQa +cpy cpy cpy cpy @@ -95093,7 +101435,7 @@ xUx woG woG xUx -pNo +dDF xSN mUl wbR @@ -95122,12 +101464,12 @@ cpy cpy cpy cpy -cpy -cpy -cpy -cpy -cpy -cpy +qSH +qSH +qSH +qSH +qSH +qSH ien igg rMR @@ -95226,14 +101568,14 @@ cpy cpy cpy cpy -uwT -uwT -uwT -uwT -uwT -rnq -rnq -rnq +cpy +cpy +cpy +cpy +cpy +cpy +cpy +eXG eXG cex cex @@ -95241,7 +101583,7 @@ wQa eXG iWN jxD -hIf +rVR hIf hIf qvA @@ -95261,7 +101603,7 @@ eXG eXG eXG eXG -wQa +cpy cpy cpy cpy @@ -95320,7 +101662,7 @@ xUx xUx xUx xWz -pNo +dDF xSN mUl nhb @@ -95349,12 +101691,12 @@ cpy cpy cpy cpy -cpy -cpy -cpy -cpy -cpy -ien +qSH +qSH +qSH +qSH +qSH +rME ien ien rMR @@ -95457,10 +101799,10 @@ cpy cpy cpy cpy -uwT -uwT -ybz -cex +cpy +cpy +cpy +cpy wQa wQa wQa @@ -95473,8 +101815,8 @@ jxD gRp hIf hIf -rqn -hIf +eWR +rVR hIf gRp sAt @@ -95486,9 +101828,9 @@ eXG eXG eXG eXG -wQa +cpy eXG -wQa +cpy cpy cpy cpy @@ -95575,11 +101917,11 @@ cpy cpy cpy cpy -cpy -cpy -cpy -cpy -cpy +qSH +qSH +qSH +qSH +qSH cpy cpy ien @@ -95686,9 +102028,9 @@ cpy cpy cpy cpy -ybz -cex -wQa +cpy +cpy +cpy wQa wQa wQa @@ -95699,21 +102041,21 @@ cex iWN jru jxD -hIf -hIf -hIf +rVR +rVR +rVR sAt jru svG eXG eXG eXG -wQa +cpy eXG eXG eXG -wQa -wQa +cpy +cpy cpy cpy cpy @@ -95803,10 +102145,10 @@ cpy cpy cpy cpy -cpy -cpy -cpy -cpy +qSH +qSH +qSH +qSH cpy cpy ien @@ -95915,9 +102257,9 @@ cpy cpy cpy cpy -cex -wQa -cex +cpy +cpy +cpy cex cex cex @@ -95934,13 +102276,13 @@ eXG eXG eXG eXG -wQa -wQa -wQa -wQa -wQa -wQa -wQa +cpy +cpy +cpy +cpy +cpy +cpy +cpy cpy cpy cpy @@ -96030,11 +102372,11 @@ cpy cpy cpy cpy -cpy -cpy -cpy -cpy -cpy +qSH +qSH +qSH +qSH +qSH ien ien ien @@ -96152,14 +102494,14 @@ cpy cpy cpy cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy +eXG +eXG +eXG +eXG +eXG +eXG +eXG +eXG cpy cpy cpy @@ -96258,12 +102600,12 @@ cpy cpy cpy cpy -cpy -cpy -cpy -cpy -cpy -ien +qSH +qSH +qSH +qSH +qSH +aJg qSH qSH pFH @@ -96381,10 +102723,10 @@ cpy cpy cpy cpy -cpy -cpy -cpy -cpy +eXG +eXG +eXG +eXG cpy cpy cpy @@ -96485,12 +102827,12 @@ cpy cpy cpy cpy -cpy -cpy -cpy -cpy -cpy -ien +qSH +qSH +qSH +qSH +qSH +aJg qSH qSH pFH @@ -96713,11 +103055,11 @@ cpy cpy cpy cpy -cpy -cpy -cpy -cpy -ien +qSH +qSH +qSH +qSH +aJg qSH qSH pFH diff --git a/maps/map_files/LV624/LV624.dmm b/maps/map_files/LV624/LV624.dmm index b84ed33ef0e4..a8aac22505c8 100644 --- a/maps/map_files/LV624/LV624.dmm +++ b/maps/map_files/LV624/LV624.dmm @@ -4877,7 +4877,9 @@ /turf/open/gm/coast/beachcorner/north_west, /area/lv624/ground/jungle/west_jungle) "ayj" = ( -/obj/structure/machinery/optable, +/obj/structure/machinery/bioprinter{ + stored_metal = 1000 + }, /obj/structure/machinery/light/small{ dir = 4 }, diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 80262ec61937..f8c9cc99d534 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -2825,9 +2825,6 @@ icon_state = "redfull" }, /area/almayer/command/cic) -"ajo" = ( -/turf/closed/wall/almayer/white, -/area/almayer/medical/medical_science) "ajp" = ( /obj/structure/surface/table/almayer, /obj/structure/dropship_equipment/fuel/cooling_system{ @@ -3489,6 +3486,20 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) +"alk" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 4; + id = "W_Containment Cell 1"; + name = "\improper Containment Cell 5"; + unacidable = 1 + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + dir = 4; + id = "Containment Breach"; + name = "\improper Secure Airlock" + }, +/turf/closed/wall/almayer/research/containment/wall/purple, +/area/almayer/medical/containment/cell) "all" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -3699,47 +3710,19 @@ }, /area/almayer/hallways/repair_bay) "amk" = ( -/turf/closed/wall/almayer/white/outer_tile, -/area/almayer/medical/medical_science) -"aml" = ( -/obj/structure/filingcabinet/filingcabinet, -/obj/item/folder/black, -/obj/item/folder/black, -/obj/item/folder/black, -/obj/item/folder/white, -/obj/item/folder/white, -/obj/item/folder/white, -/obj/structure/machinery/status_display{ - pixel_y = 30 - }, -/turf/open/floor/wood/ship, -/area/almayer/medical/medical_science) -"amm" = ( -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = 28 - }, -/turf/open/floor/wood/ship, -/area/almayer/medical/medical_science) -"amn" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/surface/rack, -/obj/item/stack/sheet/mineral/plastic{ - amount = 15 +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 }, -/obj/item/stack/sheet/glass{ - amount = 20; - pixel_x = 3; - pixel_y = 3 +/obj/effect/decal/warning_stripes{ + icon_state = "W" }, /turf/open/floor/almayer{ dir = 1; - icon_state = "sterile_green_side" + icon_state = "sterile_green_corner" }, -/area/almayer/medical/testlab) +/area/almayer/medical/containment) "amo" = ( /obj/structure/largecrate/random/secure, /obj/structure/sign/safety/rewire{ @@ -4103,36 +4086,33 @@ /turf/open/floor/plating/almayer, /area/almayer/hull/upper_hull/u_a_s) "anw" = ( -/obj/structure/pipes/vents/pump, -/turf/open/floor/wood/ship, -/area/almayer/medical/medical_science) -"anx" = ( -/obj/structure/surface/table/almayer, -/obj/item/folder/white{ - pixel_x = 6 +/obj/structure/machinery/flasher{ + id = "Containment Cell 1"; + layer = 2.1; + name = "Mounted Flash"; + pixel_y = 30 }, -/obj/item/clothing/glasses/science{ - pixel_x = -4; - pixel_y = 7 +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "sterile_green_side" +/turf/open/floor/almayer/research/containment/floor2{ + dir = 1 }, -/area/almayer/medical/testlab) +/area/almayer/medical/containment/cell) "anz" = ( -/obj/structure/surface/table/almayer, -/obj/item/tool/pen{ - pixel_y = 8 +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 }, -/obj/structure/machinery/light{ - dir = 4 +/obj/structure/machinery/photocopier, +/obj/structure/machinery/firealarm{ + pixel_y = 28 }, -/obj/item/paper_bin/wy{ - pixel_y = 7 +/turf/open/floor/almayer{ + icon_state = "sterile_green" }, -/turf/open/floor/wood/ship, -/area/almayer/medical/medical_science) +/area/almayer/medical/hydroponics) "anB" = ( /obj/structure/sign/safety/storage{ pixel_x = -17 @@ -4157,11 +4137,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/repair_bay) -"anF" = ( -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/almayer/medical/testlab) "anG" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -4508,23 +4483,51 @@ }, /area/almayer/lifeboat_pumps/north1) "aoJ" = ( -/obj/structure/bed/chair{ +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 4; + id = "W_Containment Cell 1"; + name = "\improper Containment Cell 5"; + unacidable = 1 + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + dir = 4; + id = "Containment Breach"; + name = "\improper Secure Airlock" + }, +/turf/closed/wall/almayer/research/containment/wall/purple{ dir = 1 }, -/turf/open/floor/wood/ship, -/area/almayer/medical/medical_science) +/area/almayer/medical/containment/cell) "aoK" = ( -/obj/structure/machinery/alarm/almayer{ - dir = 1 +/obj/structure/surface/table/almayer, +/obj/effect/decal/warning_stripes{ + icon_state = "W" }, -/obj/structure/reagent_dispensers/water_cooler/stacks, -/obj/structure/sign/safety/chem_lab{ - pixel_x = 32 +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/structure/machinery/door_display/research_cell{ + dir = 1; + id = "Containment Cell 5"; + name = "Cell 5 Control"; + pixel_x = 4; + pixel_y = -3 + }, +/obj/structure/machinery/door_control{ + id = "W_Containment Cell 5"; + name = "Containment Lockdown"; + pixel_x = -8; + pixel_y = -3; + req_one_access_txt = "19;28" }, /turf/open/floor/almayer{ - icon_state = "sterile_green_corner" + icon_state = "sterile_green" }, -/area/almayer/medical/medical_science) +/area/almayer/medical/containment) "aoL" = ( /obj/structure/bed/chair/office/dark, /turf/open/floor/almayer, @@ -4543,17 +4546,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) -"aoO" = ( -/obj/structure/machinery/autolathe/medilathe/full, -/obj/structure/machinery/firealarm{ - dir = 8; - pixel_x = -24 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "sterile_green_side" - }, -/area/almayer/medical/testlab) "aoP" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 1; @@ -4894,40 +4886,42 @@ }, /area/almayer/engineering/engineering_workshop/hangar) "apR" = ( -/obj/structure/surface/rack, -/obj/item/storage/box/beakers{ - pixel_y = 12 - }, -/obj/item/storage/box/sprays{ - pixel_y = 5 +/obj/structure/pipes/vents/pump{ + name = "Secure Air Vent"; + welded = 1 }, -/obj/item/storage/box/autoinjectors{ - pixel_x = 1; - pixel_y = -3 +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/obj/structure/sign/safety/storage{ - pixel_x = 23; - pixel_y = 32 +/obj/structure/machinery/alarm/almayer{ + dir = 1 }, /turf/open/floor/almayer{ icon_state = "sterile_green" }, -/area/almayer/medical/medical_science) +/area/almayer/medical/containment) "apS" = ( -/obj/structure/surface/rack, -/obj/item/storage/box/pillbottles{ - pixel_y = -2 +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/obj/item/storage/box/pillbottles{ - pixel_y = 6 +/obj/structure/surface/rack{ + density = 0; + pixel_y = 16 }, -/obj/item/storage/box/pillbottles{ - pixel_y = 12 +/obj/item/storage/xeno_tag_case/full{ + pixel_y = 15 + }, +/obj/item/device/camera{ + pixel_x = -3; + pixel_y = 22 }, /turf/open/floor/almayer{ - icon_state = "sterile_green" + dir = 1; + icon_state = "sterile_green_side" }, -/area/almayer/medical/medical_science) +/area/almayer/medical/containment) "apT" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/door/airlock/almayer/engineering/reinforced/OT{ @@ -4939,11 +4933,21 @@ }, /area/almayer/engineering/engineering_workshop/hangar) "apU" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "sterile_green_side" +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 4; + id = "W_Containment Cell 2"; + name = "\improper Containment Cell 5"; + unacidable = 1 + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + dir = 4; + id = "Containment Breach"; + name = "\improper Secure Airlock" + }, +/turf/closed/wall/almayer/research/containment/wall/purple{ + dir = 8 }, -/area/almayer/medical/testlab) +/area/almayer/medical/containment/cell) "apV" = ( /obj/structure/machinery/light{ dir = 8 @@ -5206,7 +5210,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hull/upper_hull) +/area/almayer/medical/medical_science) "aqJ" = ( /turf/open/floor/almayer{ dir = 5; @@ -5229,43 +5233,41 @@ icon_state = "plate" }, /area/almayer/command/cic) -"aqO" = ( -/obj/structure/machinery/chem_master{ - vial_maker = 1 - }, -/turf/open/floor/almayer{ +"aqP" = ( +/obj/structure/machinery/door/airlock/almayer/research/glass/reinforced{ dir = 1; - icon_state = "sterile_green_side" + id = "Containment Cell 1"; + locked = 1; + name = "\improper Containment Cell 1" + }, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "Containment Cell 1"; + name = "\improper Containment Cell 1"; + unacidable = 1 }, -/area/almayer/medical/medical_science) -"aqP" = ( /obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "sterile_green_side" +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, -/area/almayer/medical/medical_science) -"aqQ" = ( -/turf/open/floor/almayer{ - dir = 5; - icon_state = "sterile_green_side" +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "Containment Breach"; + name = "\improper Secure Airlock" }, -/area/almayer/medical/medical_science) -"aqR" = ( /turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_side" + icon_state = "test_floor4" }, -/area/almayer/medical/medical_science) +/area/almayer/medical/containment/cell) "aqS" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 - }, +/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ - dir = 9; - icon_state = "sterile_green_side" + icon_state = "sterile_green" }, -/area/almayer/medical/medical_science) +/area/almayer/medical/containment) "aqT" = ( /obj/structure/surface/table/almayer, /obj/item/tool/hand_labeler{ @@ -5729,6 +5731,10 @@ /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 }, +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "Containment Breach"; + name = "\improper Secure Airlock" + }, /turf/open/floor/plating, /area/almayer/medical/upper_medical) "aso" = ( @@ -6021,14 +6027,14 @@ pixel_y = -32 }, /turf/open/floor/plating/almayer, -/area/almayer/hull/upper_hull) +/area/almayer/medical/medical_science) "atb" = ( /obj/structure/ladder{ height = 2; id = "cicladder2" }, /turf/open/floor/plating/almayer, -/area/almayer/hull/upper_hull) +/area/almayer/medical/medical_science) "atc" = ( /turf/open/floor/almayer{ dir = 4; @@ -6968,12 +6974,6 @@ "avo" = ( /turf/closed/wall/almayer/outer, /area/almayer/powered/agent) -"avp" = ( -/obj/structure/surface/table/almayer, -/obj/item/folder/white, -/obj/item/device/flashlight/pen, -/turf/open/floor/wood/ship, -/area/almayer/medical/medical_science) "avr" = ( /obj/structure/bed/sofa/south/grey/left{ pixel_y = 12 @@ -7025,14 +7025,6 @@ icon_state = "plate" }, /area/almayer/shipboard/brig/general_equipment) -"avA" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/almayer/medical/medical_science) "avB" = ( /turf/open/floor/almayer{ dir = 8; @@ -7049,32 +7041,35 @@ /turf/open/floor/almayer, /area/almayer/hallways/aft_hallway) "avF" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_x = -1; + pixel_y = 1 + }, /turf/open/floor/almayer{ + dir = 9; icon_state = "sterile_green_side" }, -/area/almayer/medical/medical_science) +/area/almayer/medical/containment) "avG" = ( /turf/open/floor/almayer{ - dir = 10; + dir = 6; icon_state = "sterile_green_side" }, -/area/almayer/medical/medical_science) +/area/almayer/medical/containment) "avH" = ( -/turf/open/floor/almayer{ - dir = 6; - icon_state = "sterile_green_side" +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/area/almayer/medical/medical_science) -"avI" = ( -/obj/structure/machinery/botany/editor, -/obj/structure/machinery/firealarm{ - pixel_y = 28 +/obj/structure/machinery/light{ + dir = 1 }, /turf/open/floor/almayer{ dir = 1; icon_state = "sterile_green_side" }, -/area/almayer/medical/hydroponics) +/area/almayer/medical/containment) "avJ" = ( /obj/item/clothing/head/helmet/marine{ pixel_x = 16; @@ -7466,20 +7461,43 @@ }, /area/almayer/medical/upper_medical) "awQ" = ( -/mob/living/simple_animal/mouse/white/Doc, +/obj/structure/surface/table/almayer, +/obj/item/cell/high{ + pixel_x = -8; + pixel_y = 8 + }, +/obj/item/cell/high{ + pixel_x = -8; + pixel_y = 8 + }, +/obj/item/cell/high{ + pixel_x = -8; + pixel_y = -2 + }, +/obj/item/cell/high{ + pixel_x = -8; + pixel_y = -2 + }, +/obj/item/device/multitool{ + pixel_x = 8 + }, +/obj/item/tool/screwdriver{ + pixel_x = -3; + pixel_y = 4 + }, +/obj/structure/machinery/power/apc/almayer{ + dir = 1 + }, /turf/open/floor/almayer{ icon_state = "sterile_green" }, -/area/almayer/medical/medical_science) +/area/almayer/medical/hydroponics) "awR" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 - }, +/obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/almayer{ - dir = 10; - icon_state = "sterile_green_side" + icon_state = "sterile_green" }, -/area/almayer/medical/medical_science) +/area/almayer/medical/containment) "awS" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ @@ -7563,21 +7581,24 @@ }, /area/almayer/medical/upper_medical) "axn" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/reagent_analyzer{ - pixel_x = 2; - pixel_y = 3 +/obj/structure/sign/safety/rewire{ + layer = 2.4; + pixel_x = 8; + pixel_y = 32 }, -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = 28 +/obj/structure/reagent_dispensers/watertank, +/obj/item/reagent_container/glass/beaker{ + pixel_x = 6; + pixel_y = 7 + }, +/obj/item/reagent_container/glass/beaker/large{ + pixel_x = -6; + pixel_y = 8 }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_corner" + icon_state = "mono" }, -/area/almayer/medical/medical_science) +/area/almayer/medical/hydroponics) "axo" = ( /obj/structure/window/framed/almayer, /turf/open/floor/plating, @@ -8105,43 +8126,20 @@ "ayX" = ( /obj/structure/surface/table/almayer, /obj/item/tool/extinguisher, -/obj/structure/sign/safety/biolab{ - pixel_y = 32 - }, -/obj/structure/sign/safety/biohazard{ - pixel_x = 15; +/obj/structure/sign/catclock{ pixel_y = 32 }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_corner" - }, -/area/almayer/medical/upper_medical) -"ayY" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 4; - name = "ship-grade camera" - }, -/obj/item/storage/fancy/vials/empty{ - pixel_y = 10; - start_vials = 2 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "sterile_green_side" + icon_state = "sterile_green" }, /area/almayer/medical/medical_science) "ayZ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/light{ + dir = 1 }, /turf/open/floor/almayer{ - dir = 10; - icon_state = "sterile_green_side" + icon_state = "dark_sterile" }, /area/almayer/medical/medical_science) "azb" = ( @@ -8556,31 +8554,16 @@ /turf/open/floor/almayer, /area/almayer/command/cichallway) "aAr" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/box/donkpockets{ - pixel_x = -4; - pixel_y = 8 - }, -/obj/item/storage/box/drinkingglasses{ - pixel_x = -4 - }, -/obj/structure/sink{ - dir = 4; - pixel_x = 11 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "sterile_green_side" - }, -/area/almayer/medical/medical_science) -"aAt" = ( -/obj/structure/machinery/portable_atmospherics/hydroponics, -/obj/structure/machinery/light{ - dir = 8 +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera" }, +/obj/structure/surface/rack, +/obj/item/storage/box/botanydisk, +/obj/item/storage/box/botanydisk, +/obj/item/storage/box/botanydisk, +/obj/item/storage/box/botanydisk, /turf/open/floor/almayer{ - dir = 8; - icon_state = "sterile_green_side" + icon_state = "mono" }, /area/almayer/medical/hydroponics) "aAv" = ( @@ -8742,11 +8725,14 @@ /turf/open/floor/almayer, /area/almayer/command/cic) "aAT" = ( -/obj/structure/machinery/smartfridge/chemistry, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, /turf/open/floor/almayer{ - icon_state = "dark_sterile" + icon_state = "sterile_green" }, -/area/almayer/medical/medical_science) +/area/almayer/medical/containment) "aAW" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -8816,10 +8802,21 @@ }, /area/almayer/medical/morgue) "aBe" = ( -/turf/open/floor/almayer{ - icon_state = "sterile_green_side" +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 4; + id = "W_Containment Cell 2"; + name = "\improper Containment Cell 5"; + unacidable = 1 }, -/area/almayer/medical/testlab) +/obj/structure/machinery/door/poddoor/almayer/open{ + dir = 4; + id = "Containment Breach"; + name = "\improper Secure Airlock" + }, +/turf/closed/wall/almayer/research/containment/wall/purple{ + dir = 4 + }, +/area/almayer/medical/containment/cell) "aBf" = ( /obj/structure/machinery/door/airlock/almayer/secure/reinforced{ name = "Telecommunications"; @@ -9237,18 +9234,11 @@ }, /area/almayer/medical/upper_medical) "aCt" = ( -/obj/structure/reagent_dispensers/water_cooler, -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/sign/safety/intercom{ - pixel_x = 8; - pixel_y = 32 - }, +/obj/structure/bed/sofa/south/white/right, /turf/open/floor/almayer{ - icon_state = "sterile_green_corner" + icon_state = "sterile_green" }, -/area/almayer/medical/upper_medical) +/area/almayer/medical/medical_science) "aCu" = ( /obj/structure/sink{ pixel_y = 24 @@ -9273,41 +9263,40 @@ /area/almayer/medical/morgue) "aCC" = ( /turf/open/floor/almayer{ - dir = 5; - icon_state = "sterile_green_side" + icon_state = "sterile_green" }, -/area/almayer/medical/upper_medical) +/area/almayer/medical/medical_science) "aCD" = ( -/obj/structure/machinery/door_control{ - dir = 1; - id = "researchdoorint"; - name = "Research Interior Door"; - normaldoorcontrol = 1; - pixel_x = -25; - pixel_y = -5; - req_access_txt = "28" - }, -/obj/structure/machinery/door_control{ - dir = 1; - id = "researchlockdownint"; - name = "Research Interior Lockdown"; - pixel_x = -25; - pixel_y = 5; - req_access_txt = "28" +/obj/structure/pipes/vents/pump, +/obj/structure/machinery/computer/cameras/almayer{ + dir = 4; + pixel_x = -16 }, /turf/open/floor/almayer{ - dir = 8; + dir = 10; icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) "aCR" = ( -/obj/structure/bed/chair/office/dark{ - dir = 1 +/obj/structure/machinery/door_control{ + id = "containmentlockdown_S"; + name = "Containment Lockdown"; + pixel_y = 28; + req_one_access_txt = "19;28" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 }, /turf/open/floor/almayer{ - icon_state = "dark_sterile" + dir = 1; + icon_state = "sterile_green_side" }, -/area/almayer/medical/medical_science) +/area/almayer/medical/containment) "aCX" = ( /obj/effect/step_trigger/clone_cleaner, /obj/effect/decal/warning_stripes{ @@ -9827,29 +9816,31 @@ }, /area/almayer/hallways/aft_hallway) "aEZ" = ( -/obj/structure/sign/safety/biolab{ - pixel_x = -17; - pixel_y = -8 +/obj/structure/surface/table/almayer, +/obj/item/storage/box/gloves{ + pixel_x = -4; + pixel_y = 13 }, -/obj/structure/sign/safety/biohazard{ - pixel_x = -17; - pixel_y = 7 +/obj/item/storage/box/masks{ + pixel_x = -6; + pixel_y = 4 + }, +/obj/item/tool/hand_labeler{ + pixel_x = 5; + pixel_y = 3 }, -/obj/structure/machinery/cm_vending/clothing/medical_crew, /turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_corner" + icon_state = "mono" }, /area/almayer/medical/medical_science) "aFa" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, /turf/open/floor/almayer{ - dir = 5; icon_state = "sterile_green_side" }, -/area/almayer/medical/medical_science) +/area/almayer/medical/containment) "aFf" = ( /obj/item/reagent_container/glass/beaker/bluespace, /obj/structure/machinery/chem_dispenser/research, @@ -10551,12 +10542,17 @@ /area/almayer/command/cichallway) "aIo" = ( /obj/structure/window/framed/almayer/white, +/obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ + dir = 8; + id = "researchlockdownext_windoor"; + name = "\improper Research Windoor Shutter" + }, +/obj/structure/machinery/door/poddoor/almayer/open{ dir = 4; - id = "researchlockdownext"; - name = "\improper Research Lockdown" + id = "Containment Breach"; + name = "\improper Secure Airlock" }, -/obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/plating, /area/almayer/medical/medical_science) "aIq" = ( @@ -10611,31 +10607,53 @@ /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north1) "aIC" = ( -/obj/structure/machinery/shower{ - dir = 1 +/obj/structure/surface/table/almayer, +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/obj/structure/machinery/door_control{ - id = "containmentlockdown_E"; - name = "Containment Lockdown"; - pixel_x = 25; - req_one_access_txt = "19;28" +/obj/structure/transmitter/rotary{ + name = "Researcher Office Telephone"; + phone_category = "Almayer"; + phone_id = "Research"; + pixel_y = 6 + }, +/obj/item/reagent_container/glass/beaker{ + pixel_x = 6; + pixel_y = -1 + }, +/obj/item/reagent_container/glass/beaker/large{ + pixel_x = -6 }, /turf/open/floor/almayer{ - dir = 4; - icon_state = "sterile_green_corner" + icon_state = "sterile_green_side" }, -/area/almayer/medical/containment) +/area/almayer/medical/medical_science) "aID" = ( -/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/light{ + dir = 1 + }, /turf/open/floor/almayer{ - dir = 10; - icon_state = "sterile_green_side" + icon_state = "mono" }, -/area/almayer/medical/containment) +/area/almayer/medical/hydroponics) "aIM" = ( /obj/structure/largecrate/random, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_a_s) +"aIP" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1; + pixel_y = -1 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "sterile_green_corner" + }, +/area/almayer/medical/containment) "aIQ" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/machinery/door/airlock/almayer/command/reinforced{ @@ -10821,6 +10839,19 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering) +"aJn" = ( +/obj/structure/machinery/camera/autoname/almayer/containment{ + dir = 1; + name = "ship-grade camera" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "sterile_green_corner" + }, +/area/almayer/medical/containment) "aJp" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22"; @@ -11282,13 +11313,6 @@ }, /turf/open/floor/almayer, /area/almayer/command/cic) -"aLP" = ( -/obj/structure/window/framed/almayer/white, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 - }, -/turf/open/floor/plating, -/area/almayer/medical/medical_science) "aLQ" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_21" @@ -11327,33 +11351,11 @@ "aLZ" = ( /obj/structure/surface/table/almayer, /obj/item/tool/pen, -/obj/structure/machinery/door_control{ - id = "researchlockdownext"; - name = "Research Exterior Lockdown"; - pixel_x = -5; - pixel_y = -20; - range = 20; - req_access_txt = "5" - }, -/obj/structure/machinery/door_control{ - id = "researchlockdownint"; - name = "Research Interior Lockdown"; - pixel_x = 5; - pixel_y = -20; - range = 20; - req_access_txt = "5" - }, /obj/item/paper_bin/wy, -/obj/structure/machinery/door_control{ - id = "containmentlockdown_S"; - name = "Containment Exterior Lockdown"; - pixel_x = -25; - range = 20; - req_one_access_txt = "19;14" - }, /obj/structure/machinery/computer/cameras/containment{ dir = 4; layer = 2.981; + name = "Research Cameras"; pixel_y = 16 }, /obj/item/clothing/accessory/stethoscope, @@ -11363,30 +11365,45 @@ }, /area/almayer/medical/upper_medical) "aMd" = ( -/obj/structure/machinery/door/airlock/almayer/research/reinforced{ - dir = 1; - name = "\improper Containment Airlock" +/obj/structure/filingcabinet/seeds{ + density = 0; + pixel_x = 5; + pixel_y = 16 }, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - id = "containmentlockdown_S"; - name = "\improper Containment Lockdown" +/obj/structure/filingcabinet/disk{ + density = 0; + pixel_x = -11; + pixel_y = 16 }, -/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "mono" }, -/area/almayer/medical/containment) +/area/almayer/medical/hydroponics) "aMg" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/sign/safety/intercom{ + layer = 2.9; + pixel_x = -6; + pixel_y = 29 }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/machinery/botany/extractor{ + density = 0; + pixel_x = 15; + pixel_y = 16 + }, +/obj/item/device/flashlight/pen{ + pixel_x = 14; + pixel_y = 15 + }, +/obj/structure/machinery/vending/hydroseeds{ + density = 0; + pixel_x = -7; + pixel_y = 16; + req_access_txt = "28" }, /turf/open/floor/almayer{ - icon_state = "sterile_green_side" + icon_state = "mono" }, -/area/almayer/medical/medical_science) +/area/almayer/medical/hydroponics) "aMh" = ( /obj/structure/machinery/light{ dir = 8 @@ -11734,28 +11751,40 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/alpha) "aNY" = ( -/obj/structure/bed/chair/office/dark, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, /turf/open/floor/almayer{ - icon_state = "dark_sterile" + icon_state = "sterile_green_side" }, -/area/almayer/medical/medical_science) +/area/almayer/medical/containment) "aOd" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, /turf/open/floor/almayer{ - dir = 9; + dir = 5; icon_state = "sterile_green_side" }, -/area/almayer/medical/medical_science) +/area/almayer/medical/containment) "aOe" = ( -/obj/structure/pipes/vents/pump{ - dir = 8 +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/spray/cleaner{ + desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; + name = "Surgery Cleaner" }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/area/almayer/medical/medical_science) +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer/research/containment/corner{ + dir = 1 + }, +/area/almayer/medical/containment/cell) "aOg" = ( /obj/structure/bed/sofa/south/grey{ pixel_y = 12 @@ -12124,13 +12153,15 @@ }, /area/almayer/command/cic) "aPJ" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/area/almayer/medical/medical_science) +/turf/open/floor/almayer/research/containment/corner2, +/area/almayer/medical/containment/cell) "aPK" = ( /obj/structure/sign/nosmoking_1, /turf/closed/wall/almayer, @@ -12324,38 +12355,39 @@ }, /area/almayer/living/grunt_rnr) "aQZ" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/machinery/botany/editor{ + density = 0; + pixel_x = 5; + pixel_y = 16 }, -/turf/open/floor/almayer{ - dir = 6; - icon_state = "sterile_green_side" +/obj/item/clothing/glasses/science{ + pixel_x = 5; + pixel_y = 24 }, -/area/almayer/medical/medical_science) -"aRc" = ( /turf/open/floor/almayer{ - dir = 4; - icon_state = "sterile_green_side" + icon_state = "mono" }, -/area/almayer/medical/medical_science) +/area/almayer/medical/hydroponics) "aRd" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/door/window/westright, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 4; - id = "researchlockdownext"; - name = "\improper Research Lockdown" - }, /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/machinery/door/window/westright{ dir = 4; req_access_txt = "28" }, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + dir = 8; + id = "researchlockdownext_windoor"; + name = "\improper Research Windoor Shutter" + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + dir = 4; + id = "Containment Breach"; + name = "\improper Secure Airlock" + }, /turf/open/floor/almayer{ - icon_state = "sterile_green" + icon_state = "test_floor4" }, /area/almayer/medical/medical_science) "aRi" = ( @@ -12605,8 +12637,13 @@ "aSl" = ( /obj/structure/machinery/light, /obj/structure/machinery/cm_vending/sorted/medical, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, /turf/open/floor/almayer{ - icon_state = "sterile_green_side" + dir = 4; + icon_state = "sterile_green_corner" }, /area/almayer/medical/medical_science) "aSm" = ( @@ -12615,45 +12652,32 @@ }, /area/almayer/hull/lower_hull/l_m_s) "aSn" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/centrifuge{ - pixel_x = -2; - pixel_y = 7 - }, -/obj/structure/sign/safety/ref_bio_storage{ - pixel_x = 15; - pixel_y = -32 +/obj/item/stack/sheet/mineral/plastic{ + amount = 15 }, -/obj/structure/sign/safety/biohazard{ - pixel_y = -32 +/obj/item/stack/sheet/glass{ + amount = 20; + pixel_x = 3; + pixel_y = 3 }, /turf/open/floor/almayer{ - icon_state = "sterile_green_side" + icon_state = "test_floor4" }, -/area/almayer/medical/medical_science) +/area/almayer/medical/hydroponics) "aSo" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/firstaid/o2{ - pixel_x = -6; - pixel_y = 6 - }, -/obj/item/storage/firstaid/fire{ - pixel_x = 8; - pixel_y = 6 - }, -/obj/item/storage/firstaid/adv{ - pixel_x = -6; - pixel_y = -2 +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 }, -/obj/item/storage/firstaid/toxin{ - pixel_x = 8; - pixel_y = -2 +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1 }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "sterile_green_corner" +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/area/almayer/medical/medical_science) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/medical/hydroponics) "aSq" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/chem_dispenser/soda, @@ -16218,18 +16242,16 @@ }, /area/almayer/hull/upper_hull/u_a_s) "bkT" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/cameras/containment{ - dir = 4; - layer = 2.99; - pixel_y = 16 +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/obj/structure/machinery/computer/med_data/laptop{ - dir = 4; - layer = 2.991 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/turf/open/floor/wood/ship, -/area/almayer/medical/medical_science) +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/medical/hydroponics) "bkU" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -16806,9 +16828,6 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/lower_medical_lobby) -"bnL" = ( -/turf/open/floor/wood/ship, -/area/almayer/medical/medical_science) "bnR" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -17927,12 +17946,11 @@ /turf/open/floor/carpet, /area/almayer/command/corporateliason) "btC" = ( -/obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 4 + dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ - dir = 10; icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) @@ -21132,6 +21150,12 @@ icon_state = "kitchen" }, /area/almayer/living/grunt_rnr) +"bIM" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/medical/hydroponics) "bIN" = ( /obj/structure/bed/chair/office/dark, /turf/open/floor/plating/plating_catwalk, @@ -22852,13 +22876,7 @@ }, /area/almayer/squads/req) "bPF" = ( -/obj/structure/pipes/standard/simple/hidden{ - dir = 5 - }, -/obj/structure/bed, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, +/turf/closed/wall/almayer/white/outer_tile, /area/almayer/medical/medical_science) "bPG" = ( /obj/effect/decal/warning_stripes{ @@ -23535,10 +23553,17 @@ }, /area/almayer/hallways/hangar) "bST" = ( -/turf/closed/wall/almayer/research/containment/wall/purple{ - dir = 4 +/obj/structure/closet/secure_closet/hydroresearch, +/obj/item/reagent_container/glass/watertank, +/obj/item/reagent_container/glass/watertank, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, -/area/almayer/medical/containment/cell) +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/medical/hydroponics) "bSY" = ( /obj/structure/disposalpipe/junction{ dir = 4 @@ -24107,17 +24132,12 @@ }, /area/almayer/shipboard/port_point_defense) "bVe" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/item/reagent_container/food/snacks/cheesewedge, +/obj/structure/closet/l3closet/general, /obj/structure/window/reinforced{ dir = 8; health = 80 }, -/turf/open/floor/almayer{ - icon_state = "sterile_green" - }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/medical/medical_science) "bVi" = ( /obj/structure/disposalpipe/segment{ @@ -25384,24 +25404,15 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/operating_room_three) -"cba" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "sterile_green_side" - }, -/area/almayer/medical/testlab) "cbg" = ( -/obj/structure/machinery/flasher{ - alpha = 1; - id = "Containment Cell 3"; - layer = 2.1; - name = "Mounted Flash"; - pixel_y = 30 +/obj/structure/machinery/door/airlock/almayer/command{ + dir = 2; + name = "\improper Command Ladder" }, -/turf/open/floor/almayer/research/containment/floor2{ - dir = 1 +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, -/area/almayer/medical/containment/cell) +/area/almayer/medical/medical_science) "cbh" = ( /obj/structure/machinery/cm_vending/clothing/pilot_officer{ density = 0; @@ -26378,6 +26389,12 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/repair_bay) +"cfT" = ( +/turf/open/floor/almayer{ + dir = 10; + icon_state = "sterile_green_side" + }, +/area/almayer/medical/medical_science) "cgl" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/machinery/door/airlock/multi_tile/almayer/marine/shared/charlie_delta{ @@ -27952,11 +27969,13 @@ }, /area/almayer/hull/upper_hull/u_a_s) "coJ" = ( -/obj/structure/pipes/vents/pump, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, /turf/open/floor/almayer{ icon_state = "sterile_green" }, -/area/almayer/medical/medical_science) +/area/almayer/medical/containment) "coT" = ( /obj/structure/machinery/status_display{ pixel_y = 30 @@ -27969,11 +27988,10 @@ }, /area/almayer/shipboard/starboard_point_defense) "coZ" = ( -/obj/structure/machinery/portable_atmospherics/hydroponics, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" +/turf/open/floor/almayer/research/containment/corner{ + dir = 4 }, -/area/almayer/medical/hydroponics) +/area/almayer/medical/containment/cell) "cpf" = ( /obj/structure/ladder{ height = 2; @@ -28955,8 +28973,47 @@ /turf/closed/wall/almayer, /area/almayer/shipboard/sea_office) "cJM" = ( -/turf/closed/wall/almayer/white/outer_tile, -/area/almayer/medical/hydroponics) +/obj/structure/machinery/door_display/research_cell{ + dir = 8; + has_wall_divider = 1; + id = "Containment Cell 3"; + layer = 3.2; + name = "Cell 3 Control"; + pixel_x = 16; + pixel_y = -16 + }, +/obj/structure/machinery/door_display/research_cell{ + dir = 8; + has_wall_divider = 1; + id = "Containment Cell 2"; + layer = 3.2; + name = "Cell 2 Control"; + pixel_x = 16; + pixel_y = 16 + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/structure/machinery/door_control{ + id = "W_Containment Cell 2"; + name = "Containment Lockdown"; + pixel_x = 13; + pixel_y = 7; + req_one_access_txt = "19;28" + }, +/obj/structure/machinery/door_control{ + id = "W_Containment Cell 3"; + name = "Containment Lockdown"; + pixel_x = 13; + pixel_y = -6; + req_one_access_txt = "19;28" + }, +/turf/open/floor/almayer{ + icon_state = "sterile_green" + }, +/area/almayer/medical/containment) "cJP" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -29034,15 +29091,6 @@ /obj/structure/bed/chair, /turf/open/floor/almayer, /area/almayer/squads/alpha_bravo_shared) -"cLI" = ( -/obj/structure/sign/safety/waterhazard{ - pixel_x = 8; - pixel_y = -32 - }, -/turf/open/floor/almayer{ - icon_state = "sterile_green_side" - }, -/area/almayer/medical/hydroponics) "cLN" = ( /obj/structure/machinery/cryopod{ layer = 3.1; @@ -29174,20 +29222,17 @@ }, /area/almayer/engineering/upper_engineering/starboard) "cQo" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/light, -/obj/structure/machinery/reagentgrinder{ - pixel_y = 8 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 }, -/obj/item/stack/sheet/mineral/phoron{ - amount = 25; - pixel_x = 3; - pixel_y = 3 +/obj/effect/decal/warning_stripes{ + icon_state = "W" }, /turf/open/floor/almayer{ + dir = 8; icon_state = "sterile_green_side" }, -/area/almayer/medical/medical_science) +/area/almayer/medical/containment) "cQv" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/brig/general_equipment) @@ -29276,16 +29321,6 @@ icon_state = "red" }, /area/almayer/shipboard/starboard_missiles) -"cSK" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/centrifuge{ - pixel_y = 7 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_side" - }, -/area/almayer/medical/medical_science) "cSN" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/light{ @@ -29509,6 +29544,15 @@ icon_state = "red" }, /area/almayer/hull/upper_hull/u_a_p) +"cXC" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + icon_state = "sterile_green_side" + }, +/area/almayer/medical/containment) "cXF" = ( /obj/structure/machinery/flasher{ alpha = 1; @@ -30224,18 +30268,18 @@ icon_state = "silverfull" }, /area/almayer/command/computerlab) -"dnx" = ( -/obj/structure/machinery/portable_atmospherics/hydroponics, -/obj/structure/machinery/light, +"dnC" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, /turf/open/floor/almayer{ - icon_state = "sterile_green_side" + icon_state = "sterile_green_corner" }, /area/almayer/medical/hydroponics) -"dnC" = ( -/turf/closed/wall/almayer/research/containment/wall/purple{ - dir = 1 - }, -/area/almayer/medical/containment/cell) "dnE" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -30482,17 +30526,25 @@ }, /area/almayer/hallways/port_hallway) "drT" = ( -/obj/structure/machinery/light{ - dir = 4 +/obj/structure/machinery/camera/autoname/almayer{ + dir = 4; + name = "ship-grade camera" }, -/obj/structure/machinery/medical_pod/sleeper{ - dir = 8 +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, +/obj/structure/surface/rack, +/obj/item/storage/fancy/vials, +/obj/item/storage/fancy/vials, +/obj/item/storage/fancy/vials, +/obj/item/storage/fancy/vials, +/obj/item/storage/fancy/vials, +/obj/item/storage/fancy/vials, /turf/open/floor/almayer{ - dir = 4; - icon_state = "sterile_green_side" + icon_state = "sterile_green" }, -/area/almayer/medical/medical_science) +/area/almayer/medical/hydroponics) "dsk" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -30679,11 +30731,13 @@ /turf/open/floor/almayer, /area/almayer/living/briefing) "dwr" = ( -/turf/open/floor/almayer{ - dir = 10; - icon_state = "sterile_green_side" +/obj/structure/surface/table/almayer, +/obj/structure/machinery/centrifuge{ + layer = 3.1; + pixel_y = 4 }, -/area/almayer/medical/containment) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/medical/medical_science) "dwA" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/sign/safety/bathunisex{ @@ -30769,6 +30823,17 @@ icon_state = "red" }, /area/almayer/shipboard/brig/lobby) +"dyb" = ( +/obj/structure/machinery/smartfridge/chemistry, +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = 28 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/medical/medical_science) "dyd" = ( /obj/structure/bed/chair/office/dark{ dir = 1 @@ -30859,18 +30924,15 @@ }, /area/almayer/command/cic) "dBj" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 8; - name = "ship-grade camera" - }, -/obj/structure/machinery/medical_pod/bodyscanner{ - dir = 8 +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, /turf/open/floor/almayer{ dir = 4; icon_state = "sterile_green_side" }, -/area/almayer/medical/medical_science) +/area/almayer/medical/hydroponics) "dBp" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 8; @@ -31053,29 +31115,21 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_f_p) -"dEl" = ( -/obj/structure/surface/table/almayer, -/obj/item/reagent_container/glass/beaker/large, -/obj/item/reagent_container/glass/beaker/large, -/obj/item/reagent_container/glass/beaker{ - pixel_x = 5 - }, -/obj/item/reagent_container/glass/beaker{ - pixel_x = 5 - }, -/obj/item/reagent_container/dropper, -/obj/structure/machinery/firealarm{ - dir = 8; - pixel_x = -24 +"dEm" = ( +/obj/structure/machinery/power/apc/almayer, +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/obj/item/reagent_container/glass/beaker/bluespace{ - pixel_y = 12 +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, +/obj/structure/reagent_dispensers/fueltank/custom, /turf/open/floor/almayer{ - dir = 8; - icon_state = "sterile_green_side" + dir = 4; + icon_state = "sterile_green_corner" }, -/area/almayer/medical/medical_science) +/area/almayer/medical/containment/cell) "dEn" = ( /obj/structure/machinery/firealarm{ pixel_y = -28 @@ -31188,11 +31242,6 @@ /obj/structure/largecrate/random/case/double, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_a_p) -"dGB" = ( -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/almayer/medical/containment) "dGC" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment, @@ -31294,6 +31343,17 @@ icon_state = "sterile_green_side" }, /area/almayer/shipboard/brig/surgery) +"dHV" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/pipes/unary/freezer{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/medical/medical_science) "dHZ" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/almayer/open{ @@ -31420,12 +31480,10 @@ }, /area/almayer/living/cryo_cells) "dMK" = ( -/obj/structure/machinery/portable_atmospherics/hydroponics, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "sterile_green_corner" +/turf/closed/wall/almayer/research/containment/wall/corner{ + dir = 8 }, -/area/almayer/medical/hydroponics) +/area/almayer/medical/containment/cell) "dNe" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -31433,6 +31491,19 @@ }, /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_f_p) +"dNq" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/sink{ + pixel_y = 24 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "sterile_green_side" + }, +/area/almayer/medical/containment) "dNt" = ( /obj/structure/window/framed/almayer/hull/hijack_bustable, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ @@ -31531,6 +31602,16 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_f_p) +"dRh" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/medical/hydroponics) "dRv" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -31706,6 +31787,15 @@ icon_state = "dark_sterile" }, /area/almayer/medical/operating_room_two) +"dVd" = ( +/obj/structure/machinery/seed_extractor{ + density = 0; + pixel_y = 16 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/medical/hydroponics) "dVe" = ( /turf/open/floor/almayer{ dir = 1; @@ -31713,21 +31803,10 @@ }, /area/almayer/living/briefing) "dVu" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 2; - id = "researchlockdownint"; - name = "\improper Research Lockdown" - }, -/obj/structure/machinery/door/airlock/almayer/research/glass/reinforced{ - dir = 1; - name = "\improper Medical Research Wing" - }, +/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 4; + icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) "dVO" = ( @@ -31934,11 +32013,21 @@ /turf/open/floor/almayer, /area/almayer/living/port_emb) "ean" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "sterile_green_side" +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 4; + id = "W_Containment Cell 3"; + name = "\improper Containment Cell 5"; + unacidable = 1 }, -/area/almayer/medical/hydroponics) +/obj/structure/machinery/door/poddoor/almayer/open{ + dir = 4; + id = "Containment Breach"; + name = "\improper Secure Airlock" + }, +/turf/closed/wall/almayer/research/containment/wall/purple{ + dir = 4 + }, +/area/almayer/medical/containment/cell) "eas" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -32041,15 +32130,6 @@ icon_state = "orange" }, /area/almayer/engineering/engineering_workshop) -"ecx" = ( -/obj/structure/transmitter{ - name = "Researcher Office Telephone"; - phone_category = "Almayer"; - phone_id = "Research"; - pixel_y = 29 - }, -/turf/open/floor/wood/ship, -/area/almayer/medical/medical_science) "ecM" = ( /obj/structure/bed/chair{ dir = 4 @@ -32101,18 +32181,11 @@ }, /area/almayer/shipboard/navigation) "edv" = ( -/obj/structure/bed/chair, -/obj/structure/machinery/door_control{ - id = "containmentlockdown_S"; - name = "Containment Lockdown"; - pixel_y = 28; - req_one_access_txt = "19;28" - }, +/obj/structure/bed/sofa/south/white/left, /turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_side" + icon_state = "sterile_green" }, -/area/almayer/medical/upper_medical) +/area/almayer/medical/medical_science) "edx" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/sign/safety/maint{ @@ -32412,15 +32485,18 @@ }, /area/almayer/medical/operating_room_two) "eiE" = ( -/obj/structure/pipes/standard/manifold/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/machinery/light{ + unacidable = 1; + unslashable = 1 }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" +/obj/structure/machinery/optable, +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/area/almayer/medical/medical_science) +/turf/open/floor/almayer/research/containment/floor2{ + dir = 1 + }, +/area/almayer/medical/containment/cell) "eiH" = ( /obj/structure/sink{ pixel_y = 24 @@ -32533,21 +32609,6 @@ "eky" = ( /turf/open/floor/almayer, /area/almayer/command/lifeboat) -"ekF" = ( -/obj/structure/machinery/door/airlock/almayer/research/glass/reinforced{ - id = "Containment Cell 2"; - locked = 1; - name = "\improper Containment Cell 2" - }, -/obj/structure/machinery/door/poddoor/shutters/almayer/containment{ - dir = 4; - id = "Containment Cell 2"; - name = "\improper Containment Cell 2" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/medical/containment/cell) "ekY" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -32606,26 +32667,11 @@ icon_state = "dark_sterile" }, /area/almayer/medical/operating_room_one) -"elH" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8; - layer = 3.25 - }, -/turf/open/floor/wood/ship, -/area/almayer/medical/medical_science) "elR" = ( -/obj/structure/surface/table/almayer, -/obj/item/paper_bin/wy{ - pixel_y = 7 - }, -/obj/item/tool/pen{ - pixel_y = 8 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_corner" +/turf/closed/wall/almayer/research/containment/wall/corner{ + dir = 1 }, -/area/almayer/medical/testlab) +/area/almayer/medical/containment/cell) "eme" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -32666,14 +32712,9 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_a_p) "emK" = ( -/obj/structure/machinery/door_control{ - id = "containmentlockdown_E"; - name = "Containment Lockdown"; - pixel_x = -25; - req_one_access_txt = "19;28" - }, +/obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ - dir = 8; + dir = 10; icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) @@ -32686,18 +32727,6 @@ icon_state = "test_floor4" }, /area/almayer/command/corporateliason) -"emR" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/toolbox/mechanical{ - pixel_x = 3; - pixel_y = 5 - }, -/obj/item/storage/toolbox/electrical, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "sterile_green_side" - }, -/area/almayer/medical/testlab) "ene" = ( /turf/open/floor/almayer{ dir = 4; @@ -32739,12 +32768,6 @@ icon_state = "red" }, /area/almayer/shipboard/brig/main_office) -"eoz" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "sterile_green_side" - }, -/area/almayer/medical/containment) "eoG" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -32845,10 +32868,10 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" +/turf/open/floor/almayer/research/containment/floor2{ + dir = 1 }, -/area/almayer/medical/testlab) +/area/almayer/medical/containment/cell) "eqI" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = 25 @@ -33063,11 +33086,6 @@ icon_state = "test_floor4" }, /area/almayer/living/officer_study) -"euB" = ( -/turf/open/floor/almayer{ - icon_state = "sterile_green_corner" - }, -/area/almayer/medical/testlab) "euN" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out" @@ -33380,13 +33398,10 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/starboard_umbilical) "eBO" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, -/obj/structure/machinery/iv_drip, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/bed, /turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_side" + icon_state = "mono" }, /area/almayer/medical/medical_science) "eBV" = ( @@ -33863,17 +33878,15 @@ }, /area/almayer/hull/lower_hull/l_f_s) "eNI" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/structure/machinery/autodispenser{ - dir = 4 +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 4; + id = "containmentlockdown_S"; + name = "\improper Containment Lockdown" }, /turf/open/floor/almayer{ - dir = 8; - icon_state = "sterile_green_side" + icon_state = "test_floor4" }, -/area/almayer/medical/medical_science) +/area/almayer/medical/containment) "eNL" = ( /obj/structure/surface/table/almayer, /obj/item/stack/sheet/cardboard{ @@ -33882,25 +33895,6 @@ }, /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_f_p) -"eNP" = ( -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = 28 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_side" - }, -/area/almayer/medical/medical_science) -"eNT" = ( -/obj/structure/bed/chair/office/dark{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/almayer/medical/testlab) "eOh" = ( /turf/open/floor/almayer{ dir = 1; @@ -34047,14 +34041,12 @@ }, /area/almayer/lifeboat_pumps/south1) "eSo" = ( -/obj/structure/surface/table/almayer, -/obj/effect/spawner/random/toolbox, -/obj/item/tool/extinguisher, +/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ - dir = 4; - icon_state = "sterile_green_corner" + dir = 5; + icon_state = "sterile_green_side" }, -/area/almayer/medical/containment) +/area/almayer/medical/medical_science) "eSJ" = ( /obj/structure/surface/table/woodentable/fancy, /obj/structure/transmitter/rotary{ @@ -34239,16 +34231,18 @@ /area/almayer/living/chapel) "eVT" = ( /obj/structure/surface/table/almayer, -/obj/item/storage/box/gloves{ - pixel_x = 5; - pixel_y = 8 +/obj/item/paper_bin/wy{ + pixel_x = 6; + pixel_y = 5 }, -/obj/item/storage/box/masks{ - pixel_x = 5 +/obj/item/tool/pen{ + pixel_x = 8 }, -/obj/item/tool/hand_labeler{ - pixel_x = -8; - pixel_y = 3 +/obj/item/clipboard{ + pixel_x = -8 + }, +/obj/item/folder/white{ + pixel_x = -8 }, /turf/open/floor/almayer{ icon_state = "sterile_green_side" @@ -34547,8 +34541,14 @@ /turf/open/floor/almayer, /area/almayer/living/briefing) "fcy" = ( -/turf/closed/wall/almayer/research/containment/wall/west, -/area/almayer/medical/containment/cell) +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/machinery/autolathe, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/medical/hydroponics) "fcB" = ( /turf/open/floor/almayer{ dir = 8; @@ -35017,6 +35017,24 @@ icon_state = "emeraldcorner" }, /area/almayer/squads/charlie) +"foP" = ( +/obj/structure/machinery/shower{ + pixel_y = 16 + }, +/obj/structure/machinery/door_control{ + id = "containmentlockdown_S"; + name = "Containment Lockdown"; + pixel_x = 29; + pixel_y = 3; + req_one_access_txt = "19;28" + }, +/obj/structure/window/reinforced{ + dir = 8; + health = 80; + pixel_y = 6 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/medical/medical_science) "fpd" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -35252,16 +35270,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_p) -"ftG" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/machinery/cm_vending/clothing/medical_crew, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_side" - }, -/area/almayer/medical/medical_science) "fut" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -35441,16 +35449,6 @@ icon_state = "plating" }, /area/almayer/engineering/engine_core) -"fxY" = ( -/obj/structure/machinery/iv_drip, -/obj/structure/machinery/camera/autoname/almayer/containment{ - dir = 1; - name = "ship-grade camera" - }, -/turf/open/floor/almayer{ - icon_state = "sterile_green_side" - }, -/area/almayer/medical/containment) "fxZ" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -35590,11 +35588,17 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/aft_hallway) "fBO" = ( +/obj/structure/machinery/chem_master{ + vial_maker = 1 + }, +/obj/item/clothing/glasses/science{ + pixel_x = 1; + pixel_y = 8 + }, /turf/open/floor/almayer{ - dir = 6; - icon_state = "sterile_green_side" + icon_state = "mono" }, -/area/almayer/medical/containment) +/area/almayer/medical/medical_science) "fCL" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -35799,16 +35803,22 @@ /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) "fGu" = ( -/obj/structure/machinery/firealarm{ - dir = 8; - pixel_x = -24 - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment, +/obj/structure/machinery/door_control{ + dir = 1; + id = "researchlockdownext"; + name = "Window Shutters"; + pixel_x = -26; + pixel_y = 6; + req_access_txt = "28" }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 +/obj/structure/machinery/door_control{ + dir = 1; + id = "researchlockdownext_door"; + name = "Door Shutters"; + pixel_x = -26; + pixel_y = 1; + req_access_txt = "28" }, /turf/open/floor/almayer{ dir = 8; @@ -36841,9 +36851,7 @@ /turf/closed/wall/almayer/research/containment/wall/west, /area/almayer/medical/containment/cell/cl) "ger" = ( -/obj/structure/machinery/chem_master{ - vial_maker = 1 - }, +/obj/structure/surface/table/almayer, /turf/open/floor/almayer{ icon_state = "dark_sterile" }, @@ -36949,6 +36957,15 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/hangar) +"ggl" = ( +/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/medical/medical_science) "ggt" = ( /turf/open/floor/almayer{ dir = 5; @@ -37201,6 +37218,18 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/lower_medical_medbay) +"glB" = ( +/obj/structure/machinery/chem_master{ + vial_maker = 1 + }, +/obj/structure/sign/safety/chem_lab{ + pixel_x = 5; + pixel_y = 29 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/medical/medical_science) "glM" = ( /obj/structure/window/reinforced{ dir = 8; @@ -37358,15 +37387,6 @@ icon_state = "red" }, /area/almayer/shipboard/navigation) -"grN" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 6; - icon_state = "sterile_green_side" - }, -/area/almayer/medical/medical_science) "grR" = ( /turf/open/floor/almayer{ dir = 4; @@ -37694,13 +37714,14 @@ }, /area/almayer/living/gym) "gxP" = ( -/obj/structure/machinery/chem_storage/research{ - dir = 1 +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" +/turf/open/floor/almayer/research/containment/floor2{ + dir = 8 }, -/area/almayer/medical/testlab) +/area/almayer/medical/containment/cell) "gxU" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/status_display{ @@ -37902,11 +37923,11 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/alpha_bravo_shared) "gAS" = ( +/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_corner" + icon_state = "dark_sterile" }, -/area/almayer/medical/containment) +/area/almayer/medical/medical_science) "gBc" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -38097,11 +38118,15 @@ /turf/open/floor/plating, /area/almayer/hallways/hangar) "gGx" = ( +/obj/structure/filingcabinet/chestdrawer{ + density = 0; + pixel_x = -16 + }, +/obj/structure/machinery/iv_drip, /turf/open/floor/almayer{ - dir = 5; - icon_state = "sterile_green_side" + icon_state = "mono" }, -/area/almayer/medical/containment) +/area/almayer/medical/medical_science) "gGI" = ( /obj/structure/disposalpipe/segment, /obj/structure/machinery/light{ @@ -38279,15 +38304,19 @@ }, /area/almayer/engineering/upper_engineering) "gLc" = ( -/obj/structure/surface/rack, -/obj/item/storage/fancy/vials, -/obj/item/storage/fancy/vials, -/obj/item/storage/fancy/vials, -/obj/item/storage/fancy/vials, -/turf/open/floor/almayer{ - icon_state = "sterile_green" +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/area/almayer/medical/medical_science) +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/medical/hydroponics) "gLu" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -38310,11 +38339,6 @@ icon_state = "cargo" }, /area/almayer/engineering/upper_engineering/port) -"gLB" = ( -/turf/open/floor/almayer/research/containment/entrance{ - dir = 8 - }, -/area/almayer/medical/containment/cell) "gLE" = ( /obj/structure/platform{ dir = 1 @@ -38426,6 +38450,12 @@ icon_state = "cargo" }, /area/almayer/engineering/engine_core) +"gNp" = ( +/turf/open/floor/almayer{ + dir = 9; + icon_state = "sterile_green_side" + }, +/area/almayer/medical/medical_science) "gNq" = ( /obj/structure/machinery/cm_vending/sorted/cargo_ammo/squad{ req_access = null; @@ -38532,13 +38562,13 @@ }, /area/almayer/engineering/engineering_workshop/hangar) "gQF" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" +/obj/structure/bed/chair/comfy{ + buckling_y = 2; + dir = 8; + pixel_y = 2 }, -/area/almayer/medical/containment) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/medical/medical_science) "gRd" = ( /obj/structure/platform, /obj/structure/target{ @@ -38706,6 +38736,16 @@ /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/north2) +"gVq" = ( +/obj/structure/machinery/light, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "sterile_green_corner" + }, +/area/almayer/medical/containment) "gVA" = ( /obj/structure/disposalpipe/down/almayer{ dir = 8; @@ -39096,6 +39136,12 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_s) +"hec" = ( +/turf/open/floor/almayer{ + dir = 8; + icon_state = "sterile_green_side" + }, +/area/almayer/medical/medical_science) "hee" = ( /turf/open/floor/almayer{ dir = 4; @@ -39226,9 +39272,6 @@ }, /turf/open/floor/almayer, /area/almayer/engineering/engine_core) -"hgv" = ( -/turf/closed/wall/almayer/white/reinforced, -/area/almayer/medical/testlab) "hgB" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/intel, @@ -39480,8 +39523,16 @@ }, /area/almayer/hallways/starboard_hallway) "hme" = ( -/turf/open/floor/almayer/research/containment/floor2, -/area/almayer/medical/containment/cell) +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_x = -1; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "sterile_green_side" + }, +/area/almayer/medical/hydroponics) "hmy" = ( /obj/structure/machinery/light{ dir = 1 @@ -39521,10 +39572,20 @@ }, /area/almayer/command/cichallway) "hng" = ( -/turf/closed/wall/almayer/research/containment/wall/corner{ - dir = 4 +/obj/structure/surface/table/almayer, +/obj/item/clothing/accessory/storage/black_vest/acid_harness, +/obj/item/clothing/accessory/storage/black_vest/acid_harness, +/obj/structure/machinery/alarm/almayer{ + dir = 1 }, -/area/almayer/medical/containment/cell) +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + icon_state = "sterile_green" + }, +/area/almayer/medical/hydroponics) "hnV" = ( /obj/structure/machinery/light, /turf/open/floor/almayer, @@ -39596,18 +39657,18 @@ /turf/open/floor/almayer, /area/almayer/living/chapel) "hqh" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, /obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor/research{ - name = "\improper Research Laboratory" +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 }, -/area/almayer/medical/medical_science) +/turf/open/floor/almayer/research/containment/entrance, +/area/almayer/medical/containment/cell) "hqs" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -39616,14 +39677,6 @@ icon_state = "cargo" }, /area/almayer/hull/lower_hull/l_f_s) -"hqw" = ( -/turf/open/floor/almayer/research/containment/corner4, -/area/almayer/medical/containment/cell) -"hqL" = ( -/turf/open/floor/almayer/research/containment/corner_var1{ - dir = 4 - }, -/area/almayer/medical/containment/cell) "hqW" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor{ name = "\improper Medical Bay"; @@ -39644,6 +39697,19 @@ icon_state = "redfull" }, /area/almayer/command/cic) +"hrn" = ( +/obj/structure/machinery/door/airlock/almayer/research/glass/reinforced{ + name = "\improper Research Reception Laboratory" + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + dir = 8; + id = "Containment Breach"; + name = "\improper Secure Airlock" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/medical/medical_science) "hrF" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -39879,11 +39945,6 @@ icon_state = "plate" }, /area/almayer/squads/charlie_delta_shared) -"hyp" = ( -/turf/open/floor/almayer/research/containment/floor2{ - dir = 1 - }, -/area/almayer/medical/containment/cell) "hyw" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -40213,34 +40274,12 @@ }, /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_f_p) -"hER" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "sterile_green_side" - }, -/area/almayer/medical/containment) -"hEU" = ( -/obj/structure/surface/table/almayer, -/obj/item/reagent_container/glass/beaker{ - pixel_x = 8 - }, -/obj/item/reagent_container/spray/cleaner{ - pixel_x = -3 - }, -/obj/item/reagent_container/dropper{ - pixel_y = -3 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_corner" - }, -/area/almayer/medical/containment) "hEV" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) "hFC" = ( -/obj/structure/bed/chair/office/dark, +/obj/structure/bed/chair/comfy, /turf/open/floor/almayer{ dir = 8; icon_state = "sterile_green_side" @@ -40431,9 +40470,19 @@ }, /area/almayer/hull/upper_hull/u_f_s) "hKl" = ( -/obj/structure/disposalpipe/segment, -/turf/closed/wall/almayer/white/outer_tile, -/area/almayer/medical/medical_science) +/obj/structure/pipes/vents/pump, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/medical/hydroponics) "hKq" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = 25 @@ -40566,19 +40615,15 @@ /turf/open/floor/almayer, /area/almayer/hallways/port_hallway) "hPe" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, +/obj/structure/disposalpipe/segment, +/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor/research, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 2; - id = "researchlockdownint"; - name = "\improper Research Lockdown" + id = "researchlockdownext_door"; + name = "\improper Research Doorway Shutter" }, -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/machinery/door/airlock/almayer/research/glass/reinforced{ - dir = 1; - name = "\improper Medical Research Wing" +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "Containment Breach"; + name = "\improper Secure Airlock" }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -40608,21 +40653,17 @@ }, /area/almayer/hallways/stern_hallway) "hPN" = ( -/obj/structure/machinery/door/airlock/almayer/research/glass/reinforced{ - id = "Containment Cell 1"; - locked = 1; - name = "\improper Containment Cell 1" - }, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - dir = 4; - id = "Containment Cell 1"; - name = "\improper Containment Cell 1"; - unacidable = 1 +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 5; + icon_state = "sterile_green_side" }, -/area/almayer/medical/containment/cell) +/area/almayer/medical/hydroponics) "hPT" = ( /obj/structure/largecrate/random/case/small, /turf/open/floor/almayer{ @@ -40675,6 +40716,17 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) +"hRa" = ( +/obj/structure/machinery/vending/snack{ + pixel_x = -7 + }, +/obj/structure/machinery/vending/coffee{ + pixel_x = 14 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/medical/medical_science) "hRd" = ( /obj/structure/machinery/vending/coffee, /turf/open/floor/almayer{ @@ -40882,15 +40934,6 @@ /obj/effect/landmark/yautja_teleport, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_s) -"hUR" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - icon_state = "sterile_green_side" - }, -/area/almayer/medical/medical_science) "hUW" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -40901,31 +40944,24 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cic_hallway) -"hVz" = ( -/obj/structure/machinery/light{ +"hVf" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 }, /turf/open/floor/almayer{ - dir = 1; + dir = 6; icon_state = "sterile_green_side" }, -/area/almayer/medical/upper_medical) -"hVO" = ( -/obj/structure/closet/l3closet/general, +/area/almayer/medical/medical_science) +"hVz" = ( /obj/structure/machinery/light{ - dir = 4 - }, -/obj/structure/sign/safety/biolab{ - pixel_y = 32 - }, -/obj/structure/sign/safety/biohazard{ - pixel_x = 15; - pixel_y = 32 + dir = 1 }, /turf/open/floor/almayer{ - icon_state = "sterile_green_corner" + dir = 1; + icon_state = "sterile_green_side" }, -/area/almayer/medical/containment) +/area/almayer/medical/upper_medical) "hWa" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/ashtray/plastic, @@ -41184,9 +41220,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) -"icM" = ( -/turf/closed/wall/almayer/research/containment/wall/north, -/area/almayer/medical/containment/cell) "icX" = ( /obj/structure/machinery/brig_cell/perma_2{ pixel_x = -32; @@ -41644,10 +41677,15 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) "inL" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, /turf/open/floor/almayer{ - icon_state = "sterile_green_corner" + dir = 8; + icon_state = "sterile_green_side" }, -/area/almayer/medical/containment) +/area/almayer/medical/medical_science) "inN" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/manifold/hidden/supply{ @@ -41717,17 +41755,25 @@ }, /area/almayer/hull/upper_hull/u_m_s) "ipQ" = ( -/obj/structure/window/reinforced{ - dir = 8; - health = 80 +/obj/structure/surface/rack, +/obj/item/storage/fancy/vials/empty, +/obj/item/storage/fancy/vials/empty, +/obj/item/storage/fancy/vials/empty, +/obj/item/storage/fancy/vials/empty, +/obj/item/storage/fancy/vials/empty, +/obj/item/storage/fancy/vials/empty, +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/obj/structure/machinery/door/window/southleft{ - req_access_txt = "28" +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_x = -29 }, /turf/open/floor/almayer{ icon_state = "sterile_green" }, -/area/almayer/medical/medical_science) +/area/almayer/medical/hydroponics) "ipT" = ( /obj/structure/surface/rack, /obj/effect/spawner/random/toolbox, @@ -41798,9 +41844,6 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south2) -"irA" = ( -/turf/closed/wall/almayer/white/reinforced, -/area/almayer/medical/containment) "irI" = ( /obj/structure/sign/safety/maint{ pixel_y = 32 @@ -41834,6 +41877,18 @@ }, /turf/open/floor/plating, /area/almayer/living/port_emb) +"irU" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + icon_state = "sterile_green_side" + }, +/area/almayer/medical/medical_science) "isC" = ( /obj/effect/projector{ name = "Almayer_AresDown"; @@ -42069,6 +42124,22 @@ icon_state = "dark_sterile" }, /area/almayer/engineering/laundry) +"iwJ" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_y = -1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/turf/open/floor/almayer/research/containment/entrance{ + dir = 8 + }, +/area/almayer/medical/containment/cell) "iwW" = ( /obj/structure/bed/chair/comfy/beige, /turf/open/floor/carpet, @@ -42232,12 +42303,15 @@ /turf/open/floor/almayer, /area/almayer/hallways/hangar) "iAz" = ( -/obj/structure/pipes/standard/manifold/hidden/supply, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, /turf/open/floor/almayer{ - dir = 1; + dir = 10; icon_state = "sterile_green_side" }, -/area/almayer/medical/medical_science) +/area/almayer/medical/containment) "iAB" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = -25 @@ -42831,13 +42905,6 @@ icon_state = "plate" }, /area/almayer/command/cichallway) -"iQo" = ( -/obj/structure/closet/l3closet/general, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_side" - }, -/area/almayer/medical/containment) "iQt" = ( /obj/structure/largecrate/random/case/small, /obj/item/toy/deck{ @@ -42898,16 +42965,21 @@ /turf/open/floor/almayer, /area/almayer/living/gym) "iRN" = ( -/obj/structure/filingcabinet/seeds, -/obj/structure/sign/safety/intercom{ - pixel_x = 8; - pixel_y = 32 +/obj/structure/machinery/light/containment{ + dir = 4 }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_side" +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, -/area/almayer/medical/hydroponics) +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer/research/containment/corner_var1{ + dir = 4 + }, +/area/almayer/medical/containment/cell) "iRS" = ( /obj/item/trash/chips, /turf/open/floor/plating, @@ -42996,13 +43068,26 @@ /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_f_p) "iUo" = ( -/obj/structure/pipes/vents/scrubber{ - dir = 8 +/obj/structure/sign/safety/terminal{ + pixel_x = 7; + pixel_y = -25 + }, +/obj/structure/surface/rack, +/obj/item/storage/box/autoinjectors{ + pixel_x = 7; + pixel_y = 5 + }, +/obj/item/storage/box/beakers{ + pixel_x = -6; + pixel_y = 5 + }, +/obj/item/storage/box/sprays{ + pixel_y = -3 }, /turf/open/floor/almayer{ - icon_state = "dark_sterile" + icon_state = "mono" }, -/area/almayer/medical/containment) +/area/almayer/medical/hydroponics) "iUZ" = ( /obj/docking_port/stationary/escape_pod/cl, /turf/open/floor/plating, @@ -43148,13 +43233,19 @@ /turf/open/floor/almayer, /area/almayer/living/tankerbunks) "iYf" = ( -/obj/structure/machinery/camera/autoname/almayer/containment{ - dir = 4 +/obj/structure/machinery/cm_vending/clothing/medical_crew{ + density = 0; + pixel_y = 16 }, -/turf/open/floor/almayer/research/containment/floor2{ - dir = 8 +/obj/structure/window/reinforced{ + dir = 8; + health = 80 }, -/area/almayer/medical/containment/cell) +/turf/open/floor/almayer{ + dir = 1; + icon_state = "cargo_arrow" + }, +/area/almayer/medical/hydroponics) "iYi" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out" @@ -43390,6 +43481,14 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) +"jbK" = ( +/obj/structure/bed/chair/comfy{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "sterile_green" + }, +/area/almayer/medical/containment) "jbO" = ( /obj/structure/machinery/cm_vending/sorted/medical, /turf/open/floor/almayer{ @@ -43478,11 +43577,20 @@ /turf/closed/wall/almayer, /area/almayer/squads/alpha_bravo_shared) "jeq" = ( -/obj/structure/window/reinforced, +/obj/structure/surface/rack, +/obj/item/storage/box/pillbottles{ + pixel_x = 6; + pixel_y = 7 + }, +/obj/item/storage/box/pillbottles{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/storage/box/pillbottles, /turf/open/floor/almayer{ - icon_state = "sterile_green" + icon_state = "mono" }, -/area/almayer/medical/medical_science) +/area/almayer/medical/hydroponics) "jew" = ( /obj/structure/surface/table/reinforced/black, /turf/open/floor/almayer{ @@ -43600,6 +43708,18 @@ icon_state = "kitchen" }, /area/almayer/living/grunt_rnr) +"jgg" = ( +/obj/structure/machinery/camera/autoname/almayer/containment{ + dir = 8 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer/research/containment/floor2{ + dir = 8 + }, +/area/almayer/medical/containment/cell) "jgk" = ( /obj/structure/machinery/shower{ dir = 1 @@ -43640,14 +43760,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/notunnel) -"jgA" = ( -/obj/structure/surface/table/almayer, -/obj/item/clothing/accessory/storage/black_vest/acid_harness, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "sterile_green_corner" - }, -/area/almayer/medical/testlab) "jgF" = ( /obj/structure/platform, /turf/open/floor/almayer{ @@ -43789,6 +43901,19 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/main_office) +"jjS" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + icon_state = "sterile_green_corner" + }, +/area/almayer/medical/medical_science) "jjT" = ( /obj/structure/machinery/light, /obj/effect/projector{ @@ -43881,22 +44006,29 @@ }, /area/almayer/shipboard/brig/perma) "jlA" = ( -/obj/structure/window/framed/almayer/white, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/turf/open/floor/plating, -/area/almayer/medical/hydroponics) -"jlG" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, /obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor/research{ - name = "\improper Researcher Study" +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 5; + icon_state = "sterile_green_side" }, -/area/almayer/medical/medical_science) +/area/almayer/medical/containment) +"jlG" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1; + pixel_y = -1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_y = -1 + }, +/turf/open/floor/almayer/research/containment/entrance, +/area/almayer/medical/containment/cell) "jlN" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal3"; @@ -44122,6 +44254,15 @@ icon_state = "plate" }, /area/almayer/living/pilotbunks) +"jrM" = ( +/obj/structure/machinery/camera/autoname/almayer/containment{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "sterile_green_side" + }, +/area/almayer/medical/medical_science) "jss" = ( /obj/structure/bed/chair/comfy{ dir = 8 @@ -44130,16 +44271,17 @@ icon_state = "bluefull" }, /area/almayer/living/captain_mess) -"jtd" = ( -/obj/structure/machinery/portable_atmospherics/hydroponics, -/obj/structure/machinery/light{ - dir = 4 +"jsx" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 }, /turf/open/floor/almayer{ - dir = 4; + dir = 5; icon_state = "sterile_green_side" }, -/area/almayer/medical/hydroponics) +/area/almayer/medical/medical_science) "jtj" = ( /obj/structure/machinery/status_display{ pixel_y = 30 @@ -44414,17 +44556,21 @@ }, /area/almayer/hull/upper_hull/u_a_s) "jBO" = ( -/obj/structure/closet/secure_closet/hydroresearch, -/obj/structure/machinery/power/apc/almayer{ - dir = 1 +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 4; + id = "W_Containment Cell 3"; + name = "\improper Containment Cell 5"; + unacidable = 1 }, -/obj/item/reagent_container/glass/watertank, -/obj/item/reagent_container/glass/watertank, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_side" +/obj/structure/machinery/door/poddoor/almayer/open{ + dir = 4; + id = "Containment Breach"; + name = "\improper Secure Airlock" }, -/area/almayer/medical/hydroponics) +/turf/closed/wall/almayer/research/containment/wall/purple{ + dir = 8 + }, +/area/almayer/medical/containment/cell) "jCa" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk, @@ -44433,9 +44579,6 @@ icon_state = "red" }, /area/almayer/shipboard/brig/main_office) -"jCG" = ( -/turf/closed/wall/almayer/research/containment/wall/connect_w, -/area/almayer/medical/containment/cell) "jCK" = ( /obj/effect/decal/medical_decals{ icon_state = "triagedecalbottomleft"; @@ -44488,6 +44631,20 @@ /obj/item/frame/rack, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_s) +"jFf" = ( +/obj/structure/machinery/shower{ + pixel_y = 16 + }, +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4; + health = 80; + pixel_y = 6 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/medical/medical_science) "jFg" = ( /obj/structure/pipes/standard/cap/hidden{ dir = 4 @@ -44579,15 +44736,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cic_hallway) -"jHs" = ( -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "sterile_green_side" - }, -/area/almayer/medical/medical_science) "jHC" = ( /turf/open/floor/almayer{ dir = 1; @@ -44824,13 +44972,36 @@ /turf/open/floor/almayer, /area/almayer/living/briefing) "jNc" = ( +/obj/structure/machinery/door/airlock/almayer/research/glass/reinforced{ + id = "Containment Cell 3"; + locked = 1; + name = "\improper Containment Cell 3"; + unacidable = 1 + }, +/obj/structure/machinery/door/poddoor/shutters/almayer/containment{ + dir = 4; + id = "Containment Cell 3"; + name = "\improper Containment Cell 3" + }, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + dir = 4; + id = "Containment Breach"; + name = "\improper Secure Airlock" + }, /turf/open/floor/almayer{ - icon_state = "dark_sterile" + icon_state = "test_floor4" }, -/area/almayer/medical/hydroponics) +/area/almayer/medical/containment/cell) "jNq" = ( /obj/structure/closet/secure_closet/personal/cabinet{ req_access = null @@ -44942,6 +45113,11 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_p) +"jQt" = ( +/turf/open/floor/almayer/research/containment/floor2{ + dir = 8 + }, +/area/almayer/medical/containment/cell) "jQA" = ( /obj/structure/pipes/vents/scrubber{ dir = 4 @@ -45150,6 +45326,15 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_a_s) +"jUM" = ( +/obj/structure/machinery/camera/autoname/almayer/containment{ + dir = 8 + }, +/obj/structure/pipes/vents/pump, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/medical/medical_science) "jUW" = ( /obj/effect/step_trigger/clone_cleaner, /obj/effect/decal/warning_stripes{ @@ -45184,6 +45369,15 @@ icon_state = "plate" }, /area/almayer/squads/alpha) +"jVt" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/almayer/research/containment/corner3, +/area/almayer/medical/containment/cell) "jVE" = ( /turf/open/floor/almayer{ icon_state = "test_floor5" @@ -45296,12 +45490,20 @@ /turf/open/floor/almayer, /area/almayer/shipboard/brig/processing) "jZs" = ( -/obj/structure/surface/table/almayer, -/obj/item/clothing/accessory/storage/black_vest/acid_harness, -/turf/open/floor/almayer{ - icon_state = "sterile_green_side" +/obj/structure/machinery/light/containment{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, -/area/almayer/medical/testlab) +/turf/open/floor/almayer/research/containment/corner{ + dir = 1 + }, +/area/almayer/medical/containment/cell) "jZu" = ( /obj/structure/machinery/door_control{ id = "CIC_Conference"; @@ -45453,19 +45655,6 @@ icon_state = "test_floor4" }, /area/almayer/squads/bravo) -"kbf" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer{ - id = "containmentlockdown_N"; - name = "\improper Containment Lockdown" - }, -/obj/structure/machinery/door/airlock/almayer/research/reinforced{ - dir = 1; - name = "\improper Containment Airlock" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/medical/containment) "kbx" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -45492,6 +45681,17 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) +"kbJ" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + dir = 6; + icon_state = "sterile_green_side" + }, +/area/almayer/medical/containment) "kbV" = ( /obj/structure/platform{ dir = 1 @@ -45547,17 +45747,6 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_lobby) -"kex" = ( -/obj/structure/machinery/cm_vending/sorted/medical/blood, -/obj/structure/sign/safety/ref_bio_storage{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_side" - }, -/area/almayer/medical/medical_science) "keO" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -45669,12 +45858,16 @@ "kgs" = ( /obj/structure/window/framed/almayer/white, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ - id = "researchlockdownext"; - name = "\improper Research Lockdown" + id = "researchlockdownext_se_2"; + name = "\improper Research Window Shutter" }, /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 1 }, +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "Containment Breach"; + name = "\improper Secure Airlock" + }, /turf/open/floor/plating, /area/almayer/medical/medical_science) "khd" = ( @@ -45968,12 +46161,6 @@ icon_state = "plate" }, /area/almayer/squads/bravo) -"koL" = ( -/obj/structure/pipes/vents/pump, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/almayer/medical/testlab) "koT" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -46137,17 +46324,6 @@ icon_state = "plate" }, /area/almayer/living/gym) -"krq" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "sterile_green_side" - }, -/area/almayer/medical/medical_science) "krN" = ( /obj/structure/machinery/conveyor{ id = "req_belt" @@ -46561,6 +46737,17 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south2) +"kBo" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1; + pixel_y = -1 + }, +/turf/open/floor/almayer{ + dir = 6; + icon_state = "sterile_green_side" + }, +/area/almayer/medical/medical_science) "kBy" = ( /obj/structure/machinery/ares/processor, /turf/open/floor/almayer/no_build{ @@ -46568,11 +46755,15 @@ }, /area/almayer/command/airoom) "kBP" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, /turf/open/floor/almayer{ - dir = 9; + dir = 4; icon_state = "sterile_green_side" }, -/area/almayer/medical/containment) +/area/almayer/medical/medical_science) "kBY" = ( /obj/structure/machinery/cryopod/right, /turf/open/floor/almayer{ @@ -46582,6 +46773,12 @@ "kCi" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/port_missiles) +"kCj" = ( +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/medical/hydroponics) "kCm" = ( /obj/structure/sign/safety/fire_haz{ pixel_x = 15; @@ -46596,10 +46793,19 @@ /area/almayer/hallways/hangar) "kCE" = ( /obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, /turf/open/floor/almayer{ icon_state = "dark_sterile" }, -/area/almayer/medical/medical_science) +/area/almayer/medical/containment) "kCS" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, @@ -46634,17 +46840,23 @@ }, /area/almayer/medical/lower_medical_medbay) "kDk" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 + dir = 6 }, -/obj/structure/machinery/door/airlock/almayer/research/glass/reinforced{ - name = "\improper Medical Research Workshop" +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1; + pixel_y = -1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "dark_sterile" }, -/area/almayer/medical/testlab) +/area/almayer/medical/containment) "kDt" = ( /obj/structure/machinery/light{ dir = 1 @@ -46776,6 +46988,14 @@ icon_state = "green" }, /area/almayer/hallways/aft_hallway) +"kGQ" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer/research/containment/corner_var1{ + icon_state = "containment_corner_variant_2" + }, +/area/almayer/medical/containment/cell) "kGX" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = 25 @@ -46816,12 +47036,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_p) -"kHB" = ( -/obj/structure/machinery/vending/cola/research, -/turf/open/floor/almayer{ - icon_state = "sterile_green_side" - }, -/area/almayer/medical/medical_science) "kHK" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -47033,20 +47247,19 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/living/briefing) "kNx" = ( -/obj/structure/machinery/door_control{ - id = "containmentlockdown_S"; - name = "Containment Lockdown"; - pixel_y = -20; - req_one_access_txt = "19;28" +/obj/structure/sign/safety/ref_bio_storage{ + pixel_x = -17; + pixel_y = 7 }, -/obj/structure/machinery/light{ - dir = 8 +/obj/structure/sign/safety/biohazard{ + pixel_x = -17; + pixel_y = -7 }, +/obj/structure/machinery/cm_vending/sorted/medical/chemistry, /turf/open/floor/almayer{ - dir = 8; - icon_state = "sterile_green_corner" + icon_state = "mono" }, -/area/almayer/medical/containment) +/area/almayer/medical/medical_science) "kNO" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal3"; @@ -47253,16 +47466,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) -"kSc" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 8; - name = "ship-grade camera" - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "sterile_green_side" - }, -/area/almayer/medical/testlab) "kSd" = ( /obj/item/cell/high/empty, /obj/item/cell/high/empty, @@ -47517,11 +47720,11 @@ }, /area/almayer/command/computerlab) "kXw" = ( -/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ - icon_state = "dark_sterile" + dir = 1; + icon_state = "sterile_green_side" }, -/area/almayer/medical/upper_medical) +/area/almayer/medical/medical_science) "kXJ" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/computer/secure_data{ @@ -47597,6 +47800,20 @@ icon_state = "orange" }, /area/almayer/hallways/port_umbilical) +"kZV" = ( +/obj/structure/machinery/light, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/medical/hydroponics) "lah" = ( /turf/open/floor/almayer{ dir = 6; @@ -47792,8 +48009,23 @@ }, /area/almayer/hull/upper_hull/u_a_p) "lea" = ( -/turf/closed/wall/almayer/research/containment/wall/east, -/area/almayer/medical/containment/cell) +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/medical/hydroponics) "lef" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -47960,6 +48192,14 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/basketball) +"lid" = ( +/obj/structure/machinery/chem_master{ + vial_maker = 1 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/medical/medical_science) "lin" = ( /obj/effect/projector{ name = "Almayer_AresDown"; @@ -47983,6 +48223,25 @@ }, /turf/open/floor/almayer, /area/almayer/command/computerlab) +"liY" = ( +/obj/structure/machinery/flasher{ + id = "Containment Cell 5"; + layer = 2.1; + name = "Mounted Flash"; + pixel_y = 30 + }, +/obj/structure/machinery/iv_drip, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/almayer/research/containment/corner_var1{ + icon_state = "containment_corner_variant_2" + }, +/area/almayer/medical/containment/cell) "liZ" = ( /obj/structure/surface/table/almayer, /obj/item/toy/deck, @@ -48101,30 +48360,19 @@ /turf/open/floor/almayer, /area/almayer/squads/bravo) "lmw" = ( -/obj/structure/pipes/standard/simple/hidden{ - dir = 6 - }, -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = 28 +/obj/structure/closet/l3closet/general, +/obj/structure/machinery/light{ + dir = 8 }, -/obj/structure/bed, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_side" +/obj/structure/window/reinforced{ + dir = 4; + health = 80 }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/medical/medical_science) "lmz" = ( /turf/closed/wall/almayer/white/hull, /area/space) -"lmE" = ( -/obj/structure/reagent_dispensers/fueltank/custom, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_side" - }, -/area/almayer/medical/containment) "lmW" = ( /obj/structure/pipes/vents/pump, /obj/structure/mirror{ @@ -48205,6 +48453,17 @@ icon_state = "plate" }, /area/almayer/squads/charlie) +"lou" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + icon_state = "sterile_green_side" + }, +/area/almayer/medical/medical_science) "loK" = ( /obj/structure/closet/crate/medical, /obj/item/storage/firstaid/adv, @@ -48467,13 +48726,11 @@ }, /area/almayer/squads/req) "lto" = ( -/obj/structure/machinery/light{ - dir = 4 - }, +/obj/structure/machinery/iv_drip, /turf/open/floor/almayer{ icon_state = "sterile_green" }, -/area/almayer/medical/medical_science) +/area/almayer/medical/containment) "ltA" = ( /obj/item/tool/weldingtool, /turf/open/floor/almayer, @@ -48786,6 +49043,14 @@ icon_state = "redcorner" }, /area/almayer/shipboard/brig/main_office) +"lzA" = ( +/obj/structure/machinery/sleep_console{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/medical/medical_science) "lzH" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = -25 @@ -48913,6 +49178,12 @@ icon_state = "plate" }, /area/almayer/engineering/engineering_workshop/hangar) +"lCt" = ( +/turf/open/floor/almayer{ + dir = 10; + icon_state = "sterile_green_side" + }, +/area/almayer/medical/containment) "lCz" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -49311,18 +49582,20 @@ }, /area/almayer/living/cryo_cells) "lJv" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer{ - id = "containmentlockdown_S"; - name = "\improper Containment Lockdown" +/obj/structure/window/framed/almayer/white, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 }, -/obj/structure/machinery/door/airlock/almayer/research/reinforced{ - dir = 1; - name = "\improper Containment Airlock" +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "researchlockdownext"; + name = "\improper Research Window Shutter" }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "Containment Breach"; + name = "\improper Secure Airlock" }, -/area/almayer/medical/containment) +/turf/open/floor/plating, +/area/almayer/medical/medical_science) "lJG" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /obj/structure/disposalpipe/segment{ @@ -49415,6 +49688,13 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south2) +"lMv" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + dir = 6; + icon_state = "sterile_green_side" + }, +/area/almayer/medical/medical_science) "lMw" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -49533,6 +49813,20 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/operating_room_two) +"lON" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "researchlockdownext_door"; + name = "\improper Research Doorway Shutter" + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "Containment Breach"; + name = "\improper Secure Airlock" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/medical/medical_science) "lPB" = ( /obj/structure/surface/table/almayer, /obj/item/device/lightreplacer, @@ -49815,6 +50109,15 @@ "lYA" = ( /turf/closed/wall/almayer/outer, /area/almayer/hull/upper_hull/u_m_s) +"lYL" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + icon_state = "sterile_green" + }, +/area/almayer/medical/hydroponics) "lYN" = ( /obj/effect/decal/warning_stripes{ icon_state = "E" @@ -49873,10 +50176,11 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_f_p) "lZZ" = ( -/turf/closed/wall/almayer/research/containment/wall/corner{ - dir = 8 +/obj/structure/machinery/autolathe/medilathe/full, +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, -/area/almayer/medical/containment/cell) +/area/almayer/medical/hydroponics) "maa" = ( /obj/structure/closet/emcloset, /turf/open/floor/almayer{ @@ -49884,11 +50188,6 @@ icon_state = "red" }, /area/almayer/shipboard/brig/general_equipment) -"mab" = ( -/turf/open/floor/almayer/research/containment/entrance{ - dir = 4 - }, -/area/almayer/medical/containment/cell) "maq" = ( /obj/structure/machinery/cryopod/right{ pixel_y = 6 @@ -50344,6 +50643,21 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_f_s) +"mmN" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 + }, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "researchlockdownext_se_2"; + name = "\improper Research Window Shutter" + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "Containment Breach"; + name = "\improper Secure Airlock" + }, +/obj/structure/window/framed/almayer/white, +/turf/open/floor/plating, +/area/almayer/medical/medical_science) "mnf" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer, @@ -50391,6 +50705,31 @@ icon_state = "blue" }, /area/almayer/living/briefing) +"mnW" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/surface/table/almayer, +/obj/item/device/reagent_scanner{ + pixel_x = -8; + pixel_y = 4 + }, +/obj/item/clipboard{ + pixel_x = 8 + }, +/obj/item/paper{ + pixel_x = 8 + }, +/obj/effect/spawner/random/toolbox{ + pixel_x = 5; + pixel_y = -3 + }, +/obj/item/storage/box/monkeycubes{ + pixel_x = 7; + pixel_y = 7 + }, +/turf/open/floor/almayer{ + icon_state = "sterile_green" + }, +/area/almayer/medical/containment) "moh" = ( /obj/structure/closet/firecloset, /turf/open/floor/plating/plating_catwalk, @@ -50544,10 +50883,31 @@ }, /area/almayer/squads/req) "msi" = ( -/obj/structure/window/framed/almayer/white, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/turf/open/floor/plating, -/area/almayer/medical/testlab) +/obj/structure/filingcabinet/filingcabinet{ + density = 0; + layer = 2.9; + pixel_x = 7; + pixel_y = 16 + }, +/obj/structure/filingcabinet/filingcabinet{ + density = 0; + layer = 2.9; + pixel_x = -8; + pixel_y = 16 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/structure/reagent_dispensers/fueltank/custom, +/turf/open/floor/almayer{ + icon_state = "sterile_green_corner" + }, +/area/almayer/medical/containment) "msm" = ( /obj/structure/sign/poster{ pixel_y = 32 @@ -50603,14 +50963,6 @@ icon_state = "red" }, /area/almayer/command/lifeboat) -"mtI" = ( -/obj/structure/filingcabinet/chestdrawer{ - pixel_x = -8 - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/almayer/medical/medical_science) "mtM" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -50813,14 +51165,18 @@ /turf/closed/wall/almayer, /area/almayer/hull/lower_hull/l_f_p) "mzq" = ( -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 }, -/turf/open/floor/almayer/research/containment/floor2{ - dir = 1 +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1 }, -/area/almayer/medical/containment/cell) +/turf/open/floor/almayer{ + dir = 8; + icon_state = "sterile_green_corner" + }, +/area/almayer/medical/hydroponics) "mzz" = ( /obj/structure/machinery/light, /turf/open/floor/almayer, @@ -51003,6 +51359,19 @@ }, /turf/open/floor/almayer, /area/almayer/living/briefing) +"mFq" = ( +/obj/structure/machinery/door_control{ + dir = 1; + id = "researchlockdownext_door"; + name = "Door Shutters"; + pixel_y = 29; + req_access_txt = "28" + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "sterile_green_side" + }, +/area/almayer/medical/medical_science) "mFD" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -51115,15 +51484,18 @@ /turf/open/floor/almayer, /area/almayer/living/gym) "mHD" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/light{ - dir = 8 +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 }, -/obj/structure/machinery/computer/research{ - dir = 4 +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, -/turf/open/floor/wood/ship, -/area/almayer/medical/medical_science) +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/medical/hydroponics) "mHE" = ( /turf/open/floor/almayer/no_build{ dir = 8; @@ -51285,15 +51657,18 @@ }, /area/almayer/medical/lower_medical_lobby) "mKx" = ( -/obj/structure/machinery/status_display{ - pixel_y = 30 +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 }, -/obj/structure/machinery/iv_drip, /turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_side" + icon_state = "mono" }, -/area/almayer/medical/medical_science) +/area/almayer/medical/hydroponics) "mKJ" = ( /obj/structure/machinery/firealarm{ pixel_y = 28 @@ -51672,17 +52047,15 @@ }, /area/almayer/command/securestorage) "mSK" = ( -/obj/structure/machinery/cryo_cell{ - dir = 1 - }, -/obj/structure/pipes/standard/cap/hidden{ - dir = 8 +/obj/structure/machinery/portable_atmospherics/hydroponics, +/obj/structure/window/reinforced{ + dir = 4; + health = 80 }, /turf/open/floor/almayer{ - dir = 4; - icon_state = "sterile_green_side" + icon_state = "test_floor5" }, -/area/almayer/medical/medical_science) +/area/almayer/medical/hydroponics) "mSP" = ( /obj/structure/machinery/door/poddoor/shutters/almayer/open{ dir = 4; @@ -51712,6 +52085,13 @@ icon_state = "green" }, /area/almayer/hallways/aft_hallway) +"mTd" = ( +/obj/structure/machinery/smartfridge/chemistry{ + pixel_x = -3; + pixel_y = -1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/medical/medical_science) "mTi" = ( /obj/structure/machinery/cryopod/right, /turf/open/floor/almayer{ @@ -51734,14 +52114,19 @@ }, /area/almayer/shipboard/navigation) "mTp" = ( -/obj/structure/surface/table/almayer, -/obj/item/clipboard, -/obj/item/paper, -/obj/item/storage/xeno_tag_case/full, +/obj/structure/window/reinforced{ + dir = 4; + health = 80 + }, +/obj/structure/machinery/cm_vending/clothing/medical_crew{ + density = 0; + pixel_y = 16 + }, /turf/open/floor/almayer{ - icon_state = "sterile_green_corner" + dir = 1; + icon_state = "cargo_arrow" }, -/area/almayer/medical/containment) +/area/almayer/medical/hydroponics) "mUa" = ( /obj/structure/disposalpipe/junction{ dir = 4; @@ -51849,6 +52234,17 @@ icon_state = "red" }, /area/almayer/shipboard/brig/general_equipment) +"mWs" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + icon_state = "sterile_green_side" + }, +/area/almayer/medical/medical_science) "mWw" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment, @@ -51901,10 +52297,10 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" +/turf/open/floor/almayer/research/containment/floor2{ + dir = 1 }, -/area/almayer/medical/hydroponics) +/area/almayer/medical/containment/cell) "mXj" = ( /turf/closed/wall/almayer, /area/almayer/living/commandbunks) @@ -51914,19 +52310,6 @@ icon_state = "red" }, /area/almayer/hallways/aft_hallway) -"mYj" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, -/obj/structure/surface/rack, -/obj/item/stack/sheet/cardboard{ - amount = 50 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_side" - }, -/area/almayer/medical/testlab) "mYs" = ( /obj/structure/machinery/light{ dir = 4 @@ -52065,6 +52448,20 @@ icon_state = "kitchen" }, /area/almayer/engineering/upper_engineering/port) +"naR" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/iv_drip, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "sterile_green_corner" + }, +/area/almayer/medical/medical_science) "naV" = ( /obj/structure/machinery/door/airlock/almayer/generic{ dir = 2; @@ -52087,29 +52484,17 @@ icon_state = "plate" }, /area/almayer/living/grunt_rnr) -"ncB" = ( -/obj/structure/machinery/chem_master{ - vial_maker = 1 - }, -/turf/open/floor/almayer{ - icon_state = "sterile_green_side" - }, -/area/almayer/medical/medical_science) "ncE" = ( -/obj/structure/machinery/door_control{ - id = "containmentlockdown_N"; - name = "Containment Lockdown"; - pixel_y = 28; - req_one_access_txt = "19;28" - }, -/obj/structure/machinery/power/apc/almayer{ +/obj/structure/machinery/light{ dir = 8 }, +/obj/structure/machinery/autodispenser{ + dir = 4 + }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_corner" + icon_state = "mono" }, -/area/almayer/medical/containment) +/area/almayer/medical/medical_science) "ndx" = ( /obj/structure/sign/safety/nonpress_ag{ pixel_x = 15; @@ -52382,12 +52767,14 @@ }, /area/almayer/living/bridgebunks) "niL" = ( -/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/bed/chair, /turf/open/floor/almayer{ - dir = 9; - icon_state = "sterile_green_side" + icon_state = "sterile_green" }, -/area/almayer/medical/upper_medical) +/area/almayer/medical/medical_science) "niR" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_10" @@ -52657,10 +53044,18 @@ /turf/open/floor/plating, /area/almayer/shipboard/brig/armory) "nos" = ( -/turf/closed/wall/almayer/research/containment/wall/corner{ +/obj/structure/machinery/chem_storage/medbay{ dir = 1 }, -/area/almayer/medical/containment/cell) +/obj/structure/machinery/chem_storage/research{ + dir = 1; + layer = 3; + pixel_y = 18 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/medical/hydroponics) "noV" = ( /obj/structure/sign/safety/storage{ pixel_x = 8; @@ -52676,13 +53071,20 @@ /turf/open/floor/plating, /area/almayer/engineering/starboard_atmos) "npt" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1; + pixel_y = -1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_y = -1 }, /turf/open/floor/almayer{ icon_state = "dark_sterile" }, -/area/almayer/medical/medical_science) +/area/almayer/medical/containment) "nqx" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -52949,6 +53351,14 @@ }, /turf/open/floor/almayer, /area/almayer/squads/req) +"nwi" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer/research/containment/corner{ + dir = 4 + }, +/area/almayer/medical/containment/cell) "nwu" = ( /obj/structure/closet/crate/freezer{ desc = "A freezer crate. Someone has written 'open on christmas' in marker on the top." @@ -53040,6 +53450,10 @@ }, /turf/open/floor/plating, /area/almayer/shipboard/brig/main_office) +"nxF" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/closed/wall/almayer/white/reinforced, +/area/almayer/medical/medical_science) "nxK" = ( /obj/structure/sign/safety/high_voltage{ pixel_y = -32 @@ -53211,16 +53625,6 @@ icon_state = "red" }, /area/almayer/hallways/aft_hallway) -"nCc" = ( -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "sterile_green_corner" - }, -/area/almayer/medical/medical_science) "nCf" = ( /obj/effect/landmark/start/marine/tl/charlie, /obj/effect/landmark/late_join/charlie, @@ -53272,19 +53676,16 @@ /turf/open/floor/carpet, /area/almayer/command/corporateliason) "nDo" = ( -/obj/structure/pipes/unary/freezer{ - dir = 8 - }, -/obj/structure/sign/safety/med_cryo{ - pixel_x = 15; - pixel_y = 32 - }, -/obj/structure/sign/safety/intercom{ - pixel_y = 32 +/obj/structure/closet/l3closet/general, +/obj/structure/window/reinforced{ + dir = 8; + health = 80 }, -/turf/open/floor/almayer{ - icon_state = "sterile_green_corner" +/obj/structure/window/reinforced{ + dir = 4; + health = 80 }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/medical/medical_science) "nDL" = ( /obj/structure/barricade/handrail{ @@ -53350,12 +53751,22 @@ }, /area/almayer/hull/upper_hull/u_a_s) "nEH" = ( -/obj/structure/machinery/smartfridge/chemistry, +/obj/structure/surface/table/almayer, +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/machinery/computer/research{ + dir = 4; + pixel_y = 4 + }, +/obj/item/tool/hand_labeler{ + pixel_x = -6; + pixel_y = -5 + }, /turf/open/floor/almayer{ - dir = 8; - icon_state = "sterile_green_side" + icon_state = "mono" }, -/area/almayer/medical/containment) +/area/almayer/medical/medical_science) "nEJ" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ @@ -53462,18 +53873,6 @@ icon_state = "plate" }, /area/almayer/shipboard/port_point_defense) -"nGr" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/research, -/obj/structure/sign/safety/terminal{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_side" - }, -/area/almayer/medical/testlab) "nHg" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -53649,13 +54048,19 @@ }, /area/almayer/squads/req) "nLI" = ( -/obj/structure/bed/chair/office/dark{ - dir = 1 +/obj/structure/sign/safety/terminal{ + layer = 2.5; + pixel_x = 8; + pixel_y = 32 + }, +/obj/structure/machinery/chem_simulator{ + density = 0; + pixel_y = 16 }, /turf/open/floor/almayer{ - icon_state = "dark_sterile" + icon_state = "mono" }, -/area/almayer/medical/containment) +/area/almayer/medical/medical_science) "nLJ" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -53676,6 +54081,18 @@ }, /turf/open/floor/almayer, /area/almayer/hull/upper_hull/u_f_s) +"nMe" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer/research/containment/corner{ + dir = 1 + }, +/area/almayer/medical/containment/cell) "nMp" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/condiment/hotsauce/franks, @@ -53833,6 +54250,29 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) +"nPf" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/computer/cameras/almayer/containment{ + dir = 8; + pixel_x = -4; + pixel_y = 6 + }, +/obj/structure/surface/table/almayer, +/obj/item/tool/extinguisher{ + pixel_x = 7; + pixel_y = 7 + }, +/obj/structure/machinery/door_control{ + id = "containmentlockdown_S"; + name = "Containment Lockdown"; + pixel_x = -5; + pixel_y = -4; + req_one_access_txt = "19;28" + }, +/turf/open/floor/almayer{ + icon_state = "sterile_green" + }, +/area/almayer/medical/containment) "nPs" = ( /obj/structure/prop/invuln/overhead_pipe{ pixel_x = 12 @@ -53857,11 +54297,16 @@ }, /area/almayer/hallways/hangar) "nPE" = ( -/obj/structure/machinery/body_scanconsole{ - dir = 8 +/obj/structure/surface/table/almayer, +/obj/structure/machinery/centrifuge{ + pixel_y = 7 + }, +/obj/structure/machinery/camera/autoname/almayer{ + dir = 8; + name = "ship-grade camera" }, /turf/open/floor/almayer{ - icon_state = "dark_sterile" + icon_state = "mono" }, /area/almayer/medical/medical_science) "nPM" = ( @@ -54393,11 +54838,6 @@ icon_state = "cargo" }, /area/almayer/squads/alpha_bravo_shared) -"oeg" = ( -/turf/open/floor/almayer{ - icon_state = "sterile_green" - }, -/area/almayer/medical/medical_science) "oeo" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, @@ -54554,18 +54994,21 @@ /turf/open/floor/almayer, /area/almayer/squads/bravo) "oiY" = ( -/obj/structure/machinery/light, -/obj/structure/machinery/iv_drip, -/obj/structure/machinery/door_control{ - id = "containmentlockdown_N"; - name = "Containment Lockdown"; - pixel_y = -20; - req_one_access_txt = "19;28" +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/obj/structure/disposalpipe/trunk, +/obj/structure/machinery/disposal, +/obj/structure/sink{ + pixel_x = 1; + pixel_y = -2 }, /turf/open/floor/almayer{ + dir = 8; icon_state = "sterile_green_side" }, -/area/almayer/medical/containment) +/area/almayer/medical/medical_science) "ojF" = ( /obj/structure/machinery/cm_vending/clothing/tl/charlie{ density = 0; @@ -54965,11 +55408,20 @@ /turf/open/floor/almayer, /area/almayer/squads/req) "oqZ" = ( -/obj/structure/machinery/sleep_console{ - dir = 8 +/obj/structure/surface/table/almayer, +/obj/structure/machinery/microwave{ + pixel_y = 5 + }, +/obj/item/storage/box/donkpockets{ + pixel_x = -4; + pixel_y = 19 + }, +/obj/item/storage/box/donkpockets{ + pixel_x = 4; + pixel_y = 16 }, /turf/open/floor/almayer{ - icon_state = "dark_sterile" + icon_state = "mono" }, /area/almayer/medical/medical_science) "ora" = ( @@ -55102,6 +55554,9 @@ }, /turf/open/floor/almayer, /area/almayer/living/pilotbunks) +"otu" = ( +/turf/closed/wall/almayer/research/containment/wall/connect_w, +/area/almayer/medical/containment/cell) "otX" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -55217,12 +55672,18 @@ }, /area/almayer/hull/lower_hull/l_m_p) "ovG" = ( -/obj/structure/machinery/computer/pandemic, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_side" +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, -/area/almayer/medical/containment) +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer/research/containment/corner_var1{ + dir = 4 + }, +/area/almayer/medical/containment/cell) "ovP" = ( /obj/structure/sign/safety/security{ pixel_x = 15 @@ -55470,6 +55931,20 @@ "oDf" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_p) +"oDi" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "sterile_green_side" + }, +/area/almayer/medical/medical_science) "oDu" = ( /obj/structure/sign/safety/distribution_pipes{ pixel_x = 32 @@ -55498,19 +55973,25 @@ }, /area/almayer/living/grunt_rnr) "oDL" = ( -/obj/structure/surface/table/almayer, -/obj/item/device/reagent_scanner{ - pixel_x = -6 +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = 28 }, -/obj/item/storage/box/monkeycubes{ - pixel_x = 7; - pixel_y = 7 +/obj/structure/machinery/photocopier, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/medical/medical_science) +"oDR" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 }, /turf/open/floor/almayer{ - dir = 8; - icon_state = "sterile_green_side" + dir = 4; + icon_state = "sterile_green_corner" }, -/area/almayer/medical/containment) +/area/almayer/medical/medical_science) "oDY" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/recharger, @@ -55581,11 +56062,6 @@ icon_state = "red" }, /area/almayer/living/port_emb) -"oFj" = ( -/turf/open/floor/almayer/research/containment/corner_var1{ - icon_state = "containment_corner_variant_2" - }, -/area/almayer/medical/containment/cell) "oFG" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -55702,6 +56178,30 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_s) +"oIr" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_x = -1; + pixel_y = 1 + }, +/obj/structure/machinery/door/airlock/almayer/research/reinforced{ + dir = 8; + name = "\improper Containment Airlock" + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + dir = 4; + id = "Containment Breach"; + name = "\improper Secure Airlock" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/medical/medical_science) "oIB" = ( /turf/closed/wall/almayer, /area/almayer/command/combat_correspondent) @@ -55850,10 +56350,11 @@ /turf/open/floor/almayer, /area/almayer/hallways/port_hallway) "oLU" = ( -/turf/closed/wall/almayer/research/containment/wall/purple{ - dir = 8 +/turf/open/floor/almayer{ + dir = 1; + icon_state = "sterile_green_side" }, -/area/almayer/medical/containment/cell) +/area/almayer/medical/hydroponics) "oMd" = ( /obj/structure/closet/secure_closet/freezer/meat, /turf/open/floor/almayer{ @@ -55948,8 +56449,10 @@ /turf/open/floor/almayer, /area/almayer/squads/charlie_delta_shared) "oNp" = ( -/turf/closed/wall/almayer/research/containment/wall/south, -/area/almayer/medical/containment/cell) +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/medical/hydroponics) "oNJ" = ( /obj/effect/decal/warning_stripes{ icon_state = "N" @@ -56380,6 +56883,13 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) +"paa" = ( +/obj/structure/machinery/iv_drip, +/turf/open/floor/almayer{ + dir = 9; + icon_state = "sterile_green_side" + }, +/area/almayer/medical/containment) "paq" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/faxmachine/uscm/brig, @@ -56639,6 +57149,15 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) +"pgM" = ( +/obj/structure/reagent_dispensers/water_cooler/walk_past{ + pixel_x = 10; + pixel_y = 3 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/medical/medical_science) "pha" = ( /obj/structure/machinery/photocopier, /turf/open/floor/almayer{ @@ -56707,12 +57226,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_lobby) -"pjC" = ( -/obj/structure/machinery/autolathe, -/turf/open/floor/almayer{ - icon_state = "sterile_green_side" - }, -/area/almayer/medical/testlab) "pjF" = ( /obj/structure/surface/table/almayer, /obj/item/paper, @@ -56964,6 +57477,14 @@ }, /turf/open/floor/almayer, /area/almayer/living/gym) +"prx" = ( +/obj/structure/bed/chair/comfy{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/medical/medical_science) "prE" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/tool/kitchen/tray, @@ -57121,12 +57642,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, /area/almayer/living/port_emb) -"pvm" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/almayer/medical/hydroponics) "pvt" = ( /obj/structure/sign/safety/refridgeration{ pixel_y = -32 @@ -57213,11 +57728,13 @@ }, /area/almayer/command/combat_correspondent) "pxo" = ( -/obj/structure/pipes/standard/manifold/hidden/supply, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, /turf/open/floor/almayer{ icon_state = "sterile_green_side" }, -/area/almayer/medical/upper_medical) +/area/almayer/medical/medical_science) "pxD" = ( /obj/structure/machinery/vending/coffee{ pixel_x = 3; @@ -57547,12 +58064,24 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cic_hallway) "pEJ" = ( -/obj/structure/filingcabinet/filingcabinet, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_side" +/obj/structure/machinery/flasher{ + alpha = 1; + id = "Containment Cell 2"; + layer = 2.1; + name = "Mounted Flash"; + pixel_y = 30 }, -/area/almayer/medical/containment) +/obj/structure/machinery/light/containment{ + dir = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer/research/containment/floor2{ + dir = 1 + }, +/area/almayer/medical/containment/cell) "pEY" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22"; @@ -57631,20 +58160,16 @@ /turf/open/floor/almayer, /area/almayer/shipboard/brig/execution) "pGK" = ( -/obj/structure/machinery/flasher{ - alpha = 1; - id = "Containment Cell 2"; - layer = 2.1; - name = "Mounted Flash"; - pixel_y = 30 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/obj/structure/machinery/light/containment{ - dir = 1 +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/turf/open/floor/almayer/research/containment/floor2{ - dir = 1 +/turf/open/floor/almayer{ + icon_state = "mono" }, -/area/almayer/medical/containment/cell) +/area/almayer/medical/hydroponics) "pGM" = ( /obj/structure/machinery/light{ dir = 1 @@ -57840,6 +58365,22 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_medbay) +"pLO" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 4; + id = "W_Containment Cell 5"; + name = "\improper Containment Cell 5"; + unacidable = 1 + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + dir = 4; + id = "Containment Breach"; + name = "\improper Secure Airlock" + }, +/turf/closed/wall/almayer/research/containment/wall/purple{ + dir = 1 + }, +/area/almayer/medical/containment/cell) "pLW" = ( /obj/structure/machinery/firealarm{ dir = 4; @@ -57919,10 +58460,18 @@ }, /area/almayer/lifeboat_pumps/south1) "pNP" = ( -/turf/open/floor/almayer/research/containment/corner{ - dir = 4 +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/area/almayer/medical/containment/cell) +/obj/item/reagent_container/food/snacks/cheesewedge{ + pixel_x = -10; + pixel_y = 7 + }, +/mob/living/simple_animal/mouse/white/Doc, +/turf/open/floor/almayer{ + icon_state = "sterile_green" + }, +/area/almayer/medical/hydroponics) "pNQ" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -58061,19 +58610,16 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/delta) "pQP" = ( -/obj/structure/machinery/door/airlock/almayer/research/reinforced{ - name = "\improper Containment Airlock" +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - dir = 4; - id = "containmentlockdown_E"; - name = "\improper Containment Lockdown" +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "dark_sterile" }, -/area/almayer/medical/containment) +/area/almayer/medical/medical_science) "pQV" = ( /obj/structure/machinery/vending/cola, /turf/open/floor/almayer{ @@ -58092,6 +58638,18 @@ icon_state = "plate" }, /area/almayer/living/offices) +"pRn" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 4 + }, +/obj/structure/bed, +/obj/structure/machinery/power/apc/almayer{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/medical/medical_science) "pRy" = ( /turf/open/floor/almayer/research/containment/corner_var1{ dir = 4 @@ -58114,10 +58672,11 @@ }, /area/almayer/shipboard/brig/cic_hallway) "pRX" = ( -/turf/closed/wall/almayer/research/containment/wall/connect_e2{ - icon_state = "containment_wall_connect_e" +/obj/structure/machinery/portable_atmospherics/hydroponics, +/turf/open/floor/almayer{ + icon_state = "test_floor5" }, -/area/almayer/medical/containment/cell) +/area/almayer/medical/hydroponics) "pSL" = ( /obj/structure/machinery/alarm/almayer{ dir = 1 @@ -58149,15 +58708,6 @@ icon_state = "silvercorner" }, /area/almayer/command/computerlab) -"pTM" = ( -/obj/structure/sign/safety/water{ - pixel_x = 8; - pixel_y = -32 - }, -/turf/open/floor/almayer{ - icon_state = "sterile_green_side" - }, -/area/almayer/medical/hydroponics) "pTT" = ( /obj/structure/platform{ dir = 4 @@ -58454,15 +59004,14 @@ }, /area/almayer/command/airoom) "pYo" = ( -/obj/structure/machinery/chem_simulator, -/obj/structure/machinery/light{ - dir = 1 +/obj/effect/decal/warning_stripes{ + icon_state = "W" }, /turf/open/floor/almayer{ - dir = 1; + dir = 8; icon_state = "sterile_green_side" }, -/area/almayer/medical/medical_science) +/area/almayer/medical/containment) "pYu" = ( /obj/item/tool/warning_cone{ pixel_x = -12; @@ -58523,6 +59072,17 @@ icon_state = "red" }, /area/almayer/shipboard/brig/perma) +"qam" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "sterile_green_side" + }, +/area/almayer/medical/medical_science) "qau" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -58748,11 +59308,29 @@ }, /area/almayer/squads/alpha_bravo_shared) "qfy" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/obj/structure/filingcabinet/filingcabinet{ + density = 0; + pixel_x = -11; + pixel_y = 16 + }, +/obj/structure/filingcabinet/filingcabinet{ + density = 0; + pixel_x = 4; + pixel_y = 16 + }, /turf/open/floor/almayer{ - dir = 4; + dir = 1; icon_state = "sterile_green_corner" }, -/area/almayer/medical/containment) +/area/almayer/medical/medical_science) "qfA" = ( /turf/open/floor/almayer{ icon_state = "silvercorner" @@ -58995,10 +59573,10 @@ /obj/structure/surface/table/almayer, /obj/structure/machinery/door_control{ dir = 1; - id = "researchlockdownext"; - name = "Window Shutters"; - pixel_x = -8; - pixel_y = -5; + id = "researchlockdownext_windoor"; + name = "Windoor Shutters"; + pixel_x = -7; + pixel_y = 9; req_access_txt = "28" }, /obj/structure/machinery/computer/med_data/laptop{ @@ -59006,6 +59584,21 @@ pixel_x = 6; pixel_y = -4 }, +/obj/structure/sign/safety/biohazard{ + pixel_y = -32 + }, +/obj/structure/sign/safety/ref_bio_storage{ + pixel_x = 15; + pixel_y = -32 + }, +/obj/structure/machinery/door_control{ + dir = 1; + id = "researchlockdownext_se_2"; + name = "Window Shutters"; + pixel_x = -7; + pixel_y = 4; + req_access_txt = "28" + }, /turf/open/floor/almayer{ dir = 8; icon_state = "sterile_green_corner" @@ -59025,6 +59618,18 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/main_office) +"qmD" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/bed/chair/comfy, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/medical/medical_science) "qmE" = ( /obj/structure/sign/safety/restrictedarea{ pixel_x = 32; @@ -59240,14 +59845,18 @@ }, /area/almayer/shipboard/brig/main_office) "qqQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/machinery/cm_vending/sorted/medical/blood{ + density = 0; + pixel_y = 16 }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 }, /turf/open/floor/almayer{ - icon_state = "dark_sterile" + dir = 5; + icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) "qrc" = ( @@ -59456,6 +60065,20 @@ icon_state = "silver" }, /area/almayer/command/airoom) +"qxm" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 4; + id = "W_Containment Cell 5"; + name = "\improper Containment Cell 5"; + unacidable = 1 + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + dir = 4; + id = "Containment Breach"; + name = "\improper Secure Airlock" + }, +/turf/closed/wall/almayer/research/containment/wall/purple, +/area/almayer/medical/containment/cell) "qxA" = ( /obj/structure/closet/firecloset, /turf/open/floor/almayer{ @@ -59495,12 +60118,18 @@ }, /area/almayer/medical/lower_medical_medbay) "qxP" = ( -/obj/structure/bed/chair, -/obj/structure/machinery/firealarm{ - pixel_y = 28 +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/turf/open/floor/wood/ship, -/area/almayer/medical/medical_science) +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer/research/containment/corner_var1{ + dir = 4 + }, +/area/almayer/medical/containment/cell) "qyd" = ( /turf/open/floor/almayer{ allow_construction = 0 @@ -59615,6 +60244,28 @@ icon_state = "mono" }, /area/almayer/engineering/ce_room) +"qAT" = ( +/obj/structure/machinery/light, +/obj/structure/surface/table/almayer, +/obj/structure/machinery/reagentgrinder{ + pixel_y = 8 + }, +/obj/item/stack/sheet/mineral/phoron{ + amount = 25; + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/device/reagent_scanner{ + pixel_x = -16; + pixel_y = 5 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/turf/open/floor/almayer{ + icon_state = "sterile_green_side" + }, +/area/almayer/medical/medical_science) "qCc" = ( /obj/structure/sign/safety/security{ pixel_x = 15; @@ -59722,8 +60373,22 @@ }, /area/almayer/command/cic) "qEn" = ( -/turf/closed/wall/almayer/research/containment/wall/corner, -/area/almayer/medical/containment/cell) +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1 + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor/research{ + name = "\improper Research Hydroponics Workshop" + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "Containment Breach"; + name = "\improper Secure Airlock" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/medical/hydroponics) "qEy" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -59879,6 +60544,26 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering) +"qIL" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/camera/autoname/almayer{ + dir = 4; + name = "ship-grade camera" + }, +/obj/item/folder/white{ + pixel_x = 6 + }, +/obj/item/storage/fancy/vials/empty{ + pixel_y = 10; + start_vials = 2 + }, +/obj/item/tool/pen{ + pixel_y = 8 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/medical/medical_science) "qJf" = ( /obj/structure/closet/secure_closet/guncabinet/red, /obj/item/weapon/gun/shotgun/combat, @@ -59911,7 +60596,18 @@ }, /area/almayer/engineering/upper_engineering/starboard) "qJy" = ( -/turf/closed/wall/almayer/white/reinforced, +/obj/structure/pipes/vents/pump, +/obj/structure/sign/safety/storage{ + pixel_x = 33; + pixel_y = -1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/turf/open/floor/almayer{ + icon_state = "sterile_green" + }, /area/almayer/medical/hydroponics) "qJF" = ( /obj/structure/largecrate/supply, @@ -60012,17 +60708,21 @@ }, /area/almayer/hallways/port_hallway) "qLi" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/pipes/standard/manifold/hidden/supply, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1; + pixel_y = -1 }, -/obj/structure/machinery/door/airlock/almayer/research/glass/reinforced{ - name = "\improper Hydroponics Laboratory" +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "dark_sterile" }, -/area/almayer/medical/hydroponics) +/area/almayer/medical/containment) "qLj" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -60119,13 +60819,16 @@ /turf/closed/wall/almayer/outer, /area/almayer/hull/upper_hull/u_a_p) "qMP" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/box/pillbottles{ - pixel_y = 6 +/obj/structure/bed/chair/comfy{ + dir = 8 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, -/obj/item/reagent_container/glass/beaker/cryoxadone, /turf/open/floor/almayer{ - icon_state = "dark_sterile" + dir = 4; + icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) "qMR" = ( @@ -60824,6 +61527,15 @@ }, /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_f_p) +"rdt" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/almayer/research/containment/corner4, +/area/almayer/medical/containment/cell) "rdI" = ( /obj/structure/surface/rack, /obj/effect/spawner/random/technology_scanner, @@ -60918,15 +61630,6 @@ icon_state = "plate" }, /area/almayer/shipboard/port_point_defense) -"rgn" = ( -/obj/structure/filingcabinet/disk, -/obj/structure/machinery/alarm/almayer{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "sterile_green_corner" - }, -/area/almayer/medical/hydroponics) "rgy" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -60969,19 +61672,11 @@ }, /area/almayer/living/briefing) "rhO" = ( -/obj/structure/machinery/disposal{ - density = 0; - desc = "A pneumatic delivery unit. Sends items to the requisitions."; - icon_state = "delivery_med"; - name = "Requisitions Delivery Unit"; - pixel_y = 28 - }, -/obj/structure/disposalpipe/trunk{ - dir = 1 +/obj/structure/machinery/vending/cola/research{ + pixel_x = 4 }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_side" + icon_state = "mono" }, /area/almayer/medical/medical_science) "rhQ" = ( @@ -61013,11 +61708,17 @@ }, /area/almayer/engineering/engine_core) "riE" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_x = -1; + pixel_y = 1 + }, /turf/open/floor/almayer{ - dir = 8; - icon_state = "sterile_green_corner" + dir = 9; + icon_state = "sterile_green_side" }, -/area/almayer/medical/containment) +/area/almayer/medical/medical_science) "riJ" = ( /turf/open/floor/almayer{ dir = 5; @@ -61058,28 +61759,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) -"rjF" = ( -/obj/structure/surface/table/almayer, -/obj/item/cell/high{ - pixel_x = 8; - pixel_y = -2 - }, -/obj/item/cell/high{ - pixel_x = 8; - pixel_y = 8 - }, -/obj/item/cell/high{ - pixel_x = -8; - pixel_y = 8 - }, -/obj/item/cell/high{ - pixel_x = -8; - pixel_y = -2 - }, -/turf/open/floor/almayer{ - icon_state = "sterile_green_side" - }, -/area/almayer/medical/testlab) "rjH" = ( /obj/structure/surface/rack, /obj/item/storage/beer_pack, @@ -61576,17 +62255,16 @@ }, /area/almayer/command/computerlab) "ruc" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/cameras/almayer, -/obj/structure/sign/safety/terminal{ - pixel_x = 8; - pixel_y = 32 +/obj/structure/machinery/camera/autoname/almayer/containment{ + dir = 4 }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_side" +/obj/effect/decal/warning_stripes{ + icon_state = "W" }, -/area/almayer/medical/containment) +/turf/open/floor/almayer/research/containment/floor2{ + dir = 8 + }, +/area/almayer/medical/containment/cell) "rui" = ( /obj/structure/disposalpipe/junction{ dir = 8 @@ -61615,9 +62293,6 @@ icon_state = "cargo" }, /area/almayer/hallways/hangar) -"ruV" = ( -/turf/closed/wall/almayer/research/containment/wall/divide, -/area/almayer/medical/containment/cell) "rvo" = ( /obj/structure/machinery/power/apc/almayer{ dir = 4 @@ -61742,14 +62417,10 @@ /turf/open/floor/almayer, /area/almayer/shipboard/brig/cic_hallway) "rzN" = ( -/obj/structure/sign/safety/chem_lab{ - pixel_x = 31 - }, /turf/open/floor/almayer{ - dir = 6; - icon_state = "sterile_green_side" + icon_state = "dark_sterile" }, -/area/almayer/medical/medical_science) +/area/almayer/medical/containment) "rAb" = ( /turf/open/floor/almayer{ icon_state = "bluecorner" @@ -61951,6 +62622,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_a_p) +"rDr" = ( +/obj/structure/pipes/vents/pump, +/turf/open/floor/almayer{ + icon_state = "sterile_green" + }, +/area/almayer/medical/medical_science) "rDt" = ( /obj/structure/disposalpipe/junction{ dir = 1 @@ -61973,6 +62650,12 @@ icon_state = "plate" }, /area/almayer/living/offices) +"rDV" = ( +/obj/structure/bed/chair/comfy{ + dir = 8 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/medical/medical_science) "rEf" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -62131,13 +62814,6 @@ icon_state = "test_floor4" }, /area/almayer/command/cichallway) -"rGR" = ( -/obj/structure/filingcabinet/filingcabinet, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_side" - }, -/area/almayer/medical/medical_science) "rHc" = ( /turf/open/floor/carpet, /area/almayer/command/cichallway) @@ -62503,27 +63179,8 @@ /turf/open/floor/almayer, /area/almayer/shipboard/brig/cic_hallway) "rQy" = ( -/obj/structure/machinery/door_display/research_cell{ - dir = 8; - has_wall_divider = 1; - id = "Containment Cell 2"; - name = "Cell 2 Control"; - pixel_x = 14; - pixel_y = 8 - }, -/obj/structure/machinery/door_display/research_cell{ - dir = 8; - has_wall_divider = 1; - id = "Containment Cell 3"; - name = "Cell 3 Control"; - pixel_x = 14; - pixel_y = -10 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "sterile_green_side" - }, -/area/almayer/medical/containment) +/turf/closed/wall/almayer/white/reinforced, +/area/almayer/medical/hydroponics) "rQA" = ( /turf/open/floor/almayer{ dir = 8; @@ -62615,14 +63272,6 @@ icon_state = "orangefull" }, /area/almayer/squads/alpha_bravo_shared) -"rSD" = ( -/obj/structure/surface/table/almayer, -/obj/item/paper_bin/wy, -/obj/item/tool/pen, -/turf/open/floor/almayer{ - icon_state = "sterile_green_side" - }, -/area/almayer/medical/containment) "rSG" = ( /obj/structure/toilet{ pixel_y = 16 @@ -63073,7 +63722,6 @@ /area/almayer/shipboard/brig/chief_mp_office) "sdu" = ( /obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ dir = 9; icon_state = "sterile_green_side" @@ -64498,19 +65146,13 @@ }, /area/almayer/squads/bravo) "sNz" = ( -/obj/structure/machinery/light, -/obj/structure/surface/table/almayer, -/obj/item/device/multitool{ - pixel_x = 8 - }, -/obj/item/tool/screwdriver{ - pixel_x = -3; - pixel_y = 4 +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/turf/open/floor/almayer{ - icon_state = "sterile_green_side" +/turf/open/floor/almayer/research/containment/floor2{ + dir = 1 }, -/area/almayer/medical/testlab) +/area/almayer/medical/containment/cell) "sNO" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal3" @@ -64866,27 +65508,29 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cryo) "sWW" = ( -/obj/structure/machinery/seed_extractor, -/obj/structure/machinery/light{ - dir = 1 +/obj/structure/machinery/flasher{ + alpha = 1; + id = "Containment Cell 3"; + layer = 2.1; + name = "Mounted Flash"; + pixel_y = 30 }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_side" +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/area/almayer/medical/hydroponics) -"sXd" = ( -/obj/structure/surface/table/almayer, -/obj/item/device/reagent_scanner{ - pixel_x = -6 +/turf/open/floor/almayer/research/containment/floor2{ + dir = 1 }, -/obj/item/tool/hand_labeler{ - pixel_x = 8 +/area/almayer/medical/containment/cell) +"sXd" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, /turf/open/floor/almayer{ - icon_state = "sterile_green_side" + icon_state = "dark_sterile" }, -/area/almayer/medical/medical_science) +/area/almayer/medical/containment) "sXs" = ( /obj/structure/surface/table/almayer, /obj/item/device/flashlight/lamp{ @@ -65056,6 +65700,20 @@ icon_state = "plate" }, /area/almayer/squads/charlie) +"sZy" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "sterile_green_side" + }, +/area/almayer/medical/medical_science) "sZH" = ( /obj/structure/surface/table/almayer, /obj/item/ashtray/bronze{ @@ -65126,13 +65784,35 @@ }, /area/almayer/hallways/starboard_hallway) "taH" = ( +/obj/structure/machinery/door/airlock/almayer/research/glass/reinforced{ + id = "Containment Cell 2"; + locked = 1; + name = "\improper Containment Cell 2" + }, +/obj/structure/machinery/door/poddoor/shutters/almayer/containment{ + dir = 4; + id = "Containment Cell 2"; + name = "\improper Containment Cell 2" + }, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + dir = 4; + id = "Containment Breach"; + name = "\improper Secure Airlock" + }, /turf/open/floor/almayer{ - icon_state = "dark_sterile" + icon_state = "test_floor4" }, -/area/almayer/medical/testlab) +/area/almayer/medical/containment/cell) "tbD" = ( /obj/structure/ladder{ height = 2; @@ -65310,13 +65990,14 @@ }, /area/almayer/hallways/port_hallway) "tfH" = ( -/obj/structure/pipes/vents/pump{ - dir = 1 +/obj/structure/machinery/light/containment, +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" +/turf/open/floor/almayer/research/containment/floor2{ + dir = 1 }, -/area/almayer/medical/hydroponics) +/area/almayer/medical/containment/cell) "tfO" = ( /obj/structure/machinery/power/apc/almayer{ dir = 4 @@ -65374,13 +66055,10 @@ /turf/open/floor/wood/ship, /area/almayer/shipboard/brig/cells) "thN" = ( -/obj/structure/machinery/camera/autoname/almayer/containment{ - dir = 8 - }, -/turf/open/floor/almayer/research/containment/floor2{ - dir = 8 +/turf/open/floor/almayer{ + icon_state = "dark_sterile" }, -/area/almayer/medical/containment/cell) +/area/almayer/medical/hydroponics) "thP" = ( /turf/open/floor/almayer{ dir = 10; @@ -65494,11 +66172,10 @@ }, /area/almayer/squads/req) "tjn" = ( -/obj/structure/reagent_dispensers/fueltank/custom, /turf/open/floor/almayer{ icon_state = "sterile_green_side" }, -/area/almayer/medical/containment) +/area/almayer/medical/medical_science) "tjU" = ( /obj/structure/bed/chair/wood/normal, /obj/item/bedsheet/brown, @@ -65696,8 +66373,15 @@ }, /area/almayer/hull/upper_hull/u_m_p) "tpa" = ( -/turf/open/floor/almayer/research/containment/corner3, -/area/almayer/medical/containment/cell) +/obj/structure/machinery/portable_atmospherics/hydroponics, +/obj/structure/window/reinforced{ + dir = 8; + health = 80 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor5" + }, +/area/almayer/medical/hydroponics) "tpd" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -65841,13 +66525,35 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_p) "trF" = ( -/obj/structure/machinery/shower{ - dir = 1 +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/obj/structure/surface/table/almayer, +/obj/item/storage/firstaid/o2{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/storage/firstaid/fire{ + pixel_x = 8; + pixel_y = 6 + }, +/obj/item/storage/firstaid/adv{ + pixel_x = -6; + pixel_y = -2 + }, +/obj/item/storage/firstaid/toxin{ + pixel_x = 8; + pixel_y = -2 }, /turf/open/floor/almayer{ - icon_state = "sterile_green_side" + dir = 8; + icon_state = "sterile_green_corner" }, -/area/almayer/medical/containment) +/area/almayer/medical/medical_science) "trW" = ( /obj/item/stack/tile/carpet{ amount = 20 @@ -66030,16 +66736,6 @@ icon_state = "redcorner" }, /area/almayer/shipboard/weapon_room) -"tvu" = ( -/obj/structure/filingcabinet/filingcabinet, -/obj/item/clipboard, -/obj/item/clipboard, -/obj/item/clipboard, -/obj/item/clipboard, -/obj/item/clipboard, -/obj/item/clipboard, -/turf/open/floor/wood/ship, -/area/almayer/medical/medical_science) "tvw" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -66185,10 +66881,10 @@ }, /area/almayer/hull/upper_hull/u_a_p) "tyD" = ( -/turf/open/floor/almayer{ - icon_state = "dark_sterile" +/turf/open/floor/almayer/research/containment/corner_var1{ + dir = 4 }, -/area/almayer/medical/hydroponics) +/area/almayer/medical/containment/cell) "tyK" = ( /obj/effect/spawner/random/toolbox, /turf/open/floor/almayer{ @@ -66237,6 +66933,23 @@ icon_state = "plate" }, /area/almayer/engineering/engineering_workshop) +"tzL" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/structure/sign/safety/waterhazard{ + pixel_x = 8; + pixel_y = -32 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/medical/hydroponics) "tzP" = ( /obj/structure/barricade/handrail/medical, /turf/open/floor/almayer{ @@ -66860,6 +67573,19 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/aft_hallway) +"tOr" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + icon_state = "sterile_green_corner" + }, +/area/almayer/medical/hydroponics) "tOC" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -66894,17 +67620,6 @@ }, /turf/open/floor/almayer, /area/almayer/squads/alpha_bravo_shared) -"tPX" = ( -/obj/structure/reagent_dispensers/watertank, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 8; - name = "ship-grade camera" - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "sterile_green_side" - }, -/area/almayer/medical/hydroponics) "tQd" = ( /obj/structure/machinery/light{ dir = 8 @@ -67369,21 +68084,30 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) -"uaI" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/box/autoinjectors{ - pixel_x = -6; - pixel_y = 7 +"ual" = ( +/obj/structure/sink{ + pixel_y = 24 }, -/obj/item/storage/box/autoinjectors{ - pixel_x = -6; - pixel_y = -1 +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/obj/item/device/mass_spectrometer{ - pixel_x = 8 +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer/research/containment/corner_var1{ + dir = 4 + }, +/area/almayer/medical/containment/cell) +"uaI" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/processor{ + pixel_x = -2; + pixel_y = 6 }, /turf/open/floor/almayer{ - icon_state = "sterile_green_side" + icon_state = "mono" }, /area/almayer/medical/medical_science) "uaU" = ( @@ -67538,6 +68262,17 @@ }, /turf/open/floor/wood/ship, /area/almayer/engineering/ce_room) +"ueJ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "sterile_green_side" + }, +/area/almayer/medical/medical_science) "ueZ" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/machinery/door/airlock/multi_tile/almayer/marine/alpha{ @@ -67639,10 +68374,6 @@ icon_state = "cargo_arrow" }, /area/almayer/living/offices) -"uhV" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/wood/ship, -/area/almayer/medical/medical_science) "uia" = ( /obj/structure/prop/invuln/overhead_pipe{ pixel_x = 12 @@ -67877,18 +68608,14 @@ }, /area/almayer/medical/lower_medical_medbay) "uoi" = ( -/obj/structure/surface/rack, -/obj/item/storage/fancy/vials/empty, -/obj/item/storage/fancy/vials/empty, -/obj/item/storage/fancy/vials/empty, -/obj/structure/sign/safety/storage{ - pixel_x = 23; - pixel_y = -32 +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, +/obj/structure/machinery/power/apc/almayer, /turf/open/floor/almayer{ icon_state = "sterile_green" }, -/area/almayer/medical/medical_science) +/area/almayer/medical/containment) "uoA" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -67963,20 +68690,35 @@ }, /area/almayer/hull/upper_hull/u_f_p) "uqd" = ( -/obj/structure/sign/safety/ref_bio_storage{ - pixel_x = -17; - pixel_y = 7 +/obj/structure/surface/table/almayer, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, -/obj/structure/sign/safety/biohazard{ - pixel_x = -17; - pixel_y = -7 +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/structure/machinery/door_control{ + id = "W_Containment Cell 1"; + name = "Containment Lockdown"; + pixel_x = -7; + pixel_y = 1; + req_one_access_txt = "19;28" + }, +/obj/structure/machinery/door_display/research_cell{ + id = "Containment Cell 1"; + name = "Cell 1 Control"; + pixel_x = 5; + pixel_y = 2 }, -/obj/structure/machinery/cm_vending/sorted/medical/chemistry, /turf/open/floor/almayer{ - dir = 8; - icon_state = "sterile_green_corner" + icon_state = "sterile_green" }, -/area/almayer/medical/medical_science) +/area/almayer/medical/containment) "uqo" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/armory) @@ -68013,16 +68755,6 @@ }, /turf/open/floor/almayer, /area/almayer/command/lifeboat) -"urc" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 11 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "sterile_green_side" - }, -/area/almayer/medical/hydroponics) "urM" = ( /obj/structure/machinery/light{ dir = 8 @@ -68081,6 +68813,17 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/engine_core) +"usy" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + icon_state = "sterile_green_side" + }, +/area/almayer/medical/medical_science) "usB" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 @@ -68124,6 +68867,11 @@ icon_state = "plate" }, /area/almayer/living/tankerbunks) +"utX" = ( +/turf/closed/wall/almayer/research/containment/wall/connect_e2{ + icon_state = "containment_wall_connect_e" + }, +/area/almayer/medical/containment/cell) "utZ" = ( /obj/structure/machinery/door/poddoor/almayer/open{ dir = 4; @@ -68278,6 +69026,21 @@ icon_state = "plating" }, /area/almayer/hull/lower_hull/l_a_s) +"uvP" = ( +/obj/structure/machinery/light{ + unacidable = 1; + unslashable = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer/research/containment/corner{ + dir = 4 + }, +/area/almayer/medical/containment/cell) "uvS" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -68324,17 +69087,14 @@ /turf/open/floor/almayer, /area/almayer/shipboard/brig/cic_hallway) "uwZ" = ( -/obj/structure/machinery/botany/extractor, -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = 28 +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_side" +/turf/open/floor/almayer/research/containment/floor2{ + dir = 1 }, -/area/almayer/medical/hydroponics) +/area/almayer/medical/containment/cell) "uxa" = ( /obj/structure/bed/chair/wood/normal{ dir = 8 @@ -68407,6 +69167,9 @@ /obj/structure/window/framed/almayer/hull, /turf/open/floor/plating, /area/almayer/lifeboat_pumps/south2) +"uyH" = ( +/turf/closed/wall/almayer/research/containment/wall/divide, +/area/almayer/medical/containment/cell) "uyJ" = ( /obj/structure/machinery/cm_vending/sorted/medical/chemistry, /turf/open/floor/almayer{ @@ -69211,24 +69974,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, /area/almayer/living/port_emb) -"uPX" = ( -/obj/structure/surface/table/almayer, -/obj/item/reagent_container/glass/beaker/large, -/obj/item/reagent_container/glass/beaker{ - pixel_x = 5 - }, -/obj/structure/machinery/disposal{ - density = 0; - desc = "A pneumatic delivery unit. Sends items to the requisitions."; - icon_state = "delivery_med"; - name = "Requisitions Delivery Unit"; - pixel_y = 28 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_side" - }, -/area/almayer/medical/testlab) "uQm" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -69505,14 +70250,6 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) -"uVi" = ( -/obj/structure/surface/table/almayer, -/obj/item/device/camera, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_corner" - }, -/area/almayer/medical/containment) "uVv" = ( /obj/structure/pipes/standard/manifold/hidden/supply/no_boom{ dir = 1 @@ -69634,7 +70371,12 @@ }, /area/almayer/medical/lower_medical_medbay) "uXj" = ( -/turf/closed/wall/almayer/white/reinforced, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/almayer/research/containment/floor2{ + dir = 8 + }, /area/almayer/medical/containment/cell) "uXL" = ( /obj/effect/decal/warning_stripes{ @@ -69850,21 +70592,16 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) "vdO" = ( -/obj/structure/machinery/door/airlock/almayer/research/glass/reinforced{ - id = "Containment Cell 3"; - locked = 1; - name = "\improper Containment Cell 3"; - unacidable = 1 +/obj/structure/pipes/standard/cap/hidden{ + dir = 4 }, -/obj/structure/machinery/door/poddoor/shutters/almayer/containment{ - dir = 4; - id = "Containment Cell 3"; - name = "\improper Containment Cell 3" +/obj/structure/machinery/cryo_cell{ + dir = 1 }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "mono" }, -/area/almayer/medical/containment/cell) +/area/almayer/medical/medical_science) "vdU" = ( /turf/open/floor/wood/ship, /area/almayer/living/grunt_rnr) @@ -69975,6 +70712,11 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_p) +"vfP" = ( +/turf/open/floor/almayer/research/containment/corner{ + dir = 1 + }, +/area/almayer/medical/containment/cell) "vgk" = ( /obj/structure/closet/firecloset, /obj/structure/machinery/camera/autoname/almayer{ @@ -69987,29 +70729,32 @@ }, /area/almayer/hallways/port_hallway) "vgx" = ( -/obj/structure/machinery/flasher{ - id = "Containment Cell 1"; - layer = 2.1; - name = "Mounted Flash"; - pixel_y = 30 +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 }, -/turf/open/floor/almayer/research/containment/floor2{ - dir = 1 +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/research, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "sterile_green_corner" }, -/area/almayer/medical/containment/cell) +/area/almayer/medical/hydroponics) "vgB" = ( /obj/structure/surface/table/almayer, -/obj/item/paper_bin/wy{ - pixel_x = 6; - pixel_y = 5 +/obj/item/reagent_container/glass/beaker/cryoxadone{ + pixel_x = -6; + pixel_y = 8 }, -/obj/item/clipboard{ - pixel_x = -8 +/obj/item/storage/box/autoinjectors{ + pixel_x = -6; + pixel_y = -1 }, -/obj/item/folder/white{ - pixel_x = -8 +/obj/item/storage/box/pillbottles{ + pixel_x = 6; + pixel_y = 7 }, -/obj/item/tool/pen{ +/obj/item/device/mass_spectrometer{ pixel_x = 8 }, /turf/open/floor/almayer{ @@ -70056,12 +70801,8 @@ }, /area/almayer/hallways/starboard_hallway) "vgO" = ( -/obj/structure/machinery/portable_atmospherics/hydroponics, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "sterile_green_side" - }, -/area/almayer/medical/hydroponics) +/turf/closed/wall/almayer/research/containment/wall/east, +/area/almayer/medical/containment/cell) "vgQ" = ( /obj/structure/surface/rack, /obj/item/tool/crowbar, @@ -70282,11 +71023,15 @@ }, /area/almayer/living/captain_mess) "vkp" = ( -/obj/structure/machinery/light/containment, -/turf/open/floor/almayer/research/containment/floor2{ - dir = 1 +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/area/almayer/medical/containment/cell) +/turf/open/floor/almayer{ + dir = 1; + icon_state = "sterile_green_side" + }, +/area/almayer/medical/medical_science) "vkD" = ( /obj/structure/prop/invuln/overhead_pipe{ dir = 4; @@ -70500,17 +71245,41 @@ }, /area/almayer/hull/upper_hull/u_a_p) "vqW" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, +/obj/structure/machinery/camera/autoname/almayer{ + dir = 1; + name = "ship-grade camera" + }, /turf/open/floor/almayer{ - dir = 6; icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) +"vqZ" = ( +/obj/structure/machinery/shower{ + pixel_y = 16 + }, +/obj/structure/sign/safety/biolab{ + pixel_x = -9; + pixel_y = 32 + }, +/obj/structure/sign/safety/biohazard{ + pixel_x = 25; + pixel_y = 32 + }, +/obj/structure/window/reinforced{ + dir = 4; + health = 80; + pixel_y = 6 + }, +/obj/structure/window/reinforced{ + dir = 8; + health = 80; + pixel_y = 6 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/medical/medical_science) "vra" = ( /turf/closed/wall/almayer, /area/almayer/squads/charlie_delta_shared) @@ -70634,6 +71403,23 @@ icon_state = "silver" }, /area/almayer/command/cichallway) +"vti" = ( +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/medical/medical_science) +"vtm" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/medical/medical_science) "vtr" = ( /obj/structure/machinery/mech_bay_recharge_port, /turf/open/shuttle/dropship{ @@ -70954,17 +71740,15 @@ /turf/open/floor/almayer, /area/almayer/shipboard/brig/chief_mp_office) "vAQ" = ( -/obj/structure/machinery/light, -/obj/structure/sink{ - dir = 8; - pixel_x = -12; - pixel_y = 2 +/obj/structure/surface/table/almayer, +/obj/structure/machinery/reagent_analyzer{ + pixel_x = 2; + pixel_y = 3 }, /turf/open/floor/almayer{ - dir = 8; - icon_state = "sterile_green_corner" + icon_state = "mono" }, -/area/almayer/medical/containment) +/area/almayer/medical/medical_science) "vAU" = ( /obj/structure/machinery/light{ dir = 8 @@ -71025,8 +71809,14 @@ }, /area/almayer/hallways/hangar) "vCk" = ( -/turf/closed/wall/almayer/research/containment/wall/purple, -/area/almayer/medical/containment/cell) +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "sterile_green_side" + }, +/area/almayer/medical/hydroponics) "vCx" = ( /obj/structure/machinery/status_display{ pixel_y = -30 @@ -71063,8 +71853,13 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/living/bridgebunks) "vDa" = ( -/turf/open/floor/almayer/research/containment/corner2, -/area/almayer/medical/containment/cell) +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "sterile_green_side" + }, +/area/almayer/medical/hydroponics) "vDh" = ( /obj/item/weapon/dart/green, /turf/open/floor/plating, @@ -71084,6 +71879,16 @@ /obj/effect/landmark/start/synthetic, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/synthcloset) +"vEr" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "sterile_green_side" + }, +/area/almayer/medical/medical_science) "vEx" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -71188,18 +71993,17 @@ /turf/open/floor/almayer, /area/almayer/living/port_emb) "vHO" = ( -/obj/structure/machinery/vending/hydroseeds{ - req_access_txt = "28" +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/obj/structure/sign/safety/rewire{ - pixel_x = 8; - pixel_y = 32 +/obj/effect/decal/warning_stripes{ + icon_state = "W" }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_side" +/turf/open/floor/almayer/research/containment/corner_var1{ + icon_state = "containment_corner_variant_2" }, -/area/almayer/medical/hydroponics) +/area/almayer/medical/containment/cell) "vHW" = ( /obj/structure/surface/rack, /obj/item/tool/extinguisher, @@ -71325,6 +72129,19 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/basketball) +"vKb" = ( +/obj/structure/machinery/smartfridge/chemistry{ + density = 0; + pixel_y = 16 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + icon_state = "sterile_green_corner" + }, +/area/almayer/medical/containment) "vKe" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -71376,10 +72193,14 @@ }, /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "Containment Breach"; + name = "\improper Secure Airlock" + }, /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/medical/medical_science) +/area/almayer/medical/upper_medical) "vLA" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -71478,6 +72299,18 @@ "vOy" = ( /turf/closed/wall/almayer/white/reinforced, /area/almayer/medical/medical_science) +"vOP" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "Containment Breach"; + name = "\improper Secure Airlock" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/medical/upper_medical) "vPj" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/device/flashlight/lamp{ @@ -71840,6 +72673,11 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/briefing) +"vVs" = ( +/turf/open/floor/almayer{ + icon_state = "sterile_green" + }, +/area/almayer/medical/containment) "vVw" = ( /turf/open/floor/almayer{ icon_state = "plate" @@ -71873,16 +72711,27 @@ }, /area/almayer/shipboard/brig/evidence_storage) "vWt" = ( -/obj/structure/sink{ +/obj/structure/surface/table/almayer, +/obj/item/reagent_container/glass/beaker/large, +/obj/item/reagent_container/glass/beaker/large, +/obj/item/reagent_container/glass/beaker{ + pixel_x = 5 + }, +/obj/item/reagent_container/glass/beaker{ + pixel_x = 5 + }, +/obj/item/reagent_container/dropper, +/obj/structure/machinery/firealarm{ dir = 8; - pixel_x = -12; - pixel_y = 2 + pixel_x = -24 + }, +/obj/item/reagent_container/glass/beaker/bluespace{ + pixel_y = 12 }, /turf/open/floor/almayer{ - dir = 8; - icon_state = "sterile_green_side" + icon_state = "mono" }, -/area/almayer/medical/containment) +/area/almayer/medical/medical_science) "vWx" = ( /obj/structure/largecrate/random/barrel/blue, /obj/structure/sign/safety/restrictedarea{ @@ -72028,13 +72877,32 @@ }, /area/almayer/medical/lower_medical_medbay) "vYz" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 4 +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/surface/table/almayer, +/obj/item/reagent_container/glass/beaker{ + pixel_x = 8 + }, +/obj/item/paper_bin/wy{ + pixel_x = -5; + pixel_y = 6 + }, +/obj/item/tool/pen{ + pixel_y = -2 + }, +/obj/structure/machinery/door_control/brbutton/alt{ + id = "Containment Breach"; + name = "Emergency Containment Breach"; + pixel_x = 8; + pixel_y = 10 + }, +/obj/item/reagent_container/dropper{ + pixel_x = -1; + pixel_y = 9 }, /turf/open/floor/almayer{ - icon_state = "dark_sterile" + icon_state = "sterile_green" }, -/area/almayer/medical/medical_science) +/area/almayer/medical/containment) "vYC" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -72244,6 +73112,26 @@ }, /turf/open/floor/almayer, /area/almayer/living/tankerbunks) +"wdo" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/door/airlock/almayer/research/reinforced{ + dir = 8; + name = "\improper Containment Airlock" + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + dir = 4; + id = "Containment Breach"; + name = "\improper Secure Airlock" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/medical/medical_science) "wdr" = ( /obj/structure/machinery/power/apc/almayer, /turf/open/floor/almayer{ @@ -72279,18 +73167,18 @@ }, /area/almayer/engineering/upper_engineering/starboard) "wei" = ( -/obj/structure/machinery/door_display/research_cell{ - dir = 4; - id = "Containment Cell 1"; - name = "Cell 1 Control"; - pixel_x = -14; - pixel_y = 8 +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "Containment Breach"; + name = "\improper Secure Airlock" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, /turf/open/floor/almayer{ - dir = 8; - icon_state = "sterile_green_side" + icon_state = "test_floor4" }, -/area/almayer/medical/containment) +/area/almayer/medical/hydroponics) "wex" = ( /obj/structure/machinery/light{ dir = 4 @@ -72533,6 +73421,14 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) +"wiW" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/medical/hydroponics) "wjq" = ( /obj/structure/bed/chair/comfy/beige{ dir = 8 @@ -72588,10 +73484,15 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, +/obj/structure/machinery/door/poddoor/almayer/open{ + dir = 4; + id = "Containment Breach"; + name = "\improper Secure Airlock" + }, /turf/open/floor/almayer{ - icon_state = "sterile_green_side" + icon_state = "test_floor4" }, -/area/almayer/medical/upper_medical) +/area/almayer/medical/medical_science) "wkH" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/device/whistle{ @@ -72795,13 +73696,10 @@ /turf/open/floor/almayer, /area/almayer/squads/alpha_bravo_shared) "woh" = ( -/obj/structure/bed/chair, -/obj/structure/sign/safety/intercom{ - pixel_x = 8; - pixel_y = 32 +/turf/closed/wall/almayer/research/containment/wall/corner{ + dir = 4 }, -/turf/open/floor/wood/ship, -/area/almayer/medical/medical_science) +/area/almayer/medical/containment/cell) "wom" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -72971,6 +73869,14 @@ icon_state = "cargo" }, /area/almayer/hallways/hangar) +"wse" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "sterile_green" + }, +/area/almayer/medical/containment) "wsD" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -73069,16 +73975,6 @@ /obj/item/reagent_container/food/snacks/sliceable/pizza/vegetablepizza, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_p) -"wuP" = ( -/obj/structure/machinery/vending/coffee, -/obj/structure/sign/safety/coffee{ - pixel_x = 8; - pixel_y = -32 - }, -/turf/open/floor/almayer{ - icon_state = "sterile_green_side" - }, -/area/almayer/medical/medical_science) "wvb" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -73696,8 +74592,21 @@ }, /area/almayer/command/combat_correspondent) "wKP" = ( -/obj/structure/disposalpipe/segment, -/turf/closed/wall/almayer/white/reinforced, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + dir = 4; + id = "Containment Breach"; + name = "\improper Secure Airlock" + }, +/obj/structure/window/framed/almayer/white, +/turf/open/floor/plating, /area/almayer/medical/containment) "wLi" = ( /obj/structure/machinery/door_control/airlock{ @@ -73737,13 +74646,14 @@ /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south2) "wLy" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "sterile_green_side" +/obj/structure/pipes/vents/pump{ + name = "Secure Air Vent"; + welded = 1 }, -/area/almayer/medical/medical_science) +/turf/open/floor/almayer/research/containment/floor2{ + dir = 1 + }, +/area/almayer/medical/containment/cell) "wLG" = ( /obj/item/bedsheet/blue{ layer = 3.2 @@ -73787,6 +74697,14 @@ icon_state = "kitchen" }, /area/almayer/living/grunt_rnr) +"wLN" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "sterile_green" + }, +/area/almayer/medical/containment) "wMm" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -73805,14 +74723,15 @@ }, /area/almayer/squads/alpha) "wMO" = ( -/obj/structure/sign/catclock{ - pixel_y = 32 +/obj/structure/machinery/door/poddoor/almayer/open{ + dir = 4; + id = "Containment Breach"; + name = "\improper Secure Airlock" }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_side" + icon_state = "test_floor4" }, -/area/almayer/medical/upper_medical) +/area/almayer/medical/medical_science) "wNl" = ( /obj/structure/surface/table/almayer, /obj/item/trash/USCMtray{ @@ -73888,10 +74807,10 @@ }, /area/almayer/shipboard/brig/execution) "wPz" = ( -/turf/open/floor/almayer/research/containment/corner{ - dir = 1 +/turf/open/floor/almayer{ + icon_state = "mono" }, -/area/almayer/medical/containment/cell) +/area/almayer/medical/hydroponics) "wPC" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -74083,12 +75002,8 @@ /turf/open/floor/almayer, /area/almayer/engineering/upper_engineering/port) "wTM" = ( -/obj/structure/machinery/vending/snack, -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - icon_state = "sterile_green_side" - }, -/area/almayer/medical/medical_science) +/turf/closed/wall/almayer/research/containment/wall/south, +/area/almayer/medical/containment/cell) "wTN" = ( /obj/structure/surface/table/almayer, /obj/item/storage/box/cups{ @@ -74306,25 +75221,13 @@ }, /area/almayer/hallways/aft_hallway) "wWm" = ( -/obj/structure/machinery/photocopier, -/obj/structure/sign/safety/terminal{ - pixel_y = 32 - }, -/obj/structure/sign/safety/commline_connection{ - pixel_x = 15; - pixel_y = 32 +/turf/open/floor/almayer/research/containment/corner_var1{ + icon_state = "containment_corner_variant_2" }, -/turf/open/floor/wood/ship, -/area/almayer/medical/medical_science) +/area/almayer/medical/containment/cell) "wWz" = ( -/obj/structure/machinery/chem_storage/medbay{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_side" - }, -/area/almayer/medical/testlab) +/turf/closed/wall/almayer/research/containment/wall/north, +/area/almayer/medical/containment/cell) "wWC" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_21" @@ -74356,6 +75259,17 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/port_hallway) +"wWR" = ( +/obj/structure/machinery/medical_pod/bodyscanner{ + dir = 8 + }, +/obj/structure/machinery/status_display{ + pixel_y = 30 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/medical/medical_science) "wWT" = ( /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -75207,6 +76121,25 @@ icon_state = "green" }, /area/almayer/hallways/starboard_hallway) +"xqp" = ( +/obj/structure/machinery/body_scanconsole{ + dir = 8; + layer = 3.1 + }, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/structure/machinery/disposal{ + density = 0; + desc = "A pneumatic delivery unit. Sends items to the requisitions."; + icon_state = "delivery_med"; + name = "Requisitions Delivery Unit"; + pixel_y = 29 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/medical/medical_science) "xqv" = ( /obj/structure/bed/sofa/south/white/right, /turf/open/floor/almayer{ @@ -75348,16 +76281,33 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_p) "xuE" = ( +/obj/structure/machinery/door/airlock/almayer/research/glass/reinforced{ + dir = 1; + id = "Containment Cell 5"; + locked = 1; + name = "\improper Containment Cell 5" + }, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "Containment Cell 5"; + name = "\improper Containment Cell 5"; + unacidable = 1 + }, /obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "Containment Breach"; + name = "\improper Secure Airlock" }, /turf/open/floor/almayer{ - dir = 10; - icon_state = "sterile_green_side" + icon_state = "test_floor4" }, -/area/almayer/medical/medical_science) +/area/almayer/medical/containment/cell) "xuI" = ( /obj/structure/sign/safety/water{ pixel_x = 8; @@ -75626,15 +76576,21 @@ /area/almayer/shipboard/brig/main_office) "xyt" = ( /obj/structure/surface/table/almayer, -/obj/structure/machinery/power/apc/almayer{ - dir = 1 +/obj/item/storage/toolbox/mechanical{ + pixel_x = 3; + pixel_y = 12 + }, +/obj/item/storage/toolbox/electrical{ + pixel_y = 5 + }, +/obj/item/folder/white{ + layer = 2.9; + pixel_x = -8 }, -/obj/item/folder/white, /turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_side" + icon_state = "mono" }, -/area/almayer/medical/containment/cell) +/area/almayer/medical/hydroponics) "xyw" = ( /turf/open/floor/almayer{ icon_state = "plate" @@ -75684,12 +76640,8 @@ /turf/open/floor/almayer, /area/almayer/shipboard/brig/cells) "xAe" = ( -/obj/structure/machinery/portable_atmospherics/hydroponics, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "sterile_green_corner" - }, -/area/almayer/medical/hydroponics) +/turf/closed/wall/almayer/research/containment/wall/corner, +/area/almayer/medical/containment/cell) "xAj" = ( /obj/structure/bed/chair/bolted{ dir = 8 @@ -76321,18 +77273,20 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/living/grunt_rnr) "xOY" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/surface/table/reinforced/prison, +/obj/structure/closet/secure_closet/surgical{ + pixel_x = -30 }, -/obj/structure/disposalpipe/junction{ - dir = 8; - icon_state = "pipe-j2" +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "sterile_green_side" +/obj/effect/decal/warning_stripes{ + icon_state = "W" }, -/area/almayer/medical/medical_science) +/turf/open/floor/almayer/research/containment/corner{ + dir = 4 + }, +/area/almayer/medical/containment/cell) "xPg" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -76359,13 +77313,10 @@ /turf/open/floor/almayer, /area/almayer/living/pilotbunks) "xQm" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/microwave, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "sterile_green_corner" +/turf/open/floor/almayer/research/containment/floor2{ + dir = 1 }, -/area/almayer/medical/medical_science) +/area/almayer/medical/containment/cell) "xQD" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ @@ -76564,6 +77515,19 @@ icon_state = "red" }, /area/almayer/squads/alpha) +"xSY" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "sterile_green_corner" + }, +/area/almayer/medical/containment) "xTp" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -76772,12 +77736,15 @@ }, /area/almayer/engineering/upper_engineering/port) "xXh" = ( -/obj/structure/machinery/portable_atmospherics/hydroponics, +/turf/closed/wall/almayer/research/containment/wall/west, +/area/almayer/medical/containment/cell) +"xXr" = ( +/obj/item/reagent_container/glass/beaker/bluespace, +/obj/structure/machinery/chem_dispenser/research, /turf/open/floor/almayer{ - dir = 8; - icon_state = "sterile_green_side" + icon_state = "mono" }, -/area/almayer/medical/hydroponics) +/area/almayer/medical/medical_science) "xXu" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -76803,8 +77770,8 @@ /obj/effect/spawner/random/toolbox, /obj/structure/machinery/computer/working_joe{ dir = 4; - pixel_y = 14; - pixel_x = -17 + pixel_x = -17; + pixel_y = 14 }, /turf/open/floor/almayer{ dir = 10; @@ -76992,6 +77959,14 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/delta) +"ycj" = ( +/obj/structure/machinery/medical_pod/sleeper{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/medical/medical_science) "ycm" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -77039,6 +78014,15 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/north2) +"ydE" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/medical/hydroponics) "ydI" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -77336,11 +78320,26 @@ }, /area/almayer/shipboard/brig/main_office) "ylc" = ( -/obj/structure/disposalpipe/down/almayer{ - dir = 2; - id = "almayerlink_med_req" +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + dir = 4; + id = "Containment Breach"; + name = "\improper Secure Airlock" + }, +/obj/structure/machinery/door/airlock/almayer/research/reinforced{ + dir = 8; + name = "\improper Containment Airlock" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, -/turf/closed/wall/almayer/white/reinforced, /area/almayer/medical/containment) "yle" = ( /obj/effect/landmark/start/marine/engineer/delta, @@ -107272,22 +108271,22 @@ avn nFr ajt ajC -irA -irA -irA -irA -irA -irA -irA -irA -irA -irA -irA -irA -irA -irA -irA -sqf +vOy +vOy +vOy +vOy +vOy +vOy +vOy +vOy +vOy +vOy +vOy +vOy +vOy +vOy +vOy +vOy wMO wky ajl @@ -107475,24 +108474,24 @@ abE jKK pjM aim -irA +vOy nos fcy -fcy -fcy +drT +ipQ lZZ -hEU +vOy oDL nEH vAQ -irA +qIL ncE vWt kNx -irA +vOy ayX -aos -wky +kXw +pxo ajl kHT pjM @@ -107678,21 +108677,21 @@ abE atL akV atL -irA -icM -oFj -iYf -pNP +vOy oNp -ruc +aSn +lYL +pNP +kCj +vOy nLI -dGB +rDV dwr -kbf -kBP +rDV +mTd gQF -aID -aMd +xXr +vOy niL kXw pxo @@ -107881,24 +108880,24 @@ agA ago snm cwJ -irA -icM +vOy +anz vgx hme mzq -oNp -ovG -dGB -dGB +qJy +vOy +vti +vti fBO -kbf +vti gGx -iUo -fBO +vti +lid lJv aCC -akw -wky +kXw +pxo asn ago asW @@ -108084,24 +109083,24 @@ uZZ bYe amO avj -irA -icM -hqL -mab +vOy +awQ +oLU +thN vDa -oNp -pEJ +vOy +vOy qfy inL oiY -irA -iQo -dGB +ueJ +ueJ +oDi trF -irA +lJv edv -akw -wky +kXw +pxo asn ayT akU @@ -108287,24 +109286,24 @@ agq ahM kSJ avj -uXj +vOy hng dnC hPN vCk qEn -lmE +qam riE gAS -fxY -irA -hVO -dGB +lMv +dVu +eSo +qmD aIC -irA +lJv aCt -aCC -wky +kXw +pxo asn ayT aii @@ -108490,25 +109489,25 @@ agA ayT ajt avm -uXj -uVi -hER -dGB -hER +vOy +xyt +wiW +tOr +dBj wei kBP -dGB -dGB +kBP +jsx tjn -irA -irA +aCC +kXw pQP -irA -irA +qAT +vOy vOy -eNP -hUR -ajo +mFq +vqW +ajl ybf aii avj @@ -108693,19 +109692,19 @@ abE aTL ajt avj -uXj -xyt -dGB -dGB -dGB -dGB -dGB -dGB -dGB -rSD -irA -aEZ -aoM +vOy +iYf +bIM +wPz +iUo +vOy +xqp +lzA +vkp +tjn +aCC +kXw +vtm emK fGu hPe @@ -108896,25 +109895,25 @@ agA ayT akU avj -uXj +vOy mTp -eoz -dGB -eoz +wiW +wPz +jeq rQy -eoz -dGB -eoz -eSo -irA -ftG -aoM -aoM -vqW +wWR +ycj +vkp +cfT +hec +gNp +hVf dVu -aRc -aRc -aPJ +dVu +lON +dVu +oDR +vOP bYe bnD aWH @@ -109099,21 +110098,21 @@ agA ayT akU avj -uXj -nos -oLU -ekF +vOy +axn +dRh +ydE bST -jCG -oLU +rQy +vOy vdO -bST -lZZ -irA -kex -aoM +vkp aoM -aMg +kBo +kBP +naR +vOy +hrn vOy aRd aIo @@ -109302,20 +110301,20 @@ agA ayT akU avj -irA -icM -oFj -gLB +vOy +aAr +pGK tpa -ruV -oFj -gLB -hqw -oNp -irA +tpa +tpa +vOy +dHV +vkp +jUM +lou eBO -aoM -aoM +pRn +nxF ayZ aCD hFC @@ -109505,20 +110504,20 @@ abE aTL aii avj -irA -icM -hyp -hme -hyp -ruV -hyp -hme -hyp -oNp -irA +vOy +aID +gLc mKx -aoM -aoM +mKx +kZV +vOy +vOy +oIr +vOy +wdo +vOy +vOy +vOy qqQ aoM aoM @@ -109708,22 +110707,22 @@ agA ayT aii avj -irA -icM +vOy +aMd pGK -hme -hyp -ruV -cbg -hme +pRX +pRX +pRX +vOy +jFf vkp -oNp -irA +jrM +mWs lmw -bPF -aoM -qqQ -aAT +vOy +dyb +vkp +prx aoM eVT kgs @@ -109911,25 +110910,25 @@ uZZ bYe aii avj -irA -icM -hyp -hme -hyp -ruV -hyp -hme -hyp -oNp -irA +vOy +aMg +aSo +mHD +mHD +tzL +vOy +vqZ +vkp +rDr +usy nDo -mSK -aqQ -qqQ +vOy +glB +vkp ger aoM aFf -kgs +mmN ayT aii avj @@ -110114,23 +111113,23 @@ eWF bYe aii avj -irA -icM -hqL -thN -wPz -ruV -hqL -thN -wPz -oNp -irA +vOy +aQZ +bkT +pRX +pRX +pRX +vOy +foP +sZy +vEr +irU bVe -ipQ -aqR -qqQ +vOy +ggl +jjS qMP -aoM +kBP aSl vOy aTL @@ -110317,24 +111316,24 @@ agA ayT akU avj -irA -hng -lea -lea -lea -pRX -lea -lea +vOy +dVd lea -qEn -irA -awQ -jeq -aqR -qqQ -aoM -aoM -aSn +hKl +mKx +kZV +vOy +vOy +eNI +eNI +eNI +vOy +vOy +hRa +vti +vti +vti +aEZ vOy ayT akU @@ -110520,21 +111519,21 @@ abE giB akU avj -irA -irA -irA -irA -irA -irA -irA -irA +vOy +vOy +vOy +mSK +mSK +mSK +vOy +vOy ylc wKP -wKP -hKl -hKl +ylc +vOy +vOy rhO -qqQ +pgM nPE oqZ uaI @@ -110726,21 +111725,21 @@ ali amD cwJ vOy -wWm -mHD -bkT -amk -axn -ayY +vOy +vOy +vOy +vOy +vOy eNI -dEl -uqd -aLP -aqR -aQZ -dBj -drT -aSo +eNI +eNI +vOy +vOy +vOy +vOy +vOy +vOy +vOy vOy vIN aii @@ -110929,19 +111928,19 @@ abx abx avj vOy -ecx -elH -elH -aLP -cSK +elR +xXh +xXh +xXh +dMK aCR aAT aNY -aFf -aLP -aqR -krq -ajo +elR +xXh +xXh +xXh +dMK vOy vOy vOy @@ -111132,19 +112131,19 @@ all amK avj vOy -tvu -bnL -bnL -aLP -aqO -aoM -mtI -aoM -ncB -aLP -aqR +wWz +vHO +ruc +uvP +wTM +dNq +vVs +aFa +wWz +liY +ruc xOY -nCc +wTM vOy nzA amD @@ -111335,19 +112334,19 @@ aEX aii avm vOy -aml +wWz anw -uhV +wLy jlG aqP kCE -kCE +wLN npt xuE hqh wLy eiE -wuP +wTM vOy ayT akT @@ -111538,17 +112537,17 @@ ybf ajt avj vOy -amm -bnL -bnL -aPJ -aqQ -aoM -aoM -avA -grN +wWz +ovG +gxP aPJ -aqQ +wTM +apS +wse +aFa +wWz +ual +gxP aOe wTM vOy @@ -111742,18 +112741,18 @@ ani avj vOy woh -avp +vgO aoJ -aLP -rGR +alk +xAe avH -oeg -aFa -jHs -aLP -aqR -aoM -kHB +wse +cXC +woh +pLO +qxm +vgO +xAe vOy aOP aii @@ -111944,19 +112943,19 @@ bYe ajt avj vOy -qxP -anz -aoJ +vOy +vOy +uqd amk pYo avF coJ iAz cQo -amk +aIP aoK -aAr -xQm +vOy +vOy vOy asp aii @@ -112150,13 +113149,13 @@ vOy vOy vOy vOy -amk -aqR +vKb +rzN avG -oeg +jbK aOd sXd -amk +aJn vOy vOy vOy @@ -112349,14 +113348,14 @@ aNi asp amO avj -alH +bPF aqG ata vOy apR aqS -kCE -kCE +mnW +nPf vYz awR uoi @@ -112552,17 +113551,17 @@ rfg bYe amO bYe -apI +cbg aqG atb vOy -apS -avA +xSY rzN +lCt lto -aqQ -avA -gLc +paa +sXd +gVq vOy aMi biB @@ -112755,21 +113754,21 @@ aej iiC amO tHh -hgv -hgv -hgv -hgv +vOy +vOy +vOy +vOy msi kDk -msi +kbJ cJM jlA qLi -jlA -qJy -qJy -qJy -qJy +dEm +vOy +vOy +vOy +vOy apv akU jHG @@ -112958,21 +113957,21 @@ aej ayT amO avj -hgv +vOy elR -anx -aoO +xXh +xXh apU taH aBe -cJM +otu jBO jNc ean xXh -aAt +xXh dMK -qJy +vOy ayT akU avj @@ -113161,21 +114160,21 @@ yaz bYe ajt avj -hgv -nGr -eNT -anF -anF -taH -aBe -cJM +vOy +wWz vHO -jNc -tyD -tyD -tyD -pTM -qJy +uXj +uXj +iwJ +jVt +uyH +vHO +iwJ +uXj +uXj +rdt +wTM +vOy ayT aii avj @@ -113364,21 +114363,21 @@ eup bYe ajt avj -hgv -uPX -anF -anF -anF -taH -pjC -cJM -avI -jNc -tyD -coZ +vOy +wWz +uwZ +wWm +jQt +nwi +sNz +uyH +uwZ +kGQ +jQt coZ -dnx -qJy +sNz +wTM +vOy ayT aii avj @@ -113567,21 +114566,21 @@ aej pSL amT mIW -hgv -amn -anF -anF -koL +vOy +wWz +pEJ +xQm +wLy eqD sNz -cJM +uyH sWW mWW -pvm -pvm +wLy +xQm tfH -cLI -qJy +wTM +vOy aEK aSv ioX @@ -113770,21 +114769,21 @@ aej atL akV atL -hgv -mYj -anF -anF -anF -anF -rjF -cJM +vOy +wWz uwZ tyD +jQt +vfP +sNz +uyH +uwZ tyD -coZ -coZ -dnx -qJy +jQt +vfP +sNz +wTM +vOy atL akV atL @@ -113973,21 +114972,21 @@ aaO alp aio baB -hgv +vOy wWz -anF +qxP gxP -anF -anF +gxP +jgg jZs -cJM +uyH iRN -tyD -tyD -tyD -tyD -pTM -qJy +jgg +gxP +gxP +nMe +wTM +vOy alp aio baB @@ -114176,21 +115175,21 @@ acC iWN amO dLE -hgv -euB -cba -kSc -cba -emR -jgA -cJM -rgn -urc -tPX +vOy +woh +vgO +vgO +vgO +vgO +vgO +utX +vgO +vgO +vgO +vgO vgO -jtd xAe -qJy +vOy aIS alq wWk @@ -114379,21 +115378,21 @@ aaE afD kaA anh -hgv -hgv -hgv -hgv -hgv -hgv -hgv -qJy -qJy -qJy -qJy -qJy -qJy -qJy -qJy +vOy +vOy +vOy +vOy +vOy +vOy +vOy +vOy +vOy +vOy +vOy +vOy +vOy +vOy +vOy xFw iTK anh diff --git a/sound/effects/tunnel_collapse.ogg b/sound/effects/tunnel_collapse.ogg new file mode 100644 index 000000000000..c80abe2611b1 Binary files /dev/null and b/sound/effects/tunnel_collapse.ogg differ diff --git a/sound/theme/lastmanstanding_clf.ogg b/sound/theme/lastmanstanding_clf.ogg new file mode 100644 index 000000000000..365af09116bb Binary files /dev/null and b/sound/theme/lastmanstanding_clf.ogg differ diff --git a/sound/theme/lastmanstanding_upp.ogg b/sound/theme/lastmanstanding_upp.ogg new file mode 100644 index 000000000000..d74812f73df1 Binary files /dev/null and b/sound/theme/lastmanstanding_upp.ogg differ diff --git a/sound/theme/lastmanstanding_wy.ogg b/sound/theme/lastmanstanding_wy.ogg new file mode 100644 index 000000000000..225914b416d1 Binary files /dev/null and b/sound/theme/lastmanstanding_wy.ogg differ diff --git a/tgui/packages/tgui/interfaces/AresInterface.js b/tgui/packages/tgui/interfaces/AresInterface.js index 5cd78011a81c..3023cf1a5297 100644 --- a/tgui/packages/tgui/interfaces/AresInterface.js +++ b/tgui/packages/tgui/interfaces/AresInterface.js @@ -1268,8 +1268,14 @@ const AntiAir = (props, context) => { const Security = (props, context) => { const { data, act } = useBackend(context); - const { logged_in, access_text, last_page, current_menu, records_security } = - data; + const { + logged_in, + access_text, + last_page, + current_menu, + records_security, + access_level, + } = data; return ( <> @@ -1405,7 +1411,8 @@ const Emergency = (props, context) => { let nuke_reason = 'Request a nuclear device to be authorized by USCM High Command.'; if (!nuke_available) { - nuke_reason = 'No nuclear ordnance is available during this operation.'; + nuke_reason = + 'No nuclear ordnance is available during this operation, or one has already been provided.'; } else if (mission_failed) { nuke_reason = 'You have already lost the objective, you cannot use a nuclear device aboard the ship!'; diff --git a/tgui/packages/tgui/interfaces/NuclearBomb.js b/tgui/packages/tgui/interfaces/NuclearBomb.js index b29bc17e0779..e49b958f7857 100644 --- a/tgui/packages/tgui/interfaces/NuclearBomb.js +++ b/tgui/packages/tgui/interfaces/NuclearBomb.js @@ -18,7 +18,7 @@ export const NuclearBomb = (_props, context) => { {data.decryption_complete ? 'Decryption complete.' : `Decryption time left : - ${data.decryption_time} seconds`} + ${data.decryption_time} minutes`} diff --git a/tgui/packages/tgui/interfaces/SquadMod.js b/tgui/packages/tgui/interfaces/SquadMod.js index 85ff237d3aac..15ce727a5341 100644 --- a/tgui/packages/tgui/interfaces/SquadMod.js +++ b/tgui/packages/tgui/interfaces/SquadMod.js @@ -5,7 +5,6 @@ import { Window } from '../layouts'; export const SquadMod = (props, context) => { const { act, data } = useBackend(context); const { squads = [], human, id_name, has_id } = data; - const COLORS_SPECTRUM = ['red', 'yellow', 'purple', 'teal', 'brown', 'grey']; return ( @@ -47,7 +46,7 @@ export const SquadMod = (props, context) => { key={entry.name} fluid content={entry.name} - color={COLORS_SPECTRUM[entry.color]} + backgroundColor={entry.color} onClick={() => act('PRG_squad', { name: entry.name, diff --git a/tgui/packages/tgui/interfaces/YautjaEmotes.tsx b/tgui/packages/tgui/interfaces/YautjaEmotes.tsx new file mode 100644 index 000000000000..d33e1cfbdf10 --- /dev/null +++ b/tgui/packages/tgui/interfaces/YautjaEmotes.tsx @@ -0,0 +1,110 @@ +import { useBackend, useLocalState } from '../backend'; +import { Box, Button, Divider, Section, Stack, Tabs } from '../components'; +import { Window } from '../layouts'; +import { BooleanLike } from '../../common/react'; + +type Emote = { + id: string; + text: string; + category: string; + path: string; +}; + +type BackendContext = { + categories: string[]; + emotes: Emote[]; + on_cooldown: BooleanLike; +}; + +const EmoteTab = (props, context) => { + const { data, act } = useBackend(context); + const { categories, emotes, on_cooldown } = data; + const [categoryIndex, setCategoryIndex] = useLocalState( + context, + 'category_index', + 'Fake Sound' + ); + const mapped_emote = emotes.filter( + (emote) => emote && emote.category === categoryIndex + ); + return ( + + + + + {categories.map((item, key) => ( + { + setCategoryIndex(item); + }}> + {item} + + ))} + + + + +
+ + + {mapped_emote.map((item) => ( + + + {' '} + + + + +
+ + + ); +}; + +export const YautjaEmotes = (props, context) => { + return ( + + + + + + ); +}; diff --git a/tools/MapTileImageTool/MapTileImageTool.py b/tools/MapTileImageTool/MapTileImageTool.py new file mode 100644 index 000000000000..cf0919c3a88b --- /dev/null +++ b/tools/MapTileImageTool/MapTileImageTool.py @@ -0,0 +1,85 @@ +#This script processes screenshots from the Mass-Screenshot Debug verb in SS13 into a full map image + +# Loosely based on https://github.com/vortex1942/telescience/blob/master/src/tools/PhotoProcessor.py + +# This script uses the Pillow library (PIL) install it with pip install pillow + +#***************************************************************** +#******ALL .pngs in the rawimages folder will be processed******** +#********Exported file may be overwritten in the output*********** +#***************************************************************** + +from PIL import Image +from os import listdir, path + +# Selection of Input/Output directories +rawimgdir = str(input("Directory of RAW images: ")) +if path.exists(rawimgdir) == False: + print("Directory could not be found!") + exit(1) + +imgdir = str(input("Directory for output image (leave blank to use RAW image directory): ")) +if imgdir == "": + imgdir = rawimgdir +elif path.exists(imgdir) == False: + print("Directory could not be found!") + exit(1) + +exportfilename = str(input("Filename for Full Image (E.g LV624_Complete): ")) +if exportfilename == "": + print("Filename is invalid!") + exit(1) + +gamearguments = str(input("Values provided after using the Mass-Screenshot verb: ")) +gamearguments = gamearguments.split() +if len(gamearguments) != 4: + print("Invalid arguments!") + exit(1) +pixelsize = int(gamearguments[3]) +halfchunksize = int(gamearguments[2]) +width = (int(gamearguments[0]) + halfchunksize - 2) +height = (int(gamearguments[1]) + halfchunksize - 2) +if width < 1 or height < 1 or pixelsize < 1 or halfchunksize < 1 or halfchunksize * 2 >= width or halfchunksize * 2 >= height: + print("Invalid arguments!") + exit(1) +width *= pixelsize +height *= pixelsize +halfchunksize *= pixelsize + +# Function for saving the image (params: name=Filename, export=Image IMG variable) +def func_exportfullimage(name, export): + print("SAVING IMAGE") + file = (imgdir+"\\"+name+".png") + print(file) + file = open(file, "wb") + export.save(file) + +# Where the magic happens, Creates a canvas and pastes RAWimages in a grid fashion +masterexport = Image.new("RGBA", (width,height), color=(0,0,0,255)) +imagelist = [file for file in sorted(listdir(rawimgdir), key=lambda x: path.getmtime(rawimgdir+"\\"+x)) if file.endswith('.png')] +imagecount = len(imagelist) +chunksize = halfchunksize * 2 - pixelsize +x = fc = 0 +y = height - chunksize + +# For loop stitches RAw images together +for p in imagelist: + file = (rawimgdir+"\\"+p) + photo = Image.open(file).convert("RGBA") + #Verbose mode [Iteration] [Image Coords] [RAW Filename] + #print("iter: " f"{fc : >2}", "IMG XY: " f"{x : >4}", f"{y : >4}", "FILE: " f"{p : >13}") + masterexport.paste(photo, (x, y)) + x += chunksize + fc += 1 + if x >= width: + x = 0 + y -= chunksize + y = max(y, 0) + progress = fc / imagecount * 100 + print("%.1f" % progress, "%") + x = min(x, width - chunksize) + +func_exportfullimage(exportfilename, masterexport) + +# Hopefully you got this far +print("COMPLETED :)") diff --git a/tools/dmi/test.py b/tools/dmi/test.py index 09629927d88a..fcf73603f7d5 100644 --- a/tools/dmi/test.py +++ b/tools/dmi/test.py @@ -3,23 +3,54 @@ from dmi import * +def green(text): + return "\033[32m" + str(text) + "\033[0m" + + +def red(text): + return "\033[31m" + str(text) + "\033[0m" + + def _self_test(): # test: can we load every DMI in the tree count = 0 + failed = 0 for dirpath, dirnames, filenames in os.walk('.'): if '.git' in dirnames: dirnames.remove('.git') for filename in filenames: if filename.endswith('.dmi'): fullpath = os.path.join(dirpath, filename) + failures_this_file = 0 try: - Dmi.from_file(fullpath) + dmi = Dmi.from_file(fullpath) + dmi_states = dmi.states + number_of_icon_states = len(dmi.states) + if number_of_icon_states > 512: + print("{0} {1} has too many icon states: {2}/512.".format(red("FAIL"), fullpath, number_of_icon_states)) + failures_this_file += 1 + existing_states = [] + for state in dmi_states: + state_name = state.name + if state.movement: + state_name += "_MOVEMENT_STATE_TRUE" + if state_name in existing_states: + print("{0} {1} has a duplicate state '{2}'.".format(red("FAIL"), fullpath, state.name)) + failures_this_file += 1 + continue + existing_states.append(state_name) except Exception: - print('Failed on:', fullpath) + print("{0} {1} threw an exception.".format(red("FAIL"), fullpath)) + failures_this_file += 1 raise count += 1 + if failures_this_file > 0: + failed += 1 - print(f"{os.path.relpath(__file__)}: successfully parsed {count} .dmi files") + print(f"{os.path.relpath(__file__)}: {green(f'successfully parsed {count-failed} .dmi files')}") + if failed > 0: + print(f"{os.path.relpath(__file__)}: {red(f'failed to parse {failed} .dmi files')}") + exit(1) def _usage():