diff --git a/.gitignore b/.gitignore index 210efc84d75b..105a74f3dbaf 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,5 @@ test_environment.txt # byond-tracy backend, not shipped with the codebase so it shouldn't be maintained prof.dll libprof.so + +code\__DEFINES\__rust_g.dm diff --git a/.tgs.yml b/.tgs.yml index ba3fc6b26c66..733fc80a74f1 100644 --- a/.tgs.yml +++ b/.tgs.yml @@ -3,6 +3,7 @@ byond: "514.1588" static_files: - name: config - name: data + - name: local.db linux_scripts: PreCompile.sh: tools/tgs_scripts/PreCompile.sh WatchdogLaunch.sh: tools/tgs_scripts/WatchdogLaunch.sh diff --git a/README.md b/README.md index abac21f624f0..5eaf96f297c5 100644 --- a/README.md +++ b/README.md @@ -1,37 +1,37 @@ -## CM-SS13 codebase +## RUCM-SS13 codebase (fork from CM-SS13) [![forinfinityandbyond](https://user-images.githubusercontent.com/5211576/29499758-4efff304-85e6-11e7-8267-62919c3688a9.gif)](https://www.reddit.com/r/SS13/comments/5oplxp/what_is_the_main_problem_with_byond_as_an_engine/dclbu1a) [![Build Status](https://github.com/cmss13-devs/cmss13/workflows/CI%20Suite/badge.svg)](https://github.com/cmss13-devs/cmss13/actions?query=workflow%3A%22CI+Suite%22) -* **Website:** https://forum.cm-ss13.com/ -* **Code:** https://github.com/cmss13-devs/cmss13 -* **Wiki:** https://cm-ss13.com/wiki/Main_Page +* **Вебсайт разработчиков оригинального кода:** https://forum.cm-ss13.com/ +* **Оригинальный код:** https://github.com/cmss13-devs/cmss13 +* **Оригинальная вики:** https://cm-ss13.com/wiki/Main_Page -This is the codebase for the CM-SS13 flavoured fork of SpaceStation 13 +Это репозиторий RUCM-SS13, форк кодбазы CM-SS13, которая в свою очередь форк игры SpaceStation 13... -Space Station 13 is a paranoia-laden round-based roleplaying game set against the backdrop of a nonsensical, metal death trap masquerading as a space station, with charming spritework designed to represent the sci-fi setting and its dangerous undertones. Have fun, and survive! CM-SS13 has wildly adapted this idea into a strategic roleplay-based team deathmatch game. +Space Station 13 - это параноидальная круговая ролевая игра, действие которой разворачивается на металлической коробке смерти, маскирующейся под космическую станцию, с очаровательной графикой, призванной отобразить научно-фантастическую обстановку и ее опасный подтекст. Данный билд - полная конверсия классической станции 13 под сеттинг мира серии научно фантастических фильмов ужасов "Чужой" в стиле "ролевой командный бой насмерть" -## :exclamation: How to compile :exclamation: +## :exclamation: Как скомпилировать билд :exclamation: -On **2022-04-06** we have changed the way to compile the codebase. +**2022-04-06** оригинальные ЦМы изменили способ компиляции билда с классического (через byond) на продвинутый. -**The quick way**. Find `bin/server.cmd` in this folder and double click it to automatically build and host the server on port 1337. +**Быстрый способ**. Найдите файл `bin/server.cmd` и дважды щелкните на нем для автоматической сборки и размещения сервера на порту 1337. -**The long way**. Find `bin/build.cmd` in this folder, and double click it to initiate the build. It consists of multiple steps and might take around 1-5 minutes to compile. If it closes, it means it has finished its job. You can then set up the server normally by opening `colonialmarines.dmb` in DreamDaemon. +**Долгий способ**. Найдите файл `bin/build.cmd` и дважды щелкните на нем, чтобы запустить сборку. Сборка состоит из нескольких этапов и может занять около 1-5 минут. Если программа закрывается, это означает, что она завершила свою работу. После этого можно нормально настроить сервер, открыв `colonialmarines.dmb` в DreamDaemon. -**Building colonialmarines in DreamMaker directly is now deprecated and might produce errors**, such as `'tgui.bundle.js': cannot find file`. +**Компилирование кода в DreamMaker напрямую устарело и может приводить к ошибкам**, такие как `'tgui.bundle.js': cannot find file`. -**[How to compile in VSCode and other build options](tools/build/README.md).** +**[Как компилировать в VSCode и другие варианты сборки](tools/build/README.md).** -## Contributors -[Guides for Contributors](.github/CONTRIBUTING.md) +## Помощь в разработке +[Руководство по помощи в разработке](.github/CONTRIBUTING.md) -[Setting up a Development Environment](https://cm-ss13.com/wiki/Guide_to_Git) +[Настройка среды разработки](https://cm-ss13.com/wiki/Guide_to_Git) -## LICENSE +## Лицензия -The code for CM-SS13 is licensed under the [GNU Affero General Public License v3](http://www.gnu.org/licenses/agpl.html), which can be found in full in [/LICENSE-AGPL3](/LICENSE-AGPL3). +Код для CM-SS13 лицензирован под [GNU Affero General Public License v3](http://www.gnu.org/licenses/agpl.html), с которым можно ознакомиться в полном объеме в [/LICENSE-AGPL3](/LICENSE-AGPL3). -Assets including icons and sound are under the [Creative Commons 3.0 BY-SA license](https://creativecommons.org/licenses/by-sa/3.0/) unless otherwise indicated. Authorship for assets including art and sound under the CC BY-SA license is defined as the active development team of CM-SS13 unless stated otherwise (by author of the commit). +Активы, включая иконки и звук, находятся под лицензией [Creative Commons 3.0 BY-SA license](https://creativecommons.org/licenses/by-sa/3.0/) если не указано иное. Авторство на активы, включая искусство и звук, под лицензией CC BY-SA определяется как активная команда разработчиков CM-SS13, если не указано иное (автор коммита). -All code is assumed to be licensed under AGPL v3 unless stated otherwise by file header. Commits before 9a001bf520f889b434acd295253a1052420860af are assumed to be licensed under GPLv3 and can be used in closed source repo. +Предполагается, что код лицензируется по AGPL v3, если в заголовке файла не указано иное. Коммиты до 9a001bf520f889b434acd295253a1052420860af считаются лицензированными по GPLv3 и могут быть использованы в закрытом репозитории. diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index 97e4b0dbd1e8..4eba0bb90498 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -37,6 +37,7 @@ most of them are tied into map-placed objects. This should be reworked in the fu #define ACCESS_MARINE_KITCHEN 30 #define ACCESS_MARINE_CO 31 #define ACCESS_MARINE_TL_PREP 32 +#define ACCESS_MARINE_WALKER 33 #define ACCESS_MARINE_MAINT 34 #define ACCESS_MARINE_OT 35 diff --git a/code/__DEFINES/chemistry.dm b/code/__DEFINES/chemistry.dm index 078ccbdc2d94..641e80fdf5ff 100644 --- a/code/__DEFINES/chemistry.dm +++ b/code/__DEFINES/chemistry.dm @@ -32,6 +32,9 @@ #define HIGH_REAGENTS_OVERDOSE_CRITICAL 100 +// Chance of bicaridine OD to patch IB per every process_mob() +#define BICARIDINE_OD_IB_TREAT_CHANCE 4 + // How many units of reagent are consumed per tick, by default. #define REAGENTS_METABOLISM AMOUNT_PER_TIME(1, 10 SECONDS) // By defining the effect multiplier this way, it'll exactly adjust diff --git a/code/__DEFINES/job.dm b/code/__DEFINES/job.dm index d80c3b5bb23b..1ff10ee9b251 100644 --- a/code/__DEFINES/job.dm +++ b/code/__DEFINES/job.dm @@ -77,9 +77,10 @@ var/global/list/job_command_roles = JOB_COMMAND_ROLES_LIST #define JOB_PILOT "Pilot Officer" #define JOB_DROPSHIP_CREW_CHIEF "Dropship Crew Chief" #define JOB_CREWMAN "Vehicle Crewman" +#define JOB_WALKER "Mech Operator" #define JOB_INTEL "Intelligence Officer" #define JOB_AUXILIARY_ROLES /datum/timelock/auxiliary -#define JOB_AUXILIARY_ROLES_LIST list(JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_CREWMAN, JOB_INTEL) +#define JOB_AUXILIARY_ROLES_LIST list(JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_CREWMAN, JOB_WALKER, JOB_INTEL) #define JOB_POLICE "Military Police" #define JOB_WARDEN "Military Warden" diff --git a/code/__DEFINES/mode.dm b/code/__DEFINES/mode.dm index cd32a273c6d8..c3aa82e4aa9c 100644 --- a/code/__DEFINES/mode.dm +++ b/code/__DEFINES/mode.dm @@ -109,12 +109,12 @@ //================================================= //Role defines, specifically lists of roles for job bans, crew manifests and the like. -var/global/list/ROLES_COMMAND = list(JOB_CO, JOB_XO, JOB_SO, JOB_AUXILIARY_OFFICER, JOB_INTEL, JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_CREWMAN, JOB_POLICE, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_CHIEF_REQUISITION, JOB_CHIEF_ENGINEER, JOB_CMO, JOB_CHIEF_POLICE, JOB_SEA, JOB_SYNTH, JOB_WARDEN) +var/global/list/ROLES_COMMAND = list(JOB_CO, JOB_XO, JOB_SO, JOB_AUXILIARY_OFFICER, JOB_INTEL, JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_CREWMAN, JOB_WALKER, JOB_POLICE, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_CHIEF_REQUISITION, JOB_CHIEF_ENGINEER, JOB_CMO, JOB_CHIEF_POLICE, JOB_SEA, JOB_SYNTH, JOB_WARDEN) //Marine roles -#define ROLES_OFFICERS list(JOB_CO, JOB_XO, JOB_SO, JOB_AUXILIARY_OFFICER, JOB_INTEL, JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_SEA, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_SYNTH, JOB_CHIEF_POLICE, JOB_WARDEN, JOB_POLICE) +#define ROLES_OFFICERS list(JOB_CO, JOB_XO, JOB_SO, JOB_AUXILIARY_OFFICER, JOB_INTEL, JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_CREWMAN, JOB_WALKER, JOB_SEA, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_SYNTH, JOB_CHIEF_POLICE, JOB_WARDEN, JOB_POLICE) var/global/list/ROLES_CIC = list(JOB_CO, JOB_XO, JOB_SO, JOB_WO_CO, JOB_WO_XO) -var/global/list/ROLES_AUXIL_SUPPORT = list(JOB_AUXILIARY_OFFICER, JOB_INTEL, JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_WO_CHIEF_POLICE, JOB_WO_SO, JOB_WO_CREWMAN, JOB_WO_POLICE, JOB_WO_PILOT) +var/global/list/ROLES_AUXIL_SUPPORT = list(JOB_AUXILIARY_OFFICER, JOB_INTEL, JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_CREWMAN, JOB_WALKER, JOB_WO_CHIEF_POLICE, JOB_WO_SO, JOB_WO_CREWMAN, JOB_WO_POLICE, JOB_WO_PILOT) var/global/list/ROLES_MISC = list(JOB_SYNTH, JOB_WORKING_JOE, JOB_SEA, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_MESS_SERGEANT, JOB_WO_CORPORATE_LIAISON, JOB_WO_SYNTH) var/global/list/ROLES_POLICE = list(JOB_CHIEF_POLICE, JOB_WARDEN, JOB_POLICE) var/global/list/ROLES_ENGINEERING = list(JOB_CHIEF_ENGINEER, JOB_ORDNANCE_TECH, JOB_MAINT_TECH, JOB_WO_CHIEF_ENGINEER, JOB_WO_ORDNANCE_TECH) @@ -125,7 +125,7 @@ var/global/list/ROLES_SQUAD_ALL = list(SQUAD_MARINE_1, SQUAD_MARINE_2, SQUAD_MAR //Groundside roles var/global/list/ROLES_XENO = list(JOB_XENOMORPH_QUEEN, JOB_XENOMORPH) -var/global/list/ROLES_WHITELISTED = list(JOB_SYNTH_SURVIVOR, JOB_CO_SURVIVOR, JOB_PREDATOR) +var/global/list/ROLES_WHITELISTED = list(JOB_SYNTH_SURVIVOR, JOB_CO_SURVIVOR, JOB_PREDATOR, JOB_WALKER) var/global/list/ROLES_SPECIAL = list(JOB_SURVIVOR) var/global/list/ROLES_USCM = ROLES_CIC + ROLES_POLICE + ROLES_AUXIL_SUPPORT + ROLES_MISC + ROLES_ENGINEERING + ROLES_REQUISITION + ROLES_MEDICAL + ROLES_MARINES - ROLES_WO @@ -138,7 +138,7 @@ var/global/list/ROLES_FACTION_CLASH = ROLES_USCM + JOB_PREDATOR var/global/list/ROLES_UNASSIGNED = list(JOB_SQUAD_MARINE) var/global/list/ROLES_WO = list(JOB_WO_CO, JOB_WO_XO, JOB_WO_CORPORATE_LIAISON, JOB_WO_SYNTH, JOB_WO_CHIEF_POLICE, JOB_WO_SO, JOB_WO_CREWMAN, JOB_WO_POLICE, JOB_WO_PILOT, JOB_WO_CHIEF_ENGINEER, JOB_WO_ORDNANCE_TECH, JOB_WO_CHIEF_REQUISITION, JOB_WO_REQUISITION, JOB_WO_CMO, JOB_WO_DOCTOR, JOB_WO_RESEARCHER, JOB_WO_SQUAD_MARINE, JOB_WO_SQUAD_MEDIC, JOB_WO_SQUAD_ENGINEER, JOB_WO_SQUAD_SMARTGUNNER, JOB_WO_SQUAD_SPECIALIST, JOB_WO_SQUAD_LEADER) //Role lists used for switch() checks in show_blurb_uscm(). Cosmetic, determines ex. "Engineering, USS Almayer", "2nd Bat. 'Falling Falcons'" etc. -#define BLURB_USCM_COMBAT JOB_CO, JOB_XO, JOB_SO, JOB_WO_CO, JOB_WO_XO, JOB_WO_CHIEF_POLICE, JOB_WO_SO, JOB_WO_CREWMAN, JOB_WO_POLICE, JOB_SEA,\ +#define BLURB_USCM_COMBAT JOB_CO, JOB_XO, JOB_SO, JOB_WO_CO, JOB_WO_XO, JOB_CREWMAN, JOB_WALKER, JOB_WO_CHIEF_POLICE, JOB_WO_SO, JOB_WO_CREWMAN, JOB_WO_POLICE, JOB_SEA,\ JOB_SQUAD_LEADER, JOB_SQUAD_TEAM_LEADER, JOB_SQUAD_SPECIALIST, JOB_SQUAD_SMARTGUN, JOB_SQUAD_MEDIC, JOB_SQUAD_ENGI, JOB_SQUAD_MARINE #define BLURB_USCM_FLIGHT JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF #define BLURB_USCM_MP JOB_CHIEF_POLICE, JOB_WARDEN, JOB_POLICE @@ -192,11 +192,11 @@ var/global/list/whitelist_hierarchy = list(WHITELIST_NORMAL, WHITELIST_COUNCIL, // Objective priorities #define OBJECTIVE_NO_VALUE 0 -#define OBJECTIVE_LOW_VALUE 0.1 -#define OBJECTIVE_MEDIUM_VALUE 0.2 -#define OBJECTIVE_HIGH_VALUE 0.35 -#define OBJECTIVE_EXTREME_VALUE 0.7 -#define OBJECTIVE_ABSOLUTE_VALUE 1.4 +#define OBJECTIVE_LOW_VALUE 0.2 +#define OBJECTIVE_MEDIUM_VALUE 0.3 +#define OBJECTIVE_HIGH_VALUE 0.5 +#define OBJECTIVE_EXTREME_VALUE 1 +#define OBJECTIVE_ABSOLUTE_VALUE 2 #define OBJECTIVE_POWER_VALUE 5 // Objective states diff --git a/code/__DEFINES/skills.dm b/code/__DEFINES/skills.dm index 5dabb4545a32..c216a6ab908c 100644 --- a/code/__DEFINES/skills.dm +++ b/code/__DEFINES/skills.dm @@ -52,12 +52,14 @@ #define SKILL_SPEC_GRENADIER 5 /// Can use heavy flamers #define SKILL_SPEC_PYRO 6 +/// Can use Heavy-Shield and N45 +#define SKILL_SPEC_ST 7 /// Can use smartguns -#define SKILL_SPEC_SMARTGUN 7 +#define SKILL_SPEC_SMARTGUN 8 /// UPP special training -#define SKILL_SPEC_UPP 8 +#define SKILL_SPEC_UPP 9 /// Can use ALL specialist weapons -#define SKILL_SPEC_ALL 9 +#define SKILL_SPEC_ALL 10 //construction skill #define SKILL_CONSTRUCTION_DEFAULT 0 diff --git a/code/__DEFINES/urls.dm b/code/__DEFINES/urls.dm index 4b7be8f8e093..5115aff20f0d 100644 --- a/code/__DEFINES/urls.dm +++ b/code/__DEFINES/urls.dm @@ -18,6 +18,7 @@ #define URL_WIKI_CONSTRUCTION "https://cm-ss13.com/wiki/Guide_to_construction" #define URL_WIKI_ENGINEERING "https://cm-ss13.com/wiki/Guide_to_Engineering" #define URL_WIKI_HACKING "https://cm-ss13.com/wiki/Guide_to_Engineering#Hacking" +#define URL_WIKI_APC "https://cm-ss13.com/wiki/Guide_to_Engineering#APC_Maintenance" #define URL_WIKI_SURGERY "https://cm-ss13.com/wiki/Surgery" #define URL_WIKI_MEDICAL "https://cm-ss13.com/wiki/Guide_to_Medicine" @@ -38,6 +39,7 @@ #define URL_WIKI_ASO_GUIDE "https://cm-ss13.com/wiki/Auxiliary_Support_Officer" // Auxiliary Support #define URL_WIKI_PO_GUIDE "https://cm-ss13.com/wiki/Pilot_Officer" #define URL_WIKI_DCC_GUIDE "https://cm-ss13.com/wiki/Dropship_Crew_Chief" +#define URL_WIKI_VC_GUIDE "https://cm-ss13.com/wiki/Vehicle_Crewman" #define URL_WIKI_IO_GUIDE "https://cm-ss13.com/wiki/Intelligence_Officer" #define URL_WIKI_SYN_GUIDE "https://cm-ss13.com/wiki/Synthetic" #define URL_WIKI_CE_GUIDE "https://cm-ss13.com/wiki/Chief_Engineer" // Engineering diff --git a/code/__DEFINES/vehicle.dm b/code/__DEFINES/vehicle.dm index 9c6685085788..ed9809968808 100644 --- a/code/__DEFINES/vehicle.dm +++ b/code/__DEFINES/vehicle.dm @@ -11,7 +11,9 @@ #define HDPT_LAYER_SUPPORT 2 #define HDPT_LAYER_ARMOR 3 #define HDPT_LAYER_TURRET 4 -#define HDPT_LAYER_MAX 4 +#define HDPT_LAYER_SECONDARY_GUN 5 +#define HDPT_LAYER_PRIMARY_GUN 6 +#define HDPT_LAYER_MAX 6 #define VEHICLE_DRIVER "driver" #define VEHICLE_GUNNER "primary gunner" diff --git a/code/__DEFINES/vendors.dm b/code/__DEFINES/vendors.dm index 04ee5ffef2b6..95eec1bf8405 100644 --- a/code/__DEFINES/vendors.dm +++ b/code/__DEFINES/vendors.dm @@ -34,6 +34,10 @@ #define VEHICLE_ALL_AVAILABLE (VEHICLE_INTEGRAL_AVAILABLE|VEHICLE_PRIMARY_AVAILABLE|VEHICLE_SECONDARY_AVAILABLE|VEHICLE_SUPPORT_AVAILABLE|VEHICLE_ARMOR_AVAILABLE|VEHICLE_TREADS_AVAILABLE) +#define MECH_GUN "mech_gun" +#define MECH_ALL_AVAIBALE list(MECH_GUN = 2) + + #define VENDOR_THEME_COMPANY 0 #define VENDOR_THEME_USCM 1 #define VENDOR_THEME_CLF 2 diff --git a/code/__HELPERS/job.dm b/code/__HELPERS/job.dm index 43902b07cfd9..9e9d70ae2aa6 100644 --- a/code/__HELPERS/job.dm +++ b/code/__HELPERS/job.dm @@ -62,6 +62,8 @@ JOB_INTEL, JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, + JOB_CREWMAN, + JOB_WALKER, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_CHIEF_ENGINEER, diff --git a/code/__HELPERS/text.dm b/code/__HELPERS/text.dm index d4d9eb320633..527a7c1aac88 100644 --- a/code/__HELPERS/text.dm +++ b/code/__HELPERS/text.dm @@ -27,13 +27,13 @@ //Removes a few problematic characters /proc/sanitize_simple(text, list/repl_chars = list("\n"=" ","\t"=" ","�"=" ")) for(var/char in repl_chars) - text = replacetext(text, char, repl_chars[char]) + text = replacetext_char(text, char, repl_chars[char]) return text /proc/readd_quotes(text) var/list/repl_chars = list(""" = "\"", "'" = "'") for(var/char in repl_chars) - text = replacetext(text, char, repl_chars[char]) + text = replacetext_char(text, char, repl_chars[char]) return text //Runs byond's sanitization proc along-side sanitize_simple @@ -54,12 +54,12 @@ //Runs sanitize and strip_html_simple //I believe strip_html_simple() is required to run first to prevent '<' from displaying as '<' after sanitize() calls byond's html_encode() /proc/strip_html(text, limit=MAX_MESSAGE_LEN) - return copytext((sanitize(strip_html_simple(text))), 1, limit) + return copytext_char((sanitize(strip_html_simple(text))), 1, limit) //Runs byond's sanitization proc along-side strip_html_simple //I believe strip_html_simple() is required to run first to prevent '<' from displaying as '<' that html_encode() would cause /proc/adminscrub(text, limit=MAX_MESSAGE_LEN) - return copytext((html_encode(strip_html_simple(text))), 1, limit) + return copytext_char((html_encode(strip_html_simple(text))), 1, limit) //Returns null if there is any bad text in the string /proc/reject_bad_text(text, max_length=512) @@ -202,7 +202,7 @@ //Returns a string with the first element of the string capitalized. /proc/capitalize(t as text) - return uppertext(copytext(t, 1, 2)) + copytext(t, 2) + return uppertext(copytext_char(t, 1, 2)) + copytext_char(t, 2) /proc/stringpercent(text,character = "*") //This proc returns the number of chars of the string that is the character @@ -234,7 +234,7 @@ return "[copytext(string, 1, len - 3)]..." /proc/strip_improper(input_text) - return replacetext(replacetext(input_text, "\proper", ""), "\improper", "") + return replacetext_char(replacetext_char(input_text, "\proper", ""), "\improper", "") // Used to remove the string shortcuts for a clean transfer /proc/sanitize_filename(t) diff --git a/code/_globalvars/global_lists.dm b/code/_globalvars/global_lists.dm index 36058a44fc37..5bd3c31bea77 100644 --- a/code/_globalvars/global_lists.dm +++ b/code/_globalvars/global_lists.dm @@ -73,7 +73,8 @@ GLOBAL_LIST_INIT(resin_build_order_hivelord, list( /datum/resin_construction/resin_obj/acid_pillar, /datum/resin_construction/resin_obj/sticky_resin, /datum/resin_construction/resin_obj/fast_resin, - /datum/resin_construction/resin_obj/resin_spike + /datum/resin_construction/resin_obj/resin_spike, + /datum/resin_construction/resin_obj/sunken_colony )) GLOBAL_LIST_INIT(resin_build_order_hivelord_whisperer, list( @@ -83,7 +84,8 @@ GLOBAL_LIST_INIT(resin_build_order_hivelord_whisperer, list( /datum/resin_construction/resin_obj/sticky_resin, /datum/resin_construction/resin_obj/fast_resin, /datum/resin_construction/resin_obj/resin_spike, - /datum/resin_construction/resin_obj/resin_node + /datum/resin_construction/resin_obj/resin_node, + /datum/resin_construction/resin_obj/sunken_colony )) GLOBAL_LIST_INIT(resin_build_order_ovipositor, list( @@ -94,7 +96,8 @@ GLOBAL_LIST_INIT(resin_build_order_ovipositor, list( /datum/resin_construction/resin_obj/acid_pillar, /datum/resin_construction/resin_obj/sticky_resin, /datum/resin_construction/resin_obj/fast_resin, - /datum/resin_construction/resin_obj/resin_spike + /datum/resin_construction/resin_obj/resin_spike, + /datum/resin_construction/resin_obj/sunken_colony )) //Xeno Leader Mark Meanings @@ -478,7 +481,8 @@ var/global/list/available_specialist_sets = list( "Sniper Set", "Demolitionist Set", "Heavy Grenadier Set", - "Pyro Set" + "Pyro Set", + "Stormtrooper Set" ) //Similar thing, but used in /obj/item/spec_kit @@ -488,6 +492,7 @@ var/global/list/available_specialist_kit_boxes = list( "Sniper" = 2, "Scout" = 2, "Demo" = 2, + "ST" = 2 ) /proc/init_global_referenced_datums() diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index db6c3c71a7fa..edbb279e0cef 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -255,7 +255,7 @@ SUBSYSTEM_DEF(ticker) save_mode(CONFIG_GET(string/gamemode_default)) if(round_statistics) - to_chat_spaced(world, html = FONT_SIZE_BIG(SPAN_ROLE_BODY("Welcome to [round_statistics.round_name]"))) + to_chat_spaced(world, html = FONT_SIZE_BIG(SPAN_ROLE_BODY("Добро пожаловать на [round_statistics.round_name]"))) supply_controller.process() //Start the supply shuttle regenerating points -- TLE @@ -361,10 +361,10 @@ SUBSYSTEM_DEF(ticker) var/skip_delay = check_rights() if(delay_end && !skip_delay) - to_chat(world, SPAN_BOLDNOTICE("An admin has delayed the round end.")) + to_chat(world, SPAN_BOLDNOTICE("Администратор отложил конец раунда.")) return - to_chat(world, SPAN_BOLDNOTICE("Rebooting World in [DisplayTimeText(delay)]. [reason]")) + to_chat(world, SPAN_BOLDNOTICE("Перезагрузка мира через [DisplayTimeText(delay)]. [reason]")) var/start_wait = world.time sleep(delay - (world.time - start_wait)) @@ -373,7 +373,7 @@ SUBSYSTEM_DEF(ticker) to_chat(world, SPAN_BOLDNOTICE("Reboot was cancelled by an admin.")) return - log_game("Rebooting World. [reason]") + log_game("АГАСЬ. [reason]") to_chat_forced(world, "

[SPAN_BOLDNOTICE("Rebooting...")]

") world.Reboot(TRUE) diff --git a/code/datums/browser.dm b/code/datums/browser.dm index 3b694e8f44bb..7af9c2cb9f03 100644 --- a/code/datums/browser.dm +++ b/code/datums/browser.dm @@ -84,7 +84,7 @@ return {" - + [head_content] diff --git a/code/datums/effects/bleeding.dm b/code/datums/effects/bleeding.dm index e6cb184850d4..6aaf11adda08 100644 --- a/code/datums/effects/bleeding.dm +++ b/code/datums/effects/bleeding.dm @@ -97,6 +97,10 @@ if(affected_mob.bodytemperature < T0C && (affected_mob.reagents && affected_mob.reagents.get_reagent_amount("cryoxadone") || affected_mob.reagents.get_reagent_amount("clonexadone"))) blood_loss -= CRYO_BLOOD_REDUCTION + var/bicaridine = affected_mob.reagents?.get_reagent_amount("bicaridine") + if(bicaridine > REAGENTS_OVERDOSE && affected_mob.getBruteLoss() <= 0 && prob(BICARIDINE_OD_IB_TREAT_CHANCE)) + blood_loss -= BICAOD_BLOOD_REDUCTION + if(affected_mob.reagents) // Annoying QC check if(affected_mob.reagents.get_reagent_amount("thwei")) blood_loss -= THWEI_BLOOD_REDUCTION diff --git a/code/datums/emergency_calls/big_game_hunter.dm b/code/datums/emergency_calls/big_game_hunter.dm index e749b6654355..d5f88057f2c2 100644 --- a/code/datums/emergency_calls/big_game_hunter.dm +++ b/code/datums/emergency_calls/big_game_hunter.dm @@ -10,7 +10,7 @@ /datum/emergency_call/van_bandolier/New() . = ..() - arrival_message = "'Heard your distress call, [MAIN_SHIP_NAME]. It had best be something which will look good on my wall, eh? Tally ho!'" + arrival_message = "'Слышу ваш сигнал бедствия, [MAIN_SHIP_NAME]. Лучше там быть чему-то что я смогу повесить себе на стеночку, агась? Талли хо!'" /datum/emergency_call/van_bandolier/create_member(datum/mind/M, turf/override_spawn_loc) var/turf/spawn_loc = override_spawn_loc ? override_spawn_loc : get_spawn_point() diff --git a/code/datums/emergency_calls/cmb.dm b/code/datums/emergency_calls/cmb.dm index 52da1c967a00..296201551abf 100644 --- a/code/datums/emergency_calls/cmb.dm +++ b/code/datums/emergency_calls/cmb.dm @@ -16,7 +16,7 @@ /datum/emergency_call/cmb/New() ..() - arrival_message = "Incoming Transmission: [MAIN_SHIP_NAME], this is Anchorpoint Station with the Colonial Marshal Bureau. We are receiving your distress signal and are dispatching a nearby team to board with you now. Standby." + arrival_message = "Входящая передача: [MAIN_SHIP_NAME], это станция Anchorpoint с Бюро Колониальных Маршалов. Мы принимаем ваш сигнал бедствия и отправляем ближайшую команду к вам. Ожидайте." objectives = "Investigate the distress signal aboard the [MAIN_SHIP_NAME], and assist the crew with rescue if possible. If necessary, a contingent of our Colonial Marines may be ready to act as a QRF to reinforce you." will_spawn_icc_liaison = prob(50) diff --git a/code/datums/emergency_calls/contractor.dm b/code/datums/emergency_calls/contractor.dm index a5d6c2d7e80f..a750d96510a7 100644 --- a/code/datums/emergency_calls/contractor.dm +++ b/code/datums/emergency_calls/contractor.dm @@ -12,7 +12,7 @@ /datum/emergency_call/contractors/New() ..() - arrival_message = "[MAIN_SHIP_NAME], this is USCSS Inheritor with Vanguard's Arrow Incorporated, Primary Operations; we are responding to your distress call and boarding in accordance with the Military Aid Act of 2177, authenticication code Lima-18153. " + arrival_message = "[MAIN_SHIP_NAME], это USCSS Inheritor с Vanguard's Arrow Incorporated, Primary Operations на борту; мы принимаем ваш сигнал бедствия и совершим посадку согласно закону о военной помощи от 2177го, код авторизации Lima-18153. " objectives = "Ensure the survival of the [MAIN_SHIP_NAME], eliminate any hostiles, and assist the crew in any way possible." diff --git a/code/datums/emergency_calls/deathsquad.dm b/code/datums/emergency_calls/deathsquad.dm index 0bfab8fbf2b7..9b615806989f 100644 --- a/code/datums/emergency_calls/deathsquad.dm +++ b/code/datums/emergency_calls/deathsquad.dm @@ -6,7 +6,7 @@ name = "Weyland Whiteout Operators" mob_max = 8 mob_min = 5 - arrival_message = "'!`2*%slau#*jer t*h$em a!l%. le&*ve n(o^ w&*nes%6es.*v$e %#d ou^'" + arrival_message = "'!`2*%еб#*зите и*h$хm в!сl%х. Н& о*vтаeв(oт^е с&*ви%лей.*v$e %#d на^'" objectives = "Whiteout protocol is in effect for the target. Ensure there are no traces of the infestation or any witnesses." probability = 0 shuttle_id = "Distress_PMC" diff --git a/code/datums/emergency_calls/dutch.dm b/code/datums/emergency_calls/dutch.dm index 32620fa43014..b89dd944803f 100644 --- a/code/datums/emergency_calls/dutch.dm +++ b/code/datums/emergency_calls/dutch.dm @@ -9,7 +9,7 @@ max_heavies = 1 max_medics = 1 - arrival_message = "'We're here to kick ass and kill Yautja. Mainly kill Yautja." + arrival_message = "'Мы здесь надрать задниц и перебить Яутж. В основном наебашить Яутж." objectives = "Hunt down and kill all Yautja without mercy. Retrieve the gear and leave." probability = 0 diff --git a/code/datums/emergency_calls/emergency_call.dm b/code/datums/emergency_calls/emergency_call.dm index 6533086d98f3..52e53a97714c 100644 --- a/code/datums/emergency_calls/emergency_call.dm +++ b/code/datums/emergency_calls/emergency_call.dm @@ -12,7 +12,7 @@ /datum/game_mode/proc/ares_online() var/name = "ARES Online" - var/input = "ARES. Online. Good morning, marines." + var/input = "ARES. Онлайн. Доброе утро, солдаты." shipwide_ai_announcement(input, name, 'sound/AI/ares_online.ogg') /datum/game_mode/proc/request_ert(user, ares = FALSE) @@ -26,7 +26,7 @@ var/name = "name" var/mob_max = 3 var/mob_min = 3 - var/dispatch_message = "An encrypted signal has been received from a nearby vessel. Stand by." //Msg to display when starting + var/dispatch_message = "Зашифрованный сигнал перехвачен с ближайшего судна. Ожидайте." //Msg to display when starting var/arrival_message = "" //Msg to display about when the shuttle arrives var/objectives //Txt of objectives to display to joined. Todo: make this into objective notes var/objective_info //For additional info in the objectives txt @@ -203,8 +203,8 @@ message_admins("Distress beacon: '[name]' activated [src.hostility? "[SPAN_WARNING("(THEY ARE HOSTILE)")]":"(they are friendly)"]. Looking for candidates.") if(!quiet_launch) - marine_announcement("A distress beacon has been launched from the [MAIN_SHIP_NAME].", "Priority Alert", 'sound/AI/distressbeacon.ogg', logging = ARES_LOG_SECURITY) - + marine_announcement("Активирован сигнал бедствия на борту [MAIN_SHIP_NAME].", "Приоритетное оповещение", 'sound/AI/distressbeacon.ogg', logging = ARES_LOG_SECURITY) + addtimer(CALLBACK(src, TYPE_PROC_REF(/datum/emergency_call, spawn_candidates), quiet_launch, announce, override_spawn_loc, announce_dispatch_message), 30 SECONDS) /datum/emergency_call/proc/spawn_candidates(quiet_launch = FALSE, announce = TRUE, override_spawn_loc, announce_dispatch_message = TRUE) @@ -219,7 +219,7 @@ candidates = list() if(!quiet_launch) - marine_announcement("The distress signal has not received a response, the launch tubes are now recalibrating.", "Distress Beacon", logging = ARES_LOG_SECURITY) + marine_announcement("Сигнал бедствия не получил ответа, перекалибровка пусковых труб.", "Сигнал бедствия", logging = ARES_LOG_SECURITY) return //We've got enough! @@ -249,7 +249,7 @@ to_chat(I.current, SPAN_WARNING("You didn't get selected to join the distress team. Better luck next time!")) if(announce) - marine_announcement(dispatch_message, "Distress Beacon", 'sound/AI/distressreceived.ogg', logging = ARES_LOG_SECURITY) //Announcement that the Distress Beacon has been answered, does not hint towards the chosen ERT + marine_announcement(dispatch_message, "Сигнал бедствия", 'sound/AI/distressreceived.ogg', logging = ARES_LOG_SECURITY) //Announcement that the Distress Beacon has been answered, does not hint towards the chosen ERT message_admins("Distress beacon: [src.name] finalized, setting up candidates.") @@ -305,7 +305,7 @@ candidates = list() if(arrival_message && announce) - marine_announcement(arrival_message, "Intercepted Tranmission:") + marine_announcement(arrival_message, "Перехваченная Передача:") /datum/emergency_call/proc/add_candidate(mob/M) if(!M.client || (M.mind && (M.mind in candidates)) || istype(M, /mob/living/carbon/xenomorph)) diff --git a/code/datums/emergency_calls/feral_xenos.dm b/code/datums/emergency_calls/feral_xenos.dm index 5d9f14a4680c..f07c12143308 100644 --- a/code/datums/emergency_calls/feral_xenos.dm +++ b/code/datums/emergency_calls/feral_xenos.dm @@ -12,7 +12,7 @@ /datum/emergency_call/feral_xenos/New() ..() - arrival_message = "[MAIN_SHIP_NAME], this is USS Vriess respond-- #&...*#&^#.. signal... oh god, they're in the vent---... Priority Warning: Signal lost." + arrival_message = "[MAIN_SHIP_NAME], это USS Vriess на связ-- #&...*#&^#.. сигнал... БЛЯТЬ, они в вентиля---... Приоритетное Предупреждение: Сигнал потерян." objectives = "Destroy everything!" /datum/emergency_call/feral_xenos/spawn_items() diff --git a/code/datums/emergency_calls/goons.dm b/code/datums/emergency_calls/goons.dm index 8a0b00968807..89875a30258a 100644 --- a/code/datums/emergency_calls/goons.dm +++ b/code/datums/emergency_calls/goons.dm @@ -5,7 +5,7 @@ /datum/emergency_call/goon/New() ..() - arrival_message = "[MAIN_SHIP_NAME], this is a Weyland-Yutani Corporate Security shuttle inbound to your distress beacon. We are coming to help." + arrival_message = "[MAIN_SHIP_NAME], это шаттл Корпоративной Безопасности Weyland-Yutani направляющийся на ваш сигнал бедствия. Мы летим с помощью." objectives = "Secure the Corporate Liaison and the [MAIN_SHIP_NAME]'s Commanding Officer, and eliminate any hostile threats. Do not damage Wey-Yu property." /datum/emergency_call/goon/create_member(datum/mind/M, turf/override_spawn_loc) diff --git a/code/datums/emergency_calls/hefa_knight.dm b/code/datums/emergency_calls/hefa_knight.dm index 2af2f99f443e..46671834d91c 100644 --- a/code/datums/emergency_calls/hefa_knight.dm +++ b/code/datums/emergency_calls/hefa_knight.dm @@ -3,7 +3,7 @@ name = "HEFA knights" mob_max = 15 mob_min = 3 - arrival_message = "'Prepaerth to surrender thine HEFAs unto the order!'" + arrival_message = "'Падгатовьтись сдаца HEFAs па приказю!'" objectives = "You are a Brother of the Order of HEFA! You and your fellow brothers must retrieve as many HEFAs as possible!" probability = 0 hostility = TRUE diff --git a/code/datums/emergency_calls/mercs.dm b/code/datums/emergency_calls/mercs.dm index 40210c845c6f..80643e7bfef0 100644 --- a/code/datums/emergency_calls/mercs.dm +++ b/code/datums/emergency_calls/mercs.dm @@ -11,7 +11,7 @@ /datum/emergency_call/mercs/New() . = ..() hostility = pick(75;FALSE,25;TRUE) - arrival_message = "[MAIN_SHIP_NAME], this is Freelancer shuttle [pick(alphabet_lowercase)][pick(alphabet_lowercase)]-[rand(1, 99)] responding to your distress call. Prepare for boarding." + arrival_message = "[MAIN_SHIP_NAME], это частный шаттл [pick(alphabet_lowercase)][pick(alphabet_lowercase)]-[rand(1, 99)] отвечает на ваш сигнал бедствия. Подготовьтесь к посадке." if(hostility) objectives = "Ransack the [MAIN_SHIP_NAME] and kill anyone who gets in your way. Do what your Captain says. Ensure your survival at all costs." else @@ -25,7 +25,7 @@ /datum/emergency_call/mercs/friendly/New() . = ..() hostility = FALSE - arrival_message = "[MAIN_SHIP_NAME], this is Freelancer shuttle [pick(alphabet_lowercase)][pick(alphabet_lowercase)]-[rand(1, 99)] responding to your distress call. Prepare for boarding." + arrival_message = "[MAIN_SHIP_NAME], это частный шаттл [pick(alphabet_lowercase)][pick(alphabet_lowercase)]-[rand(1, 99)] отвечает на ваш сигнал бедствия. Подготовьтесь к посадке." objectives = "Help the crew of the [MAIN_SHIP_NAME] in exchange for payment, and choose your payment well. Do what your Captain says. Ensure your survival at all costs." /datum/emergency_call/mercs/hostile //ditto @@ -36,7 +36,7 @@ /datum/emergency_call/mercs/hostile/New() . = ..() hostility = TRUE - arrival_message = "[MAIN_SHIP_NAME], this is Freelancer shuttle [pick(alphabet_lowercase)][pick(alphabet_lowercase)]-[rand(1, 99)] responding to your distress call. Prepare for boarding." + arrival_message = "[MAIN_SHIP_NAME], это частный шаттл [pick(alphabet_lowercase)][pick(alphabet_lowercase)]-[rand(1, 99)] отвечает на ваш сигнал бедствия. Подготовьтесь к посадке." objectives = "Ransack the [MAIN_SHIP_NAME] and kill anyone who gets in your way. Do what your Captain says. Ensure your survival at all costs." /datum/emergency_call/mercs/print_backstory(mob/living/carbon/human/H) @@ -96,7 +96,7 @@ /datum/emergency_call/heavy_mercs/New() . = ..() hostility = pick(75;FALSE,25;TRUE) - arrival_message = "[MAIN_SHIP_NAME], this is Elite Freelancer shuttle [pick(alphabet_lowercase)][pick(alphabet_lowercase)]-[rand(1, 99)] responding to your distress call. Prepare for boarding." + arrival_message = "[MAIN_SHIP_NAME], это элитный частный шаттл [pick(alphabet_lowercase)][pick(alphabet_lowercase)]-[rand(1, 99)] отвечает на ваш сигнал бедствия. Подготовьтесь к посадке." if(hostility) objectives = "Ransack the [MAIN_SHIP_NAME] and kill anyone who gets in your way. Do what your Captain says. Ensure your survival at all costs." else @@ -108,7 +108,7 @@ /datum/emergency_call/heavy_mercs/hostile/New() . = ..() hostility = TRUE - arrival_message = "[MAIN_SHIP_NAME], this is Elite Freelancer shuttle [pick(alphabet_lowercase)][pick(alphabet_lowercase)]-[rand(1, 99)] responding to your distress call. Prepare for boarding." + arrival_message = "[MAIN_SHIP_NAME], это элитный частный шаттл [pick(alphabet_lowercase)][pick(alphabet_lowercase)]-[rand(1, 99)] отвечает на ваш сигнал бедствия. Подготовьтесь к посадке." objectives = "Ransack the [MAIN_SHIP_NAME] and kill anyone who gets in your way. Do what your Captain says. Ensure your survival at all costs." /datum/emergency_call/heavy_mercs/friendly @@ -117,7 +117,7 @@ /datum/emergency_call/heavy_mercs/friendly/New() . = ..() hostility = FALSE - arrival_message = "[MAIN_SHIP_NAME], this is Elite Freelancer shuttle [pick(alphabet_lowercase)][pick(alphabet_lowercase)]-[rand(1, 99)] responding to your distress call. Prepare for boarding." + arrival_message = "[MAIN_SHIP_NAME], это элитный частный шаттл [pick(alphabet_lowercase)][pick(alphabet_lowercase)]-[rand(1, 99)] отвечает на ваш сигнал бедствия. Подготовьтесь к посадке." objectives = "Help the crew of the [MAIN_SHIP_NAME] in exchange for payment, and choose your payment well. Do what your Captain says. Ensure your survival at all costs." /datum/emergency_call/heavy_mercs/print_backstory(mob/living/carbon/human/H) diff --git a/code/datums/emergency_calls/pirates.dm b/code/datums/emergency_calls/pirates.dm index 7a9d333de970..4d51423f4079 100644 --- a/code/datums/emergency_calls/pirates.dm +++ b/code/datums/emergency_calls/pirates.dm @@ -4,7 +4,7 @@ name = "Fun - Pirates" mob_max = 35 mob_min = 10 - arrival_message = "'What shall we do with a drunken sailor? What shall we do with a drunken sailor? What shall we do with a drunken sailor early in the morning?'" + arrival_message = "'Чтоо-о-о мы делаем с пьяным моряк-о-о-м? Что делаем с пьяным моряк-о-о-о-м? Что мы делаем с пьяным моряком с утра пораньше?'" objectives = "Pirate! Loot! Ransom!" probability = 0 hostility = TRUE diff --git a/code/datums/emergency_calls/pizza.dm b/code/datums/emergency_calls/pizza.dm index a35ce584c68d..35348cab8c46 100644 --- a/code/datums/emergency_calls/pizza.dm +++ b/code/datums/emergency_calls/pizza.dm @@ -4,7 +4,7 @@ name = "Pizza Delivery" mob_max = 1 mob_min = 1 - arrival_message = "'That'll be... sixteen orders of cheesy fries, eight large double topping pizzas, nine bottles of Four Loko... hello? Is anyone on this ship? Your pizzas are getting cold.'" + arrival_message = "'Тогда... шестнадцать порций картошки с сыром, восемь больших пицц с двойной начинкой, девять бутылок Four Loko... эм? Есть кто-нибудь на корабле? Ваши пиццы остывают.'" objectives = "Make sure you get a tip!" shuttle_id = "Distress_Small" name_of_spawn = /obj/effect/landmark/ert_spawns/distress_pizza diff --git a/code/datums/emergency_calls/pmc.dm b/code/datums/emergency_calls/pmc.dm index a06b0cc0c02e..7c524111d08e 100644 --- a/code/datums/emergency_calls/pmc.dm +++ b/code/datums/emergency_calls/pmc.dm @@ -17,7 +17,7 @@ /datum/emergency_call/pmc/New() ..() - arrival_message = "[MAIN_SHIP_NAME], this is USCSS Royce responding to your distress call. We are boarding. Any hostile actions will be met with lethal force." + arrival_message = "[MAIN_SHIP_NAME], на ваш сигнал бедствия отвечает USCSS Royce. Мы садимся. Любые агрессивные действия будут встречены применением летальной силы." objectives = "Secure the Corporate Liaison and the [MAIN_SHIP_NAME]'s Commanding Officer, and eliminate any hostile threats. Do not damage Wey-Yu property." @@ -99,7 +99,7 @@ /datum/emergency_call/pmc/chem_retrieval/New() ..() - dispatch_message = "[MAIN_SHIP_NAME], this is USCSS Royce. We are sending a second squad aboard to retrieve all samples of a chemical recently scanned from your research department. If you do not cooperate, the team is authorized to use lethal force and terminate the research department." + dispatch_message = "[MAIN_SHIP_NAME], это USCSS Royce. Мы отправляем второй отряд на борт для сбора всех экземпляров химикатов которые были просканированы в вашем научном отделе. Если вы не будете сотрудничать, команде разрешено применить силу и устранить научный персонал." objectives = "Secure all documents, samples and chemicals containing the property DNA_Disintegrating from [MAIN_SHIP_NAME] research department." /datum/emergency_call/pmc/chem_retrieval/proc/check_objective_info() diff --git a/code/datums/emergency_calls/supplies.dm b/code/datums/emergency_calls/supplies.dm index e562680eca4c..b382528352e6 100644 --- a/code/datums/emergency_calls/supplies.dm +++ b/code/datums/emergency_calls/supplies.dm @@ -5,7 +5,7 @@ name = "Supply Drop" mob_max = 0 mob_min = 0 - arrival_message = "Weyland-Yutani Automated Supply Drop 334-Q signal received. Docking procedures have commenced." + arrival_message = "Автоматический Сброс Припасов Weyland-Yutani по сигналу Drop 334-Q. Процедуры стыковки активированы." probability = 0 auto_shuttle_launch = TRUE diff --git a/code/datums/emergency_calls/upp.dm b/code/datums/emergency_calls/upp.dm index 04bcfecf9128..1f21a6ded866 100644 --- a/code/datums/emergency_calls/upp.dm +++ b/code/datums/emergency_calls/upp.dm @@ -20,7 +20,7 @@ /datum/emergency_call/upp/New() ..() - arrival_message = "T*is i* UP* d^sp^*ch`. STr*&e teaM, #*u are cLe*% for a*pr*%^h. Pr*mE a*l wE*p^ns )0r c|*$e @u*r*r$ c0m&*t." + arrival_message = "Э*т* УП* в^sа^*ка`. КоМ*&а зачистки, #*u вы г*%вы к п*ос*%^е. По*тE в*е оР*ж^е )0r и|*$e @а*й*с$ c0н&*о." objectives = "Eliminate the UA Forces to ensure the UPP prescence in this sector is continued. Listen to your superior officers and take over the [MAIN_SHIP_NAME] at all costs." diff --git a/code/datums/emergency_calls/xenos.dm b/code/datums/emergency_calls/xenos.dm index 5245954e1b0e..8c8245b8b368 100644 --- a/code/datums/emergency_calls/xenos.dm +++ b/code/datums/emergency_calls/xenos.dm @@ -9,7 +9,7 @@ /datum/emergency_call/xenos/New() ..() - arrival_message = "[MAIN_SHIP_NAME], this is USS Vriess respond-- #&...*#&^#.. signal... oh god, they're in the vent---... Priority Warning: Signal lost." + arrival_message = "[MAIN_SHIP_NAME], это USS Vriess отвечает-- #&...*#&^#.. сигнал... Боже, они в вентиляции---... Приоритетное Оповещение: Сигнал потерян." objectives = "For the Empress!" diff --git a/code/datums/emotes.dm b/code/datums/emotes.dm index b691d87a2169..6c0c4a100e44 100644 --- a/code/datums/emotes.dm +++ b/code/datums/emotes.dm @@ -94,7 +94,7 @@ var/tmp_sound = get_sound(user) if(TIMER_COOLDOWN_CHECK(user, type)) - to_chat(user, SPAN_NOTICE("You just did an emote. Wait awhile.")) + to_chat(user, SPAN_NOTICE("По-моему я слишком эмоционален.")) return else if(tmp_sound && should_play_sound(user, intentional)) if(TIMER_COOLDOWN_CHECK(user, COOLDOWN_MOB_AUDIO)) diff --git a/code/datums/factions/uscm.dm b/code/datums/factions/uscm.dm index cf77142ce5d6..0683f06672b7 100644 --- a/code/datums/factions/uscm.dm +++ b/code/datums/factions/uscm.dm @@ -26,6 +26,7 @@ if(JOB_INTEL) marine_rk = "io" if(JOB_DROPSHIP_CREW_CHIEF) marine_rk = "dcc" if(JOB_CREWMAN) marine_rk = "tc" + if(JOB_WALKER) marine_rk = "tc" if(JOB_MARINE_RAIDER) marine_rk = "soc" if(JOB_MARINE_RAIDER_SL) marine_rk = "soctl" if(JOB_MARINE_RAIDER_CMD) marine_rk = "soccmd" @@ -89,6 +90,10 @@ marine_rk = "po" if(JOB_DROPSHIP_CREW_CHIEF) marine_rk = "dcc" + if(JOB_CREWMAN) + marine_rk = "tc" + if(JOB_WALKER) + marine_rk = "tc" if(JOB_CHIEF_POLICE) marine_rk = "cmp" border_rk = "command" diff --git a/code/datums/langchat/langchat.dm b/code/datums/langchat/langchat.dm index d1a6adafa2f3..73400e4095cd 100644 --- a/code/datums/langchat/langchat.dm +++ b/code/datums/langchat/langchat.dm @@ -11,6 +11,8 @@ /mob/living/carbon/xenomorph/defender/langchat_height = 48 /mob/living/carbon/xenomorph/warrior/langchat_height = 48 +/obj/vehicle/multitile/langchat_height = 80 + #define LANGCHAT_LONGEST_TEXT 64 #define LANGCHAT_WIDTH 96 #define LANGCHAT_X_OFFSET -32 diff --git a/code/datums/skills.dm b/code/datums/skills.dm index 585fdc699cda..07934ee60137 100644 --- a/code/datums/skills.dm +++ b/code/datums/skills.dm @@ -1075,6 +1075,7 @@ United States Colonial Marines skills = list( SKILL_ENGINEER = SKILL_ENGINEER_ENGI, SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, + SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, SKILL_CQC = SKILL_CQC_TRAINED, SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, diff --git a/code/datums/statistics/entities/death_stats.dm b/code/datums/statistics/entities/death_stats.dm index 4a01e4e9d72b..0af788cb60ef 100644 --- a/code/datums/statistics/entities/death_stats.dm +++ b/code/datums/statistics/entities/death_stats.dm @@ -69,15 +69,15 @@ stack_trace("track_mob_death called with string cause ([cause_data]) instead of datum") cause_data = create_cause_data(cause_data) - var/log_message = "\[[time_stamp()]\] [key_name(src)] died to " + var/log_message = "\[[time_stamp()]\] [key_name(src)] умер(ла) от " if(cause_data) log_message += "[cause_data.cause_name]" else - log_message += "unknown causes" + log_message += "неизвестных причин" var/mob/cause_mob = cause_data?.resolve_mob() if(cause_mob) - log_message += " from [key_name(cause_data.resolve_mob())]" - cause_mob.attack_log += "\[[time_stamp()]\] [key_name(cause_mob)] killed [key_name(src)] with [cause_data.cause_name]." + log_message += " от [key_name(cause_data.resolve_mob())]" + cause_mob.attack_log += "\[[time_stamp()]\] [key_name(cause_mob)] убил [key_name(src)] с помощью [cause_data.cause_name]." attack_log += "[log_message]." @@ -163,11 +163,11 @@ /mob/proc/handle_observer_message(datum/cause_data/cause_data, mob/cause_mob, turf/death_loc, area/death_area) var/observer_message = "[real_name] has died" if(cause_data && cause_data.cause_name) - observer_message += " to [cause_data.cause_name]" + observer_message += " от [cause_data.cause_name]" if(death_area.name) - observer_message += " at \the [death_area.name]" + observer_message += " в \the [death_area.name]" if(cause_data && cause_mob) - observer_message += " from [cause_mob]" + observer_message += " из [cause_mob]" msg_admin_attack(observer_message, death_loc.x, death_loc.y, death_loc.z) diff --git a/code/datums/statistics/entities/round_stats.dm b/code/datums/statistics/entities/round_stats.dm index 0e1fb6e387db..cabfeb23e69a 100644 --- a/code/datums/statistics/entities/round_stats.dm +++ b/code/datums/statistics/entities/round_stats.dm @@ -341,28 +341,28 @@ var/stats = "" stats += "[SSticker.mode.round_finished]\n" - stats += "Game mode: [game_mode]\n" - stats += "Map name: [current_map.name]\n" - stats += "Round time: [duration2text(round_length)]\n" - stats += "End round player population: [end_round_player_population]\n" + stats += "Режим: [game_mode]\n" + stats += "Карта: [current_map.name]\n" + stats += "Время раунда: [duration2text(round_length)]\n" + stats += "Игроков под конец игры: [end_round_player_population]\n" - stats += "Total xenos spawned: [total_xenos_created]\n" - stats += "Total Preds spawned: [total_predators_spawned]\n" - stats += "Total Predaliens spawned: [total_predaliens]\n" - stats += "Total humans spawned: [total_humans_created]\n" + stats += "Присутствовало ксеноморфов: [total_xenos_created]\n" + stats += "Присутствовало хищников: [total_predators_spawned]\n" + stats += "Присутствовало предалиенов: [total_predaliens]\n" + stats += "Присутствовало людей: [total_humans_created]\n" - stats += "Xeno count during hijack: [xeno_count_during_hijack]\n" - stats += "Human count during hijack: [human_count_during_hijack]\n" + stats += "Ксеноморфов во время угона: [xeno_count_during_hijack]\n" + stats += "Людей во время угона: [human_count_during_hijack]\n" - stats += "Total huggers applied: [total_huggers_applied]\n" - stats += "Total chestbursts: [total_larva_burst]\n" + stats += "Лицехватов: [total_huggers_applied]\n" + stats += "Грудоломов выскочило: [total_larva_burst]\n" - stats += "Total shots fired: [total_projectiles_fired]\n" - stats += "Total friendly fire instances: [total_friendly_fire_instances]\n" + stats += "Всего выстрелов: [total_projectiles_fired]\n" + stats += "Всего дружественных попаданий: [total_friendly_fire_instances]\n" - stats += "Marines remaining: [end_of_round_marines]\n" - stats += "Xenos remaining: [end_of_round_xenos]\n" - stats += "Hijack time: [duration2text(round_hijack_time)]\n" + stats += "Солдат осталось: [end_of_round_marines]\n" + stats += "Ксеноморфов осталось: [end_of_round_xenos]\n" + stats += "Время для угона: [duration2text(round_hijack_time)]\n" stats += "[log_end]" diff --git a/code/datums/statistics/random_facts/damage_fact.dm b/code/datums/statistics/random_facts/damage_fact.dm index 2fa8a5d06491..4f36c306e468 100644 --- a/code/datums/statistics/random_facts/damage_fact.dm +++ b/code/datums/statistics/random_facts/damage_fact.dm @@ -1,6 +1,6 @@ /datum/random_fact/damage - statistic_name = "damage" - statistic_verb = "took" + statistic_name = "урона" + statistic_verb = "получил(а)" /datum/random_fact/damage/life_grab_stat(mob/fact_mob) return fact_mob.life_damage_taken_total diff --git a/code/datums/statistics/random_facts/kills_fact.dm b/code/datums/statistics/random_facts/kills_fact.dm index 7ef1c2b238de..190f8b1b21a3 100644 --- a/code/datums/statistics/random_facts/kills_fact.dm +++ b/code/datums/statistics/random_facts/kills_fact.dm @@ -1,6 +1,6 @@ /datum/random_fact/kills - statistic_name = "kills" - statistic_verb = "earned" + statistic_name = "убийств" + statistic_verb = "совершил(а)" /datum/random_fact/kills/life_grab_stat(mob/fact_mob) return fact_mob.life_kills_total diff --git a/code/datums/statistics/random_facts/random_fact.dm b/code/datums/statistics/random_facts/random_fact.dm index 76c6e82f776d..bab7dfd388a8 100644 --- a/code/datums/statistics/random_facts/random_fact.dm +++ b/code/datums/statistics/random_facts/random_fact.dm @@ -57,25 +57,25 @@ if(living_stat_gotten > death_stat_gotten) name = mob_to_report.real_name stat_gotten = living_stat_gotten - additional_message = "and survived! Great work!" + additional_message = "не погибнув! Отличная работа!" else name = death_to_report.mob_name stat_gotten = death_stat_gotten - additional_message = "before dying" + additional_message = "перед смертью от" if(death_to_report.cause_name) - additional_message += " to [death_to_report.cause_name]" - additional_message += ". Good work!" + additional_message += " [death_to_report.cause_name]" + additional_message += ". Хорошая работа!" else if(death_to_report) name = death_to_report.mob_name stat_gotten = death_stat_gotten - additional_message = "before dying" + additional_message = "перед смертью от" if(death_to_report.cause_name) - additional_message += " to [death_to_report.cause_name]" - additional_message += ". Good work!" + additional_message += " [death_to_report.cause_name]" + additional_message += ". Отличная работа!" else name = mob_to_report.real_name stat_gotten = living_stat_gotten - additional_message = "and survived! Great work!" + additional_message = "не погибнув! Отличная работа!" message = "[name] [statistic_verb] [stat_gotten] [statistic_name] [additional_message]" diff --git a/code/datums/statistics/random_facts/revives_fact.dm b/code/datums/statistics/random_facts/revives_fact.dm index 60b6daa896d2..ca0668a0961b 100644 --- a/code/datums/statistics/random_facts/revives_fact.dm +++ b/code/datums/statistics/random_facts/revives_fact.dm @@ -1,6 +1,6 @@ /datum/random_fact/revives - statistic_name = "people" - statistic_verb = "revived" + statistic_name = "людей" + statistic_verb = "спасено" /datum/random_fact/revives/life_grab_stat(mob/fact_mob) return fact_mob.life_revives_total diff --git a/code/datums/supply_packs/vehicle_ammo.dm b/code/datums/supply_packs/vehicle_ammo.dm index 5dad91d27ed4..9432f951b5a6 100644 --- a/code/datums/supply_packs/vehicle_ammo.dm +++ b/code/datums/supply_packs/vehicle_ammo.dm @@ -95,9 +95,25 @@ containername = "M34A2-A Multipurpose Turret smoke screen ammo crate" group = "Vehicle Ammo" +/datum/supply_packs/ammo_flauncher + name = "M34A2-B Multipurpose Turret Flare Launcher magazines (x4)" + contains = list( + /obj/item/ammo_magazine/hardpoint/flare_launcher/tank, + /obj/item/ammo_magazine/hardpoint/flare_launcher/tank, + /obj/item/ammo_magazine/hardpoint/flare_launcher/tank, + ) + cost = 20 + containertype = /obj/structure/closet/crate/ammo + containername = "M34A2-B Multipurpose Turret Flare Launcher magazines (x4)" + group = "Vehicle Ammo" + /datum/supply_packs/ammo_towlauncher name = "TOW Launcher magazines (x3)" - contains = list(/obj/item/hardpoint/secondary/towlauncher) + contains = list( + /obj/item/ammo_magazine/hardpoint/towlauncher, + /obj/item/ammo_magazine/hardpoint/towlauncher, + /obj/item/ammo_magazine/hardpoint/towlauncher, + ) cost = 30 containertype = /obj/structure/closet/crate/ammo containername = "TOW launcher ammo crate" @@ -148,3 +164,16 @@ containertype = /obj/structure/closet/crate/ammo containername = "M-87F Flare Launcher ammo crate" group = "Vehicle Ammo" + +/datum/supply_packs/ammo_smokelauncher + name = "M-87S Smoke Screen System (x4)" + contains = list( + /obj/item/ammo_magazine/hardpoint/turret_smoke/apc, + /obj/item/ammo_magazine/hardpoint/turret_smoke/apc, + /obj/item/ammo_magazine/hardpoint/turret_smoke/apc, + /obj/item/ammo_magazine/hardpoint/turret_smoke/apc, + ) + cost = 20 + containertype = /obj/structure/closet/crate/ammo + containername = "M-87S Smoke Screen System ammo crate" + group = "Vehicle Ammo" diff --git a/code/game/gamemodes/cm_process.dm b/code/game/gamemodes/cm_process.dm index 33377f7dc6fd..bcffa2d781e8 100644 --- a/code/game/gamemodes/cm_process.dm +++ b/code/game/gamemodes/cm_process.dm @@ -42,8 +42,8 @@ of predators), but can be added to include variant game modes (like humans vs. h fallen_list += fallen_list_cross if(fallen_list.len) var/dat = "
" - dat += SPAN_ROUNDBODY("In Flanders fields...
") - dat += SPAN_CENTERBOLD("In memoriam of our fallen soldiers:
") + dat += SPAN_ROUNDBODY("На полях Фландрии...
") + dat += SPAN_CENTERBOLD("В память нашим падшим солдатам:
") for(var/i = 1 to fallen_list.len) if(i != fallen_list.len) dat += "[fallen_list[i]], " @@ -57,7 +57,7 @@ of predators), but can be added to include variant game modes (like humans vs. h sleep(2 SECONDS) if(LAZYLEN(xenomorphs) || LAZYLEN(dead_queens)) var/dat = "
" - dat += SPAN_ROUNDBODY("
The xenomorph Queen(s) were:") + dat += SPAN_ROUNDBODY("
В роли Королевы Ксеноморфов:") var/mob/living/carbon/xenomorph/xeno_mob for (var/msg in dead_queens) dat += msg @@ -69,7 +69,7 @@ of predators), but can be added to include variant game modes (like humans vs. h if(!xeno_mob || !xeno_mob.loc) xeno_mob = xeno_mind.original if(xeno_mob && xeno_mob.loc && isqueen(xeno_mob) && xeno_mob.stat != DEAD) // Dead queens handled separately - dat += "
[xeno_mob.full_designation] was [xeno_mob] [SPAN_BOLDNOTICE("(SURVIVED)")]" + dat += "
[xeno_mob.full_designation] был [xeno_mob] [SPAN_BOLDNOTICE("(ВЫЖИЛ)")]" to_world("[dat]") @@ -78,9 +78,9 @@ of predators), but can be added to include variant game modes (like humans vs. h sleep(2 SECONDS) if(length(predators)) var/dat = "
" - dat += SPAN_ROUNDBODY("
The Predators were:") + dat += SPAN_ROUNDBODY("
В роли Хищников:") for(var/entry in predators) - dat += "
[entry] was [predators[entry]["Name"]] [SPAN_BOLDNOTICE("([predators[entry]["Status"]])")]" + dat += "
[entry] был [predators[entry]["Name"]] [SPAN_BOLDNOTICE("([predators[entry]["Status"]])")]" to_world("[dat]") @@ -89,26 +89,26 @@ of predators), but can be added to include variant game modes (like humans vs. h sleep(2 SECONDS) if(GLOB.medal_awards.len) var/dat = "
" - dat += SPAN_ROUNDBODY("
Medal Awards:") + dat += SPAN_ROUNDBODY("
Медали получили:") for(var/recipient in GLOB.medal_awards) var/datum/recipient_awards/recipient_award = GLOB.medal_awards[recipient] for(var/i in 1 to recipient_award.medal_names.len) - dat += "
[recipient_award.recipient_rank] [recipient] is awarded [recipient_award.posthumous[i] ? "posthumously " : ""]the [recipient_award.medal_names[i]]: \'[recipient_award.medal_citations[i]]\'." + dat += "
[recipient_award.recipient_rank] [recipient] наградили [recipient_award.posthumous[i] ? "посмертно " : ""]the [recipient_award.medal_names[i]]: \'[recipient_award.medal_citations[i]]\'." to_world(dat) if(GLOB.jelly_awards.len) var/dat = "
" - dat += SPAN_ROUNDBODY("
Royal Jelly Awards:") + dat += SPAN_ROUNDBODY("
Награды Королевского Желе:") for(var/recipient in GLOB.jelly_awards) var/datum/recipient_awards/recipient_award = GLOB.jelly_awards[recipient] for(var/i in 1 to recipient_award.medal_names.len) - dat += "
[recipient] is awarded [recipient_award.posthumous[i] ? "posthumously " : ""]a [recipient_award.medal_names[i]]: \'[recipient_award.medal_citations[i]]\'[recipient_award.giver_rank[i] ? " by [recipient_award.giver_rank[i]]" : ""][recipient_award.giver_name[i] ? " ([recipient_award.giver_name[i]])" : ""]." + dat += "
[recipient] наградили [recipient_award.posthumous[i] ? "посмертно " : ""]a [recipient_award.medal_names[i]]: \'[recipient_award.medal_citations[i]]\'[recipient_award.giver_rank[i] ? " by [recipient_award.giver_rank[i]]" : ""][recipient_award.giver_name[i] ? " ([recipient_award.giver_name[i]])" : ""]." to_world(dat) /datum/game_mode/proc/declare_fun_facts() set waitfor = 0 sleep(2 SECONDS) to_chat_spaced(world, margin_bottom = 0, html = SPAN_ROLE_BODY("|______________________|")) - to_world(SPAN_ROLE_HEADER("FUN FACTS")) + to_world(SPAN_ROLE_HEADER("ИНТЕРЕСНЫЕ ФАКТЫ")) var/list/fact_types = subtypesof(/datum/random_fact) for(var/fact_type as anything in fact_types) var/datum/random_fact/fact_human = new fact_type(set_check_human = TRUE, set_check_xeno = FALSE) diff --git a/code/game/gamemodes/cm_self_destruct.dm b/code/game/gamemodes/cm_self_destruct.dm index d2f9c4eac784..a29d23a41f7a 100644 --- a/code/game/gamemodes/cm_self_destruct.dm +++ b/code/game/gamemodes/cm_self_destruct.dm @@ -97,8 +97,8 @@ var/global/datum/authority/branch/evacuation/EvacuationAuthority //This is initi if(force || (evac_status == EVACUATION_STATUS_STANDING_BY && !(flags_scuttle & FLAGS_EVACUATION_DENY))) evac_time = world.time evac_status = EVACUATION_STATUS_INITIATING - ai_announcement("Attention. Emergency. All personnel must evacuate immediately. You have [round(EVACUATION_ESTIMATE_DEPARTURE/60,1)] minute\s until departure.", 'sound/AI/evacuate.ogg') - xeno_message_all("A wave of adrenaline ripples through the hive. The fleshy creatures are trying to escape!") + ai_announcement("Внимание. Тревога. Всему персоналу немедленно эвакуироваться. У вас есть [round(EVACUATION_ESTIMATE_DEPARTURE/60,1)] минут перед отправлением.", 'sound/AI/evacuate.ogg') + xeno_message_all("Волна адреналина прокатывается по обитателям улья. Эти мясные существа пытаются сбежать!") for(var/obj/structure/machinery/status_display/SD in machines) if(is_mainship_level(SD.z)) @@ -114,7 +114,7 @@ var/global/datum/authority/branch/evacuation/EvacuationAuthority //This is initi evac_time = null evac_status = EVACUATION_STATUS_STANDING_BY deactivate_lifeboats() - ai_announcement("Evacuation has been cancelled.", 'sound/AI/evacuate_cancelled.ogg') + ai_announcement("Эвакуация была отменена.", 'sound/AI/evacuate_cancelled.ogg') if(get_security_level() == "red") for(var/obj/structure/machinery/status_display/SD in machines) @@ -129,7 +129,7 @@ var/global/datum/authority/branch/evacuation/EvacuationAuthority //This is initi if(evac_status == EVACUATION_STATUS_INITIATING) evac_status = EVACUATION_STATUS_IN_PROGRESS //Cannot cancel at this point. All shuttles are off. spawn() //One of the few times spawn() is appropriate. No need for a new proc. - ai_announcement("WARNING: Evacuation order confirmed. Launching escape pods.", 'sound/AI/evacuation_confirmed.ogg') + ai_announcement("ПРЕДУПРЕЖДЕНИЕ: Приказ об эвакуации подтвержден. Запуск спасательных шлюпок.", 'sound/AI/evacuation_confirmed.ogg') addtimer(CALLBACK(src, PROC_REF(launch_lifeboats)), 10 SECONDS) // giving some time to board lifeboats for(var/obj/docking_port/mobile/crashable/escape_shuttle/shuttle in SSshuttle.mobile) @@ -145,7 +145,7 @@ var/global/datum/authority/branch/evacuation/EvacuationAuthority //This is initi var/obj/docking_port/mobile/crashable/lifeboat/lifeboat2 = SSshuttle.getShuttle(MOBILE_SHUTTLE_LIFEBOAT_STARBOARD) lifeboat2.check_for_survivors() lifesigns += lifeboat2.survivors - ai_announcement("ATTENTION: Evacuation complete. Outbound lifesigns detected: [lifesigns ? lifesigns : "none"].", 'sound/AI/evacuation_complete.ogg') + ai_announcement("ВНИМАНИЕ: Процедуры эвакуации завершены. Внешних признаков жизни зафиксировано: [lifesigns ? lifesigns : "0"].", 'sound/AI/evacuation_complete.ogg') evac_status = EVACUATION_STATUS_COMPLETE return TRUE diff --git a/code/game/gamemodes/colonialmarines/colonialmarines.dm b/code/game/gamemodes/colonialmarines/colonialmarines.dm index 258a1a962713..d86a1fb90fb7 100644 --- a/code/game/gamemodes/colonialmarines/colonialmarines.dm +++ b/code/game/gamemodes/colonialmarines/colonialmarines.dm @@ -26,7 +26,7 @@ return TRUE /datum/game_mode/colonialmarines/announce() - to_chat_spaced(world, type = MESSAGE_TYPE_SYSTEM, html = SPAN_ROUNDHEADER("The current map is - [SSmapping.configs[GROUND_MAP].map_name]!")) + to_chat_spaced(world, type = MESSAGE_TYPE_SYSTEM, html = SPAN_ROUNDHEADER("Игровая карта - [SSmapping.configs[GROUND_MAP].map_name]!")) /datum/game_mode/colonialmarines/get_roles_list() return ROLES_DISTRESS_SIGNAL diff --git a/code/game/gamemodes/colonialmarines/xenovsxeno.dm b/code/game/gamemodes/colonialmarines/xenovsxeno.dm index c2bb45d97fc0..94ebbbea74e6 100644 --- a/code/game/gamemodes/colonialmarines/xenovsxeno.dm +++ b/code/game/gamemodes/colonialmarines/xenovsxeno.dm @@ -35,7 +35,7 @@ return TRUE /datum/game_mode/xenovs/announce() - to_chat_spaced(world, type = MESSAGE_TYPE_SYSTEM, html = SPAN_ROUNDHEADER("The current map is - [SSmapping.configs[GROUND_MAP].map_name]!")) + to_chat_spaced(world, type = MESSAGE_TYPE_SYSTEM, html = SPAN_ROUNDHEADER("Игровая карта - [SSmapping.configs[GROUND_MAP].map_name]!")) /datum/game_mode/xenovs/get_roles_list() return ROLES_XENO @@ -284,8 +284,9 @@ if(round_statistics) round_statistics.track_round_end() log_game("Round end result: [round_finished]") - to_chat_spaced(world, margin_top = 2, type = MESSAGE_TYPE_SYSTEM, html = SPAN_ROUNDHEADER("|Round Complete|")) - to_chat_spaced(world, type = MESSAGE_TYPE_SYSTEM, html = SPAN_ROUNDBODY("Thus ends the story of the battling hives on [SSmapping.configs[GROUND_MAP].map_name]. [round_finished]\nThe game-mode was: [master_mode]!\nEnd of Round Grief (EORG) is an IMMEDIATE 3 hour ban with no warnings, see rule #4 for more details.")) + to_chat_spaced(world, margin_top = 2, type = MESSAGE_TYPE_SYSTEM, html = SPAN_ROUNDHEADER("|Раунд Завершен|")) + to_chat_spaced(world, type = MESSAGE_TYPE_SYSTEM, html = SPAN_ROUNDBODY("Thus ends the story of the battling hives on [SSmapping.configs[GROUND_MAP].map_name]. [round_finished]\nThe game-mode was: [master_mode]!\nEnd of Round Grief (EORG) is an IMMEDIATE 3 hour ban with no warnings, see rule #3 for more details.")) + // for the toolbox /datum/game_mode/xenovs/end_round_message() diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 01209f816538..f06d5703a4a9 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -128,8 +128,8 @@ var/global/cas_tracking_id_increment = 0 //this var used to assign unique tracki if(round_statistics) round_statistics.track_round_end() log_game("Round end result: [round_finished]") - to_chat_spaced(world, margin_top = 2, type = MESSAGE_TYPE_SYSTEM, html = SPAN_ROUNDHEADER("|Round Complete|")) - to_chat_spaced(world, type = MESSAGE_TYPE_SYSTEM, html = SPAN_ROUNDBODY("Thus ends the story of the brave men and women of the [MAIN_SHIP_NAME] and their struggle on [SSmapping.configs[GROUND_MAP].map_name].\nThe game-mode was: [master_mode]!\nEnd of Round Grief (EORG) is an IMMEDIATE 3 hour ban with no warnings, see rule #4 for more details.")) + to_chat_spaced(world, margin_top = 2, type = MESSAGE_TYPE_SYSTEM, html = SPAN_ROUNDHEADER("|Раунд завершен|")) + to_chat_spaced(world, type = MESSAGE_TYPE_SYSTEM, html = SPAN_ROUNDBODY("Так заканчивается история экипажа [MAIN_SHIP_NAME] и их борьбы на объекте [SSmapping.configs[GROUND_MAP].map_name].\nРежим игры: [master_mode]!\nГриф в конце раунда (EORG) влечет немедленный бан на 3 часа, смотрите правило #3 для деталей.")) /datum/game_mode/proc/declare_completion() if(round_statistics) diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm index 0d10b06d5fef..8399e2884ee2 100644 --- a/code/game/jobs/access.dm +++ b/code/game/jobs/access.dm @@ -389,6 +389,8 @@ return "[MAIN_SHIP_NAME] Command" if(ACCESS_MARINE_CREWMAN) return "Vehicle Crewman" + if(ACCESS_MARINE_WALKER) + return "Walker Crewman" if(ACCESS_MARINE_PREP) return "Marine Prep" if(ACCESS_MARINE_ENGPREP) diff --git a/code/game/jobs/job/antag/xeno/queen.dm b/code/game/jobs/job/antag/xeno/queen.dm index 5702f9b1a671..253f1427d74c 100644 --- a/code/game/jobs/job/antag/xeno/queen.dm +++ b/code/game/jobs/job/antag/xeno/queen.dm @@ -19,7 +19,7 @@ to_chat(new_queen, "Talk in Hivemind using ; (e.g. ';Hello my children!')") AddTimelock(/datum/job/antag/xenos/queen, list( - JOB_XENO_ROLES = 10 HOURS, - JOB_DRONE_ROLES = 5 HOURS, - JOB_T3_ROLES = 3 HOURS, + JOB_XENO_ROLES = 3 HOURS, + JOB_DRONE_ROLES = 1 HOURS, + JOB_T3_ROLES = 1 HOURS, )) diff --git a/code/game/jobs/job/civilians/other/liaison.dm b/code/game/jobs/job/civilians/other/liaison.dm index ba65720b8251..3e868b1efbf7 100644 --- a/code/game/jobs/job/civilians/other/liaison.dm +++ b/code/game/jobs/job/civilians/other/liaison.dm @@ -24,5 +24,5 @@ job = /datum/job/civilian/liaison AddTimelock(/datum/job/civilian/liaison, list( - JOB_HUMAN_ROLES = 10 HOURS, + JOB_HUMAN_ROLES = 1 HOURS, )) diff --git a/code/game/jobs/job/civilians/other/reporter.dm b/code/game/jobs/job/civilians/other/reporter.dm index c681768f93bc..eabc1b51b505 100644 --- a/code/game/jobs/job/civilians/other/reporter.dm +++ b/code/game/jobs/job/civilians/other/reporter.dm @@ -35,5 +35,5 @@ This could be the story of the sector! 'Brave Marines responding to dangerous di job = /datum/job/civilian/reporter AddTimelock(/datum/job/civilian/reporter, list( - JOB_HUMAN_ROLES = 10 HOURS, + JOB_HUMAN_ROLES = 1 HOURS, )) diff --git a/code/game/jobs/job/civilians/other/survivors.dm b/code/game/jobs/job/civilians/other/survivors.dm index 5c82241c47de..0f8414bfa3c7 100644 --- a/code/game/jobs/job/civilians/other/survivors.dm +++ b/code/game/jobs/job/civilians/other/survivors.dm @@ -131,9 +131,9 @@ SSticker.mode.survivors_by_type_amounts[preferred_variant] += 1 AddTimelock(/datum/job/civilian/survivor, list( - JOB_SQUAD_ROLES = 5 HOURS, - JOB_ENGINEER_ROLES = 5 HOURS, - JOB_MEDIC_ROLES = 5 HOURS + JOB_SQUAD_ROLES = 1 HOURS, + JOB_ENGINEER_ROLES = 1 HOURS, + JOB_MEDIC_ROLES = 1 HOURS )) /datum/job/civilian/survivor/synth diff --git a/code/game/jobs/job/civilians/support/cmo.dm b/code/game/jobs/job/civilians/support/cmo.dm index 9f3ff20cffb3..91fe434e1bb7 100644 --- a/code/game/jobs/job/civilians/support/cmo.dm +++ b/code/game/jobs/job/civilians/support/cmo.dm @@ -9,7 +9,7 @@ entry_message_body = "You're a commissioned officer of the USCM. You have authority over everything related to Medbay and Research, only able to be overriden by the XO and CO. You are in charge of medical staff, surgery, chemistry, stimulants and keeping the marines healthy overall." AddTimelock(/datum/job/civilian/professor, list( - JOB_MEDIC_ROLES = 10 HOURS + JOB_MEDIC_ROLES = 1 HOURS )) /obj/effect/landmark/start/professor diff --git a/code/game/jobs/job/civilians/support/researcher.dm b/code/game/jobs/job/civilians/support/researcher.dm index fd33d1f03f0a..6ef965885d11 100644 --- a/code/game/jobs/job/civilians/support/researcher.dm +++ b/code/game/jobs/job/civilians/support/researcher.dm @@ -28,7 +28,7 @@ return positions AddTimelock(/datum/job/civilian/researcher, list( - JOB_MEDIC_ROLES = 5 HOURS + JOB_MEDIC_ROLES = 1 HOURS )) /obj/effect/landmark/start/researcher diff --git a/code/game/jobs/job/command/auxiliary/auxiliary_support_officer.dm b/code/game/jobs/job/command/auxiliary/auxiliary_support_officer.dm index 262ba271edbf..af8e21a27f12 100644 --- a/code/game/jobs/job/command/auxiliary/auxiliary_support_officer.dm +++ b/code/game/jobs/job/command/auxiliary/auxiliary_support_officer.dm @@ -8,10 +8,10 @@ entry_message_body = "Your job is to oversee the hangar crew, the intel officers, the engineering department, and requisition department. You have many responsibilities and a few plates to keep spinning but your subordinates are mostly self-reliant. Assist where you can and make sure command personnel are confident the auxiliary departments are operating at peak efficiency." AddTimelock(/datum/job/command/auxiliary_officer, list( - JOB_SQUAD_ROLES = 5 HOURS, - JOB_REQUISITION_ROLES = 5 HOURS, - JOB_ENGINEER_ROLES = 5 HOURS, - JOB_AUXILIARY_ROLES = 5 HOURS, + JOB_SQUAD_ROLES = 1 HOURS, + JOB_REQUISITION_ROLES = 1 HOURS, + JOB_ENGINEER_ROLES = 1 HOURS, + JOB_AUXILIARY_ROLES = 1 HOURS, )) /obj/effect/landmark/start/auxiliary_officer diff --git a/code/game/jobs/job/command/auxiliary/crew_chief.dm b/code/game/jobs/job/command/auxiliary/crew_chief.dm index 5f846bf6581e..3289fec0f82d 100644 --- a/code/game/jobs/job/command/auxiliary/crew_chief.dm +++ b/code/game/jobs/job/command/auxiliary/crew_chief.dm @@ -10,7 +10,7 @@ entry_message_body = "Your job is to assist the pilot officer maintain the ship's dropship. You have authority only on the dropship, but you are expected to maintain order, as not to disrupt the pilot." AddTimelock(/datum/job/command/crew_chief, list( - JOB_SQUAD_ROLES = 5 HOURS + JOB_SQUAD_ROLES = 1 HOURS )) /obj/effect/landmark/start/crew_chief diff --git a/code/game/jobs/job/command/auxiliary/intel.dm b/code/game/jobs/job/command/auxiliary/intel.dm index 0c6e80069a68..a3c0e806190f 100644 --- a/code/game/jobs/job/command/auxiliary/intel.dm +++ b/code/game/jobs/job/command/auxiliary/intel.dm @@ -24,7 +24,7 @@ return positions AddTimelock(/datum/job/command/intel, list( - JOB_SQUAD_ROLES = 5 HOURS + JOB_SQUAD_ROLES = 1 HOURS )) /obj/effect/landmark/start/intel diff --git a/code/game/jobs/job/command/auxiliary/pilot.dm b/code/game/jobs/job/command/auxiliary/pilot.dm index 57495fe8be28..57901f3bec91 100644 --- a/code/game/jobs/job/command/auxiliary/pilot.dm +++ b/code/game/jobs/job/command/auxiliary/pilot.dm @@ -10,7 +10,7 @@ entry_message_body = "Your job is to fly, protect, and maintain the ship's dropship. While you are an officer, your authority is limited to the dropship, where you have authority over the enlisted personnel. If you are not piloting, there is an autopilot fallback for command, but don't leave the dropship without reason." AddTimelock(/datum/job/command/pilot, list( - JOB_SQUAD_ROLES = 5 HOURS + JOB_SQUAD_ROLES = 1 HOURS )) /obj/effect/landmark/start/pilot diff --git a/code/game/jobs/job/command/auxiliary/senior.dm b/code/game/jobs/job/command/auxiliary/senior.dm index 68b9a99e4c4f..c64f27842b1a 100644 --- a/code/game/jobs/job/command/auxiliary/senior.dm +++ b/code/game/jobs/job/command/auxiliary/senior.dm @@ -25,13 +25,13 @@ return filtered_job_options AddTimelock(/datum/job/command/senior, list( - JOB_SQUAD_ROLES = 15 HOURS, + JOB_SQUAD_ROLES = 3 HOURS, - JOB_ENGINEER_ROLES = 10 HOURS, - JOB_POLICE_ROLES = 10 HOURS, - JOB_MEDIC_ROLES = 10 HOURS, + JOB_ENGINEER_ROLES = 1 HOURS, + JOB_POLICE_ROLES = 1 HOURS, + JOB_MEDIC_ROLES = 1 HOURS, - JOB_COMMAND_ROLES = 5 HOURS, + JOB_COMMAND_ROLES = 3 HOURS, )) /obj/effect/landmark/start/senior diff --git a/code/game/jobs/job/command/auxiliary/tankcrew.dm b/code/game/jobs/job/command/auxiliary/tankcrew.dm new file mode 100644 index 000000000000..5e8d7b145c4c --- /dev/null +++ b/code/game/jobs/job/command/auxiliary/tankcrew.dm @@ -0,0 +1,18 @@ +/datum/job/command/tank_crew + title = JOB_CREWMAN + total_positions = 2 + spawn_positions = 2 + allow_additional = 1 + scaled = 0 + flags_startup_parameters = ROLE_ADD_TO_DEFAULT + gear_preset = /datum/equipment_preset/uscm/tank + entry_message_body = "Your job is to operate and maintain the ship's armored vehicles. You are in charge of representing the armored presence amongst the marines during the operation, as well as maintaining and repairing your own vehicles." + +AddTimelock(/datum/job/command/tank_crew, list( + JOB_SQUAD_ROLES = 1 HOURS, + JOB_ENGINEER_ROLES = 1 HOURS +)) + +/obj/effect/landmark/start/tank_crew + name = JOB_CREWMAN + job = /datum/job/command/tank_crew diff --git a/code/game/jobs/job/command/cic/executive.dm b/code/game/jobs/job/command/cic/executive.dm index cc9b4f65e624..85fa5fc1bb61 100644 --- a/code/game/jobs/job/command/cic/executive.dm +++ b/code/game/jobs/job/command/cic/executive.dm @@ -18,7 +18,7 @@ GLOB.marine_leaders -= JOB_XO AddTimelock(/datum/job/command/executive, list( - JOB_COMMAND_ROLES = 5 HOURS, + JOB_COMMAND_ROLES = 8 HOURS, )) /obj/effect/landmark/start/executive diff --git a/code/game/jobs/job/command/cic/staffofficer.dm b/code/game/jobs/job/command/cic/staffofficer.dm index 82a537dc83f6..50cb3a9dda51 100644 --- a/code/game/jobs/job/command/cic/staffofficer.dm +++ b/code/game/jobs/job/command/cic/staffofficer.dm @@ -27,8 +27,8 @@ return ..() AddTimelock(/datum/job/command/bridge, list( - JOB_SQUAD_LEADER = 1 HOURS, - JOB_HUMAN_ROLES = 15 HOURS + JOB_SQUAD_LEADER = 3 HOURS, + JOB_HUMAN_ROLES = 3 HOURS )) /obj/effect/landmark/start/bridge diff --git a/code/game/jobs/job/command/police/chief_police.dm b/code/game/jobs/job/command/police/chief_police.dm index 60bc564af3b1..20452db9ee8e 100644 --- a/code/game/jobs/job/command/police/chief_police.dm +++ b/code/game/jobs/job/command/police/chief_police.dm @@ -7,7 +7,7 @@ entry_message_body = "You are held by a higher standard and are required to obey not only the server rules but the Marine Law. Failure to do so may result in a job ban or server ban. You lead the Military Police, ensure your officers maintain peace and stability aboard the ship. Marines can get rowdy after a few weeks of cryosleep! In addition, you are tasked with the security of high-ranking personnel, including the command staff. Keep them safe!" AddTimelock(/datum/job/command/warrant, list( - JOB_POLICE_ROLES = 15 HOURS, + JOB_POLICE_ROLES = 5 HOURS, JOB_COMMAND_ROLES = 5 HOURS )) diff --git a/code/game/jobs/job/command/police/police.dm b/code/game/jobs/job/command/police/police.dm index 48cd9b33e99c..a153b84b2c6f 100644 --- a/code/game/jobs/job/command/police/police.dm +++ b/code/game/jobs/job/command/police/police.dm @@ -26,7 +26,7 @@ return positions AddTimelock(/datum/job/command/police, list( - JOB_SQUAD_ROLES = 10 HOURS + JOB_SQUAD_ROLES = 3 HOURS )) /obj/effect/landmark/start/police diff --git a/code/game/jobs/job/command/police/warden.dm b/code/game/jobs/job/command/police/warden.dm index 851b43debd3c..31e9b7064799 100644 --- a/code/game/jobs/job/command/police/warden.dm +++ b/code/game/jobs/job/command/police/warden.dm @@ -8,7 +8,7 @@ entry_message_body = "You are held by a higher standard and are required to obey not only the server rules but the Marine Law. Failure to do so may result in a job ban or server ban. Your primary job is to maintain peace and stability aboard the ship. Marines can get rowdy after a few weeks of cryosleep! In addition, you are tasked with the mainting security records and overwatching any prisoners in Brig." AddTimelock(/datum/job/command/warden, list( - JOB_POLICE_ROLES = 10 HOURS + JOB_POLICE_ROLES = 3 HOURS )) /obj/effect/landmark/start/warden diff --git a/code/game/jobs/job/logistics/cargo/chief_req.dm b/code/game/jobs/job/logistics/cargo/chief_req.dm index 3b6fb7262a80..79e92f5e5795 100644 --- a/code/game/jobs/job/logistics/cargo/chief_req.dm +++ b/code/game/jobs/job/logistics/cargo/chief_req.dm @@ -6,7 +6,7 @@ entry_message_body = "Your job is to dispense supplies to the marines, including weapon attachments. Your cargo techs can help you out, but you have final say in your department. Make sure they're not goofing off. While you may request paperwork for supplies, do not go out of your way to screw with marines, unless you want to get deposed. A happy ship is a well-functioning ship." AddTimelock(/datum/job/logistics/requisition, list( - JOB_REQUISITION_ROLES = 10 HOURS, + JOB_REQUISITION_ROLES = 1 HOURS, )) /obj/effect/landmark/start/requisition diff --git a/code/game/jobs/job/logistics/engi/chief_engineer.dm b/code/game/jobs/job/logistics/engi/chief_engineer.dm index 9db14540e74a..9159dc1d8084 100644 --- a/code/game/jobs/job/logistics/engi/chief_engineer.dm +++ b/code/game/jobs/job/logistics/engi/chief_engineer.dm @@ -6,7 +6,7 @@ entry_message_body = "Your job is to maintain your department and keep your technicians in check. You are responsible for engineering, power, ordnance, and the orbital cannon. Should the commanding and executive officer be unavailable, you are next in the chain of command." AddTimelock(/datum/job/logistics/engineering, list( - JOB_ENGINEER_ROLES = 10 HOURS, + JOB_ENGINEER_ROLES = 5 HOURS, )) /obj/effect/landmark/start/engineering diff --git a/code/game/jobs/job/marine/squad/leader.dm b/code/game/jobs/job/marine/squad/leader.dm index aa2173d173d0..5956bb111505 100644 --- a/code/game/jobs/job/marine/squad/leader.dm +++ b/code/game/jobs/job/marine/squad/leader.dm @@ -1,7 +1,7 @@ /datum/job/marine/leader title = JOB_SQUAD_LEADER - total_positions = 4 - spawn_positions = 4 + total_positions = 2 + spawn_positions = 2 supervisors = "the acting commanding officer" flags_startup_parameters = ROLE_ADD_TO_DEFAULT|ROLE_ADD_TO_SQUAD gear_preset = /datum/equipment_preset/uscm/leader @@ -13,7 +13,7 @@ gear_preset = /datum/equipment_preset/wo/marine/sl AddTimelock(/datum/job/marine/leader, list( - JOB_SQUAD_ROLES = 10 HOURS + JOB_SQUAD_ROLES = 5 HOURS )) /obj/effect/landmark/start/marine/leader diff --git a/code/game/jobs/job/marine/squad/medic.dm b/code/game/jobs/job/marine/squad/medic.dm index 637567d47d4d..1d85cdf14fc7 100644 --- a/code/game/jobs/job/marine/squad/medic.dm +++ b/code/game/jobs/job/marine/squad/medic.dm @@ -33,7 +33,6 @@ gear_preset = /datum/equipment_preset/wo/marine/medic AddTimelock(/datum/job/marine/medic, list( - JOB_MEDIC_ROLES = 1 HOURS, JOB_SQUAD_ROLES = 1 HOURS )) diff --git a/code/game/jobs/job/marine/squad/smartgunner.dm b/code/game/jobs/job/marine/squad/smartgunner.dm index 5753434e62ee..e6255ec23e59 100644 --- a/code/game/jobs/job/marine/squad/smartgunner.dm +++ b/code/game/jobs/job/marine/squad/smartgunner.dm @@ -28,10 +28,6 @@ flags_startup_parameters = ROLE_ADD_TO_SQUAD gear_preset = /datum/equipment_preset/wo/marine/sg -AddTimelock(/datum/job/marine/smartgunner, list( - JOB_SQUAD_ROLES = 5 HOURS -)) - /obj/effect/landmark/start/marine/smartgunner name = JOB_SQUAD_SMARTGUN icon_state = "smartgunner_spawn" diff --git a/code/game/jobs/job/marine/squad/specialist.dm b/code/game/jobs/job/marine/squad/specialist.dm index 539d3a158690..7afe592eeec2 100644 --- a/code/game/jobs/job/marine/squad/specialist.dm +++ b/code/game/jobs/job/marine/squad/specialist.dm @@ -30,7 +30,7 @@ gear_preset = /datum/equipment_preset/wo/marine/spec AddTimelock(/datum/job/marine/specialist, list( - JOB_SQUAD_ROLES = 5 HOURS + JOB_SQUAD_ROLES = 1 HOURS )) /obj/effect/landmark/start/marine/spec diff --git a/code/game/jobs/job/marine/squad/tl.dm b/code/game/jobs/job/marine/squad/tl.dm index f6c58cce3e0d..be408be0747b 100644 --- a/code/game/jobs/job/marine/squad/tl.dm +++ b/code/game/jobs/job/marine/squad/tl.dm @@ -1,7 +1,7 @@ /datum/job/marine/tl title = JOB_SQUAD_TEAM_LEADER - total_positions = 8 - spawn_positions = 8 + total_positions = 4 + spawn_positions = 4 allow_additional = 1 flags_startup_parameters = ROLE_ADD_TO_DEFAULT|ROLE_ADD_TO_SQUAD gear_preset = /datum/equipment_preset/uscm/tl @@ -12,7 +12,7 @@ spawning_human.important_radio_channels += JTAC_FREQ AddTimelock(/datum/job/marine/tl, list( - JOB_SQUAD_ROLES = 8 HOURS + JOB_SQUAD_ROLES = 3 HOURS )) /obj/effect/landmark/start/marine/tl diff --git a/code/game/jobs/job/marine/squads.dm b/code/game/jobs/job/marine/squads.dm index 80f00c540383..9d7cda81ec25 100644 --- a/code/game/jobs/job/marine/squads.dm +++ b/code/game/jobs/job/marine/squads.dm @@ -44,15 +44,15 @@ /// 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 + var/max_engineers = 6 /// maximum # of squad medics allowed in the squad - var/max_medics = 4 + var/max_medics = 8 /// maximum # of specs allowed in the squad - var/max_specialists = 1 + var/max_specialists = 2 /// maximum # of fireteam leaders allowed in the suqad var/max_tl = 2 /// maximum # of smartgunners allowed in the squad - var/max_smartgun = 1 + var/max_smartgun = 2 /// maximum # of squad leaders allowed in the squad var/max_leaders = 1 /// Squad headsets default radio frequency @@ -128,7 +128,7 @@ access = list(ACCESS_MARINE_ALPHA) radio_freq = ALPHA_FREQ minimap_color = MINIMAP_SQUAD_ALPHA - +/* /datum/squad/marine/bravo name = SQUAD_MARINE_2 equipment_color = "#ffc32d" @@ -137,6 +137,10 @@ radio_freq = BRAVO_FREQ minimap_color = MINIMAP_SQUAD_BRAVO + active = FALSE + roundstart = FALSE + locked = TRUE + /datum/squad/marine/charlie name = SQUAD_MARINE_3 equipment_color = "#c864c8" @@ -145,6 +149,11 @@ radio_freq = CHARLIE_FREQ minimap_color = MINIMAP_SQUAD_CHARLIE + active = FALSE + roundstart = FALSE + locked = TRUE +*/ + /datum/squad/marine/delta name = SQUAD_MARINE_4 equipment_color = "#4148c8" @@ -153,6 +162,7 @@ radio_freq = DELTA_FREQ minimap_color = MINIMAP_SQUAD_DELTA + /datum/squad/marine/echo name = SQUAD_MARINE_5 equipment_color = "#67d692" diff --git a/code/game/jobs/role_authority.dm b/code/game/jobs/role_authority.dm index c147807f004e..3c8dc838c4ff 100644 --- a/code/game/jobs/role_authority.dm +++ b/code/game/jobs/role_authority.dm @@ -63,7 +63,6 @@ var/global/players_preassigned = 0 /datum/job/special/uaac, /datum/job/special/uaac/tis, /datum/job/special/uscm, - /datum/job/command/tank_crew //Rip VC ) var/squads_all[] = typesof(/datum/squad) - /datum/squad var/castes_all[] = subtypesof(/datum/caste_datum) diff --git a/code/game/jobs/slot_scaling.dm b/code/game/jobs/slot_scaling.dm index 7230f57eb745..a11029be746c 100644 --- a/code/game/jobs/slot_scaling.dm +++ b/code/game/jobs/slot_scaling.dm @@ -13,40 +13,40 @@ return round(Clamp((marine_count/factor)+c, min, max)) /proc/medic_slot_formula(playercount) - return job_slot_formula(playercount,40,1,3,5) + return job_slot_formula(playercount,20,1,3,5) /proc/engi_slot_formula(playercount) - return job_slot_formula(playercount,50,1,2,4) + return job_slot_formula(playercount,25,1,2,4) /proc/mp_slot_formula(playercount) return job_slot_formula(playercount,25,2,4,8) /proc/so_slot_formula(playercount) - return job_slot_formula(playercount,40,1,2,5) + return job_slot_formula(playercount,20,1,2,5) /proc/doc_slot_formula(playercount) - return job_slot_formula(playercount,25,1,4,6) + return job_slot_formula(playercount,15,1,4,6) /proc/rsc_slot_formula(playercount) - return job_slot_formula(playercount,40,1,2,3) + return job_slot_formula(playercount,20,1,2,3) /proc/ot_slot_formula(playercount) - return job_slot_formula(playercount,60,1,2,3) + return job_slot_formula(playercount,30,1,2,3) /proc/ct_slot_formula(playercount) - return job_slot_formula(playercount,30,0,2,3) + return job_slot_formula(playercount,15,0,2,3) /proc/int_slot_formula(playercount) - return job_slot_formula(playercount,30,1,1,3) + return job_slot_formula(playercount,15,1,1,3) /proc/spec_slot_formula(playercount) - return job_slot_formula(playercount,20,1,2,4) + return job_slot_formula(playercount,15,1,2,4) /proc/sg_slot_formula(playercount) - return job_slot_formula(playercount,20,1,2,4) + return job_slot_formula(playercount,15,1,2,4) /proc/synth_slot_formula(playercount) - return job_slot_formula(playercount,120,1,1,2) + return job_slot_formula(playercount,60,1,1,2) /proc/working_joe_slot_formula(playercount) - return job_slot_formula(playercount,30,1,3,6) + return job_slot_formula(playercount,15,1,3,6) diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index eb9aed4f71e4..463bb6b02d49 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -342,6 +342,8 @@ GLOBAL_LIST_INIT(frozen_items, list(SQUAD_MARINE_1 = list(), SQUAD_MARINE_2 = li set_name = "Scout Set" if(SKILL_SPEC_SNIPER) set_name = "Sniper Set" + if(SKILL_SPEC_ST) + set_name = "Stormtrooper Set" if(set_name && !available_specialist_sets.Find(set_name)) available_specialist_sets += set_name diff --git a/code/game/machinery/medical_pod/autodoc.dm b/code/game/machinery/medical_pod/autodoc.dm index 7049df4c661c..a9c07c1be972 100644 --- a/code/game/machinery/medical_pod/autodoc.dm +++ b/code/game/machinery/medical_pod/autodoc.dm @@ -243,6 +243,10 @@ if(H.disfigured) surgery_list += create_autodoc_surgery(L,LIMB_SURGERY,"facial") + if(istype(L,/obj/limb/chest)) + if(locate(/obj/item/alien_embryo) in M.contents) + surgery_list += create_autodoc_surgery(L,LIMB_SURGERY,"shrapnel") + if(L.status & LIMB_BROKEN) surgery_list += create_autodoc_surgery(L,LIMB_SURGERY,"broken") if(L.status & LIMB_DESTROYED) @@ -253,7 +257,8 @@ if(!is_type_in_list(I,known_implants)) surgery_list += create_autodoc_surgery(L,LIMB_SURGERY,"shrapnel") if(M.incision_depths[L.name] != SURGERY_DEPTH_SURFACE) - surgery_list += create_autodoc_surgery(L,LIMB_SURGERY,"open") + surgery_list += create_autodoc_surgery(L,LIMB_SURGERY,"open") + var/datum/internal_organ/I = M.internal_organs_by_name["eyes"] if(I && (M.disabilities & NEARSIGHTED || M.sdisabilities & DISABILITY_BLIND || I.damage > 0)) surgery_list += create_autodoc_surgery(null,ORGAN_SURGERY,"eyes",0,I) @@ -477,13 +482,13 @@ H.UpdateDamageIcon() if("shrapnel") - if(prob(30)) visible_message("[icon2html(src, viewers(src))] \The [src] speaks: Beginning shrapnel removal."); + if(prob(30)) visible_message("[icon2html(src, viewers(src))] \The [src] speaks: Beginning foreign bodies removal."); if(S.unneeded) sleep(UNNEEDED_DELAY) visible_message("[icon2html(src, viewers(src))] \The [src] speaks: Procedure has been deemed unnecessary."); surgery_todo_list -= S continue - + open_incision(H,S.limb_ref) if(S.limb_ref.name == "chest" || S.limb_ref.name == "head") open_encased(H,S.limb_ref) @@ -495,6 +500,11 @@ S.limb_ref.implants -= I H.embedded_items -= I qdel(I) + var/obj/item/larva_ref = locate(/obj/item/alien_embryo) in H.contents + if(S.limb_ref.name == "chest" && larva_ref) + sleep(REMOVE_OBJECT_MAX_DURATION*surgery_mod) + H.contents -= larva_ref + qdel(larva_ref) if(S.limb_ref.name == "chest" || S.limb_ref.name == "head") close_encased(H,S.limb_ref) if(!surgery) break @@ -713,7 +723,7 @@ dat += "Limb Replacement Surgery" if("shrapnel") surgeryqueue["shrapnel"] = 1 - dat += "Shrapnel Removal Surgery" + dat += "Foreign Bodies Removal Surgery" if("facial") surgeryqueue["facial"] = 1 dat += "Facial Reconstruction Surgery" @@ -733,7 +743,9 @@ if(isnull(surgeryqueue["open"])) dat += "Close Open Incisions
" if(isnull(surgeryqueue["shrapnel"])) - dat += "Shrapnel Removal Surgery
" + dat += "Foreign Bodies Removal Surgery
" + if(isnull(surgeryqueue["facial"])) + dat += "Facial Reconstruction Surgery
" dat += "Hematology Treatments" dat += "
" if(isnull(surgeryqueue["blood"])) @@ -742,9 +754,18 @@ dat += "Dialysis
" if(isnull(surgeryqueue["toxin"])) dat += "Bloodstream Toxin Removal
" + dat += "Internal Surgery" dat += "
" + if(isnull((surgeryqueue["organdamage"]))) + dat += "Organ Treatment Procedure
" + if(isnull((surgeryqueue["internal"]))) + dat += "Internal Bleeding Surgery
" + if(isnull((surgeryqueue["broken"]))) + dat += "Bone Repair Treatment
" + if(isnull((surgeryqueue["missing"]))) + dat += "Limb Replacement Surgery
" else - dat += "The autodoc is empty." + dat += "
The autodoc is empty." dat += text("Close", user) show_browser(user, dat, "Auto-Doc Medical System", "sleeper", "size=300x400") onclose(user, "sleeper") @@ -840,6 +861,9 @@ if(!is_type_in_list(I,known_implants)) N.fields["autodoc_manual"] += create_autodoc_surgery(L,LIMB_SURGERY,"shrapnel") needed++ + if(istype(L,/obj/limb/chest) && locate(/obj/item/alien_embryo) in connected.occupant.contents) + N.fields["autodoc_manual"] += create_autodoc_surgery(L,LIMB_SURGERY,"shrapnel") + needed++ if(!needed) N.fields["autodoc_manual"] += create_autodoc_surgery(null,LIMB_SURGERY,"shrapnel",1) updateUsrDialog() diff --git a/code/game/machinery/telecomms/broadcaster.dm b/code/game/machinery/telecomms/broadcaster.dm index f8250fad271c..0a5b639d864a 100644 --- a/code/game/machinery/telecomms/broadcaster.dm +++ b/code/game/machinery/telecomms/broadcaster.dm @@ -82,7 +82,7 @@ /proc/Broadcast_Message(datum/radio_frequency/connection, mob/M, vmask, vmessage, obj/item/device/radio/radio, message, name, job, realname, vname, - data, compression, list/level, freq, verbage = "says", + data, compression, list/level, freq, verbage = "говорит", datum/language/speaking = null, volume = RADIO_VOLUME_QUIET) /* ###### Prepare the radio connection ###### */ @@ -222,7 +222,7 @@ // --- Some more pre-message formatting --- var/part_b_extra = "" if(data == 3) // intercepted radio message - part_b_extra = " (Intercepted)" + part_b_extra = " (ПЕРЕХВАЧЕНО)" var/part_b = " [icon2html(radio, (heard_masked + heard_normal + heard_voice + heard_garbled + heard_gibberish))]\[[freq_text]\][part_b_extra] " // Tweaked for security headsets -- TLE if(display_freq in M.important_radio_channels) diff --git a/code/game/machinery/vending/cm_vending.dm b/code/game/machinery/vending/cm_vending.dm index bf7c4fffee65..fa1892729663 100644 --- a/code/game/machinery/vending/cm_vending.dm +++ b/code/game/machinery/vending/cm_vending.dm @@ -502,6 +502,9 @@ GLOBAL_LIST_EMPTY(vending_products) if("Pyro Set") user.skills.set_skill(SKILL_SPEC_WEAPONS, SKILL_SPEC_PYRO) specialist_assignment = "Pyro" + if("Stormtrooper Set") + user.skills.set_skill(SKILL_SPEC_WEAPONS, SKILL_SPEC_ST) + specialist_assignment = "ST" else to_chat(user, SPAN_WARNING("Something bad occured with [src], tell a Dev.")) vend_fail() diff --git a/code/game/machinery/vending/vending_types.dm b/code/game/machinery/vending/vending_types.dm index a61934324491..d7334a26e9aa 100644 --- a/code/game/machinery/vending/vending_types.dm +++ b/code/game/machinery/vending/vending_types.dm @@ -395,15 +395,9 @@ products = list( /obj/item/device/cassette_tape/pop1 = 10, - /obj/item/device/cassette_tape/hiphop = 10, - /obj/item/device/cassette_tape/nam = 10, - /obj/item/device/cassette_tape/ocean = 10, - /obj/item/device/cassette_tape/pop3 = 10, - /obj/item/device/cassette_tape/pop4 = 10, /obj/item/device/cassette_tape/pop2 = 10, - /obj/item/device/cassette_tape/heavymetal = 10, - /obj/item/device/cassette_tape/hairmetal = 10, - /obj/item/device/cassette_tape/indie = 10, + /obj/item/device/cassette_tape/pop3 = 10, + /obj/item/device/cassette_tape/heavymetal = 5, /obj/item/device/walkman = 50, /obj/item/storage/pouch/cassette = 15, /obj/item/toy/deck = 5, @@ -417,15 +411,9 @@ prices = list( /obj/item/device/cassette_tape/pop1 = 5, - /obj/item/device/cassette_tape/hiphop = 5, - /obj/item/device/cassette_tape/nam = 5, - /obj/item/device/cassette_tape/ocean = 6, - /obj/item/device/cassette_tape/pop3 = 5, - /obj/item/device/cassette_tape/pop4 = 5, /obj/item/device/cassette_tape/pop2 = 5, + /obj/item/device/cassette_tape/pop3 = 5, /obj/item/device/cassette_tape/heavymetal = 5, - /obj/item/device/cassette_tape/hairmetal = 5, - /obj/item/device/cassette_tape/indie = 5, /obj/item/device/walkman = 15, /obj/item/storage/pouch/cassette = 10, /obj/item/toy/deck = 20, diff --git a/code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm b/code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm index 891a2a907b39..dc93bd8900a4 100644 --- a/code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm +++ b/code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm @@ -16,7 +16,6 @@ vend_sound = 'sound/machines/medevac_extend.ogg' var/selected_vehicle - var/budget_points = 0 var/available_categories = VEHICLE_ALL_AVAILABLE available_points_to_display = 0 @@ -51,12 +50,17 @@ malfunction() return -/obj/structure/machinery/cm_vending/gear/vehicle_crew/proc/populate_products(datum/source, obj/vehicle/multitile/V) +/obj/structure/machinery/cm_vending/gear/vehicle_crew/proc/populate_products(datum/source, datum/vehicle_order/VO) SIGNAL_HANDLER UnregisterSignal(SSdcs, COMSIG_GLOB_VEHICLE_ORDERED) - selected_vehicle = "APC" - available_categories &= ~(VEHICLE_ARMOR_AVAILABLE|VEHICLE_INTEGRAL_AVAILABLE) //APC lacks these, so we need to remove these flags to be able to access spare parts section + available_categories = VEHICLE_ALL_AVAILABLE + + if(istype(VO, /datum/vehicle_order/tank)) + selected_vehicle = "TANK" + else if(istype(VO, /datum/vehicle_order/apc)) + selected_vehicle = "APC" + available_categories &= ~(VEHICLE_ARMOR_AVAILABLE|VEHICLE_INTEGRAL_AVAILABLE) //APC lacks these, so we need to remove these flags to be able to access spare parts section /obj/structure/machinery/cm_vending/gear/vehicle_crew/get_listed_products(mob/user) var/list/display_list = list() @@ -86,7 +90,7 @@ . += ui_static_data(user) if(supply_controller.tank_points) //we steal points from supply_controller, meh-he-he. Solely to be able to modify amount of points in vendor if needed by just changing one var. - available_points_to_display = supply_controller.tank_points + available_points_to_display += supply_controller.tank_points supply_controller.tank_points = 0 .["current_m_points"] = available_points_to_display @@ -97,7 +101,7 @@ var/prod_available = FALSE var/p_cost = myprod[2] var/avail_flag = myprod[4] - if(budget_points >= p_cost && (!avail_flag || available_categories & avail_flag)) + if(available_points_to_display >= p_cost && (!avail_flag || available_categories & avail_flag)) prod_available = TRUE stock_values += list(prod_available) @@ -116,7 +120,7 @@ to_chat(H, SPAN_WARNING("Not enough points.")) vend_fail() return FALSE - budget_points -= L[2] + available_points_to_display -= L[2] /obj/structure/machinery/cm_vending/gear/vehicle_crew/get_appropriate_vend_turf(mob/living/carbon/human/H) var/turf/T = get_turf(src) @@ -127,7 +131,8 @@ GLOBAL_LIST_INIT(cm_vending_vehicle_crew_tank, list( list("STARTING KIT SELECTION:", 0, null, null, null), list("INTEGRAL PARTS", 0, null, null, null), - list("M34A2-A Multipurpose Turret", 0, /obj/effect/essentials_set/tank/turret, VEHICLE_INTEGRAL_AVAILABLE, VENDOR_ITEM_MANDATORY), + list("M34A2-B Multipurpose Turret \[ Flares \]", 0, /obj/effect/essentials_set/tank/turret/flares, VEHICLE_INTEGRAL_AVAILABLE, VENDOR_ITEM_RECOMMENDED), + list("M34A2-A Multipurpose Turret \[ Smoke \]", 0, /obj/effect/essentials_set/tank/turret, VEHICLE_INTEGRAL_AVAILABLE, VENDOR_ITEM_REGULAR), list("PRIMARY WEAPON", 0, null, null, null), list("AC3-E Autocannon", 0, /obj/effect/essentials_set/tank/autocannon, VEHICLE_PRIMARY_AVAILABLE, VENDOR_ITEM_RECOMMENDED), @@ -159,9 +164,11 @@ GLOBAL_LIST_INIT(cm_vending_vehicle_crew_tank_spare, list( list("SPARE PARTS SELECTION:", 0, null, null, null), list("INTEGRAL PARTS", 0, null, null, null), - list("M34A2-A Multipurpose Turret", 500, /obj/item/hardpoint/holder/tank_turret, null, VENDOR_ITEM_REGULAR), + list("M34A2-B Multipurpose Turret \[ Flares \]", 500, /obj/item/hardpoint/holder/tank_turret/flares, null, VENDOR_ITEM_RECOMMENDED), + list("M34A2-A Multipurpose Turret \[ Smoke \]", 500, /obj/item/hardpoint/holder/tank_turret, null, VENDOR_ITEM_REGULAR), list("SUPPORT AMMUNITION", 0, null, null, null), + list("Turret Flare Launcher Magazine", 50, /obj/item/ammo_magazine/hardpoint/flare_launcher/tank, null, VENDOR_ITEM_RECOMMENDED), list("Turret Smoke Screen Magazine", 50, /obj/item/ammo_magazine/hardpoint/turret_smoke, null, VENDOR_ITEM_REGULAR), list("PRIMARY WEAPON", 0, null, null, null), @@ -214,7 +221,8 @@ GLOBAL_LIST_INIT(cm_vending_vehicle_crew_apc, list( list("RE-RE700 Frontal Cannon", 0, /obj/effect/essentials_set/apc/frontalcannon, VEHICLE_SECONDARY_AVAILABLE, VENDOR_ITEM_MANDATORY), list("SUPPORT MODULE", 0, null, null, null), - list("M-97F Flare Launcher", 0, /obj/effect/essentials_set/apc/flarelauncher, VEHICLE_SUPPORT_AVAILABLE, VENDOR_ITEM_MANDATORY), + list("M-87F Flare Launcher", 0, /obj/effect/essentials_set/apc/flarelauncher, VEHICLE_SUPPORT_AVAILABLE, VENDOR_ITEM_MANDATORY), + list("M-87S Smoke Screen System", 0, /obj/effect/essentials_set/apc/flarelauncher/smokelauncher, VEHICLE_SUPPORT_AVAILABLE, VENDOR_ITEM_MANDATORY), list("WHEELS", 0, null, null, null), list("APC Wheels", 0, /obj/item/hardpoint/locomotion/apc_wheels, VEHICLE_TREADS_AVAILABLE, VENDOR_ITEM_MANDATORY))) @@ -235,10 +243,12 @@ GLOBAL_LIST_INIT(cm_vending_vehicle_crew_apc_spare, list( list("RE-RE700 Frontal Cannon Magazine", 150, /obj/item/ammo_magazine/hardpoint/tank_glauncher, null, VENDOR_ITEM_REGULAR), list("SUPPORT MODULE", 0, null, null, null), - list("M-97F Flare Launcher", 300, /obj/item/hardpoint/support/flare_launcher, null, VENDOR_ITEM_REGULAR), + list("M-87F Flare Launcher", 300, /obj/item/hardpoint/support/flare_launcher, null, VENDOR_ITEM_RECOMMENDED), + list("M-87S Smoke Screen System", 300, /obj/item/hardpoint/support/flare_launcher/smoke_launcher, null, VENDOR_ITEM_REGULAR), list("SUPPORT AMMUNITION", 0, null, null, null), - list("M-97F Flare Launcher Magazine", 50, /obj/item/ammo_magazine/hardpoint/flare_launcher, null, VENDOR_ITEM_REGULAR), + list("M-87F Flare Launcher Magazine", 50, /obj/item/ammo_magazine/hardpoint/flare_launcher, null, VENDOR_ITEM_RECOMMENDED), + list("M-87S Smoke Screen Magazine", 50, /obj/item/ammo_magazine/hardpoint/turret_smoke/apc, null, VENDOR_ITEM_REGULAR), list("WHEELS", 0, null, null, null), list("APC Wheels", 200, /obj/item/hardpoint/locomotion/apc_wheels, null, VENDOR_ITEM_REGULAR))) @@ -466,6 +476,14 @@ GLOBAL_LIST_INIT(cm_vending_clothing_vehicle_crew, list( /obj/item/ammo_magazine/hardpoint/turret_smoke, ) +/obj/effect/essentials_set/tank/turret/flares + spawned_gear_list = list( + /obj/item/hardpoint/holder/tank_turret/flares, + /obj/item/ammo_magazine/hardpoint/flare_launcher/tank, + /obj/item/ammo_magazine/hardpoint/flare_launcher/tank, + /obj/item/ammo_magazine/hardpoint/flare_launcher/tank, + ) + /obj/effect/essentials_set/apc/dualcannon spawned_gear_list = list( /obj/item/hardpoint/primary/dualcannon, @@ -488,3 +506,10 @@ GLOBAL_LIST_INIT(cm_vending_clothing_vehicle_crew, list( /obj/item/ammo_magazine/hardpoint/flare_launcher, /obj/item/ammo_magazine/hardpoint/flare_launcher, ) + +/obj/effect/essentials_set/apc/flarelauncher/smokelauncher + spawned_gear_list = list( + /obj/item/hardpoint/support/flare_launcher/smoke_launcher, + /obj/item/ammo_magazine/hardpoint/turret_smoke/apc, + /obj/item/ammo_magazine/hardpoint/turret_smoke/apc, + ) diff --git a/code/game/machinery/vending/vendor_types/general.dm b/code/game/machinery/vending/vendor_types/general.dm index f4f6aa42aaf1..d4cf6876f53f 100644 --- a/code/game/machinery/vending/vendor_types/general.dm +++ b/code/game/machinery/vending/vendor_types/general.dm @@ -13,15 +13,9 @@ GLOBAL_LIST_INIT(cm_vending_walkman, list( list("WALKMAN", -1, null, null), list("Blue Cassette", 10, /obj/item/device/cassette_tape/pop1, VENDOR_ITEM_REGULAR), - list("Blue Stripe Cassette", 10, /obj/item/device/cassette_tape/hiphop, VENDOR_ITEM_REGULAR), - list("Green Cassette", 10, /obj/item/device/cassette_tape/nam, VENDOR_ITEM_REGULAR), - list("Ocean Cassette", 10, /obj/item/device/cassette_tape/ocean, VENDOR_ITEM_REGULAR), list("Orange Cassette", 10, /obj/item/device/cassette_tape/pop3, VENDOR_ITEM_REGULAR), - list("Pink Cassette", 10, /obj/item/device/cassette_tape/pop4, VENDOR_ITEM_REGULAR), list("Rainbow Cassette", 10, /obj/item/device/cassette_tape/pop2, VENDOR_ITEM_REGULAR), list("Red-Black Cassette", 10, /obj/item/device/cassette_tape/heavymetal, VENDOR_ITEM_REGULAR), - list("Red Striped Cassette", 10, /obj/item/device/cassette_tape/hairmetal, VENDOR_ITEM_REGULAR), - list("Rising Sun Cassette", 10, /obj/item/device/cassette_tape/indie, VENDOR_ITEM_REGULAR), list("Walkman", 50, /obj/item/device/walkman, VENDOR_ITEM_REGULAR), list("Cassette Pouch", 15, /obj/item/storage/pouch/cassette, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/intelligence_officer.dm b/code/game/machinery/vending/vendor_types/intelligence_officer.dm index a74c035b2d13..d7850fea9254 100644 --- a/code/game/machinery/vending/vendor_types/intelligence_officer.dm +++ b/code/game/machinery/vending/vendor_types/intelligence_officer.dm @@ -21,7 +21,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_intelligence_officer, list( list("POUCHES", 0, null, null, null), list("Large Magazine Pouch", 10, /obj/item/storage/pouch/magazine/large, null, VENDOR_ITEM_REGULAR), list("Large Shotgun Shell Pouch", 10, /obj/item/storage/pouch/shotgun/large, null, VENDOR_ITEM_REGULAR), - list("Autoinjector Pouch (Full)", 15, /obj/item/storage/pouch/autoinjector/full, null, VENDOR_ITEM_RECOMMENDED), + list("Autoinjector Pouch (Full)", 15, /obj/item/storage/pouch/autoinjector/full/skillless, null, VENDOR_ITEM_RECOMMENDED), list("Machete Pouch (Full)", 10, /obj/item/storage/pouch/machete/full, null, VENDOR_ITEM_REGULAR), list("PRIMARY AMMUNITION", 0, null, null, null), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_specialist.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_specialist.dm index 38c74481205d..a60cc203ee88 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_specialist.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_specialist.dm @@ -6,6 +6,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_spec, list( list("Heavy Grenadier Set", 0, /obj/item/storage/box/spec/heavy_grenadier, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_REGULAR), list("Pyro Set", 0, /obj/item/storage/box/spec/pyro, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_REGULAR), list("Scout Set", 0, /obj/item/storage/box/spec/scout, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_REGULAR), + list("Stormtrooper Set", 0, /obj/item/storage/box/spec/st, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_REGULAR), list("Sniper Set", 0, /obj/item/storage/box/spec/sniper, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_RECOMMENDED), list("EXTRA SCOUT AMMUNITION", 0, null, null, null), @@ -36,6 +37,26 @@ GLOBAL_LIST_INIT(cm_vending_gear_spec, list( list("Large Incinerator Tank (B) (Green Flame)", 40, /obj/item/ammo_magazine/flamer_tank/large/B, null, VENDOR_ITEM_REGULAR), list("Large Incinerator Tank (X) (Blue Flame)", 40, /obj/item/ammo_magazine/flamer_tank/large/X, null, VENDOR_ITEM_REGULAR), + list("UTILITIES", 0, null, null, null), + list("Fire Extinguisher (Portable)", 5, /obj/item/tool/extinguisher/mini, null, VENDOR_ITEM_REGULAR), + list("Medical Helmet Optic", 15, /obj/item/device/helmet_visor/medical, null, VENDOR_ITEM_REGULAR), + list("Roller Bed", 5, /obj/item/roller, null, VENDOR_ITEM_REGULAR), + list("Fulton Device Stack", 5, /obj/item/stack/fulton, null, VENDOR_ITEM_REGULAR), + list("Fuel Tank Strap Pouch", 5, /obj/item/storage/pouch/flamertank, null, VENDOR_ITEM_REGULAR), + list("Large General Pouch", 10, /obj/item/storage/pouch/general/large, null, VENDOR_ITEM_REGULAR), + list("Sling Pouch", 10, /obj/item/storage/pouch/sling, null, VENDOR_ITEM_REGULAR), + list("Autoinjector Pouch (Full)", 15, /obj/item/storage/pouch/autoinjector/full/skillless, null, VENDOR_ITEM_REGULAR), + list("Motion Detector", 10, /obj/item/device/motiondetector, null, VENDOR_ITEM_REGULAR), + list("Machete Pouch (Full)", 15, /obj/item/storage/pouch/machete/full, null, VENDOR_ITEM_REGULAR), + list("JTAC Pamphlet", 15, /obj/item/pamphlet/skill/jtac, null, VENDOR_ITEM_REGULAR), + list("Engineering Pamphlet", 15, /obj/item/pamphlet/skill/engineer, null, VENDOR_ITEM_REGULAR), + list("Powerloader Certification", 45, /obj/item/pamphlet/skill/powerloader, null, VENDOR_ITEM_REGULAR), + + list("RADIO KEYS", 0, null, null, null), + list("Engineering Radio Encryption Key", 5, /obj/item/device/encryptionkey/engi, null, VENDOR_ITEM_REGULAR), + list("Intel Radio Encryption Key", 5, /obj/item/device/encryptionkey/intel, null, VENDOR_ITEM_REGULAR), + list("JTAC Radio Encryption Key", 5, /obj/item/device/encryptionkey/jtac, null, VENDOR_ITEM_REGULAR), + list("Supply Radio Encryption Key", 5, /obj/item/device/encryptionkey/req, null, VENDOR_ITEM_REGULAR), )) /obj/structure/machinery/cm_vending/gear/spec diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm index c03d79eddfd0..2eb9fcea7eb7 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm @@ -87,6 +87,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_tl, list( list("MRE", 0, /obj/item/storage/box/MRE, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), list("Map", 0, /obj/item/map/current_map, MARINE_CAN_BUY_KIT, VENDOR_ITEM_MANDATORY), list("Essential Fireteam Leader Utilities", 0, /obj/effect/essentials_set/tl, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY), + list("USCM Radio Telephone Pack", 0, /obj/item/storage/backpack/marine/satchel/rto, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY), list("BELT (CHOOSE 1)", 0, null, null, null), list("G8-A General Utility Pouch", 0, /obj/item/storage/backpack/general_belt, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), diff --git a/code/game/objects/items/circuitboards/computer.dm b/code/game/objects/items/circuitboards/computer.dm index db19b79ac0fd..fee0dd0a67b0 100644 --- a/code/game/objects/items/circuitboards/computer.dm +++ b/code/game/objects/items/circuitboards/computer.dm @@ -225,17 +225,14 @@ name = "Circuit board (vehicle ASRS console)" build_path = /obj/structure/machinery/computer/supplycomp/vehicle var/spent = FALSE //so that they can't just reconstruct the console to get another APC - var/tank_unlocked = FALSE /obj/item/circuitboard/computer/supplycomp/vehicle/construct(obj/structure/machinery/computer/supplycomp/vehicle/SCV) if (..(SCV)) SCV.spent = spent - SCV.tank_unlocked = tank_unlocked /obj/item/circuitboard/computer/supplycomp/vehicle/disassemble(obj/structure/machinery/computer/supplycomp/vehicle/SCV) if (..(SCV)) spent = SCV.spent - tank_unlocked = SCV.tank_unlocked /obj/item/circuitboard/computer/operating name = "Circuit board (Operating Computer)" diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 2092ffa108c6..75e414690113 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -206,7 +206,7 @@ // If we were to send to a channel we don't have, drop it. return null -/obj/item/device/radio/talk_into(mob/living/M as mob, message, channel, verb = "says", datum/language/speaking = null) +/obj/item/device/radio/talk_into(mob/living/M as mob, message, channel, verb = "говорит", datum/language/speaking = null) if(!on) return // the device has to be on // Fix for permacell radios, but kinda eh about actually fixing them. if(!M || !message) return @@ -328,7 +328,7 @@ return null return target_zs -/obj/item/device/radio/hear_talk(mob/M as mob, msg, verb = "says", datum/language/speaking = null) +/obj/item/device/radio/hear_talk(mob/M as mob, msg, verb = "говорит", datum/language/speaking = null) if (broadcasting) if(get_dist(src, M) <= canhear_range) talk_into(M, msg,null,verb,speaking) diff --git a/code/game/objects/items/devices/walkman.dm b/code/game/objects/items/devices/walkman.dm index 2bbcb802d426..ab376f14588a 100644 --- a/code/game/objects/items/devices/walkman.dm +++ b/code/game/objects/items/devices/walkman.dm @@ -335,7 +335,7 @@ /obj/item/device/cassette_tape/pop1 name = "blue cassette" id = 2 - desc = "A plastic cassette tape with a blue sticker." + desc = "A plastic cassette tape with a blue sticker.\nFrom 13th with love." icon_state = "cassette_blue" side1_icon = "cassette_blue" songs = list("side1" = list("sound/music/walkman/pop1/1-1-1.ogg",\ @@ -348,7 +348,7 @@ /obj/item/device/cassette_tape/pop2 name = "rainbow cassette" id = 3 - desc = "A plastic cassette tape with a rainbow-colored sticker." + desc = "A plastic cassette tape with a rainbow-colored sticker.\nFrom 13th with love." icon_state = "cassette_rainbow" side1_icon = "cassette_rainbow" songs = list("side1" = list("sound/music/walkman/pop2/2-1-1.ogg",\ @@ -361,7 +361,7 @@ /obj/item/device/cassette_tape/pop3 name = "orange cassette" id = 4 - desc = "A plastic cassette tape with an orange sticker." + desc = "A plastic cassette tape with an orange sticker.\nFrom shizoidov with love." icon_state = "cassette_orange" side1_icon = "cassette_orange" songs = list("side1" = list("sound/music/walkman/pop3/3-1-1.ogg",\ @@ -374,7 +374,7 @@ /obj/item/device/cassette_tape/pop4 name = "pink cassette" id = 5 - desc = "A plastic cassette tape with a pink striped sticker." + desc = "A plastic cassette tape with a pink striped sticker.\nSeems empty." icon_state = "cassette_pink_stripe" side1_icon = "cassette_pink_stripe" songs = list("side1" = list("sound/music/walkman/pop4/4-1-1.ogg",\ @@ -400,7 +400,7 @@ /obj/item/device/cassette_tape/hairmetal name = "red striped cassette" id = 7 - desc = "A plastic cassette tape with a gray sticker with red stripes." + desc = "A plastic cassette tape with a gray sticker with red stripes.\nSeems empty." icon_state = "cassette_red_stripe" side1_icon = "cassette_red_stripe" songs = list("side1" = list("sound/music/walkman/hairmetal/6-1-1.ogg",\ @@ -413,7 +413,7 @@ /obj/item/device/cassette_tape/indie name = "rising sun cassette" id = 8 - desc = "A plastic cassette tape with the Japanese Rising Sun." + desc = "A plastic cassette tape with the Japanese Rising Sun.\nSeems empty." icon_state = "cassette_rising_sun" side1_icon = "cassette_rising_sun" songs = list("side1" = list("sound/music/walkman/indie/7-1-1.ogg",\ @@ -426,7 +426,7 @@ /obj/item/device/cassette_tape/hiphop name = "blue stripe cassette" id = 9 - desc = "An orange plastic cassette tape with a blue stripe." + desc = "An orange plastic cassette tape with a blue stripe.\nSeems empty." icon_state = "cassette_orange_blue" side1_icon = "cassette_orange_blue" songs = list("side1" = list("sound/music/walkman/hiphop/8-1-1.ogg",\ @@ -439,7 +439,7 @@ /obj/item/device/cassette_tape/nam name = "green cassette" id = 10 - desc = "A green plastic cassette tape." + desc = "A green plastic cassette tape.\nSeems empty." icon_state = "cassette_green" side1_icon = "cassette_green" songs = list("side1" = list("sound/music/walkman/nam/9-1-1.ogg",\ @@ -452,7 +452,7 @@ /obj/item/device/cassette_tape/ocean name = "ocean cassette" id = 11 - desc = "A blue and white plastic cassette tape." + desc = "A blue and white plastic cassette tape.\nSeems empty." icon_state = "cassette_ocean" side1_icon = "cassette_ocean" songs = list("side1" = list("sound/music/walkman/surf/10-1-1.ogg",\ @@ -468,7 +468,7 @@ /obj/item/device/cassette_tape/aesthetic name = "aesthetic cassette" id = 12 - desc = "An aesthetic looking cassette tape. 'Jacket' is written on the front." + desc = "An aesthetic looking cassette tape. 'Jacket' is written on the front.\nSeems empty." icon_state = "cassette_aesthetic" side1_icon = "cassette_aesthetic" @@ -476,7 +476,7 @@ /obj/item/device/cassette_tape/cargocrate name = "weyland yutani cassette" id = 13 - desc = "A blue metallic cassette with a weyland yutani logo." + desc = "A blue metallic cassette with a weyland yutani logo.\nSeems empty." icon_state = "cassette_wy" side1_icon = "cassette_wy" @@ -484,7 +484,7 @@ /obj/item/device/cassette_tape/solaris name = "red UCP cassette" id = 14 - desc = "A cassette with a red UCP camo design." + desc = "A cassette with a red UCP camo design.\nSeems empty." icon_state = "cassette_solaris" side1_icon = "cassette_solaris" @@ -492,27 +492,27 @@ /obj/item/device/cassette_tape/icecolony name = "frozen cassette" id = 15 - desc = "A cassette. It's covered in ice and snow." + desc = "A cassette. It's covered in ice and snow.\nSeems empty." icon_state = "cassette_ice" side1_icon = "cassette_ice" /obj/item/device/cassette_tape/lz name = "nostalgic cassette" id = 16 - desc = "There's a cut up postcard taped to this cassette. You know this place." + desc = "There's a cut up postcard taped to this cassette. You know this place.\nSeems empty." icon_state = "cassette_lz" side1_icon = "cassette_lz" /obj/item/device/cassette_tape/desertdam name = "dam cassette" id = 17 - desc = "Attached to this cassette is a picture of a dam." + desc = "Attached to this cassette is a picture of a dam.\nSeems empty." icon_state = "cassette_dam" side1_icon = "cassette_dam" /obj/item/device/cassette_tape/prison name = "broken cassette" id = 18 - desc = "The shell on this cassette is broken, it still looks like it'll work, though!" + desc = "The shell on this cassette is broken, it still looks like it'll work, though!\nSeems empty." icon_state = "cassette_worstmap" side1_icon = "cassette_worstmap" diff --git a/code/game/objects/items/props/helmetgarb.dm b/code/game/objects/items/props/helmetgarb.dm index 661c8d422316..00f2c9a0978e 100644 --- a/code/game/objects/items/props/helmetgarb.dm +++ b/code/game/objects/items/props/helmetgarb.dm @@ -396,7 +396,7 @@ to_chat(user, SPAN_WARNING("You cannot use \the [src] when they are hidden.")) return - if(user.client.view > 7 && shape != NVG_SHAPE_COSMETIC) + if(user.client.view > 7 && shape != NVG_SHAPE_COSMETIC && !istype(user.buckled, /obj/structure/bed/chair/comfy/vehicle)) to_chat(user, SPAN_WARNING("You cannot use \the [src] while using optics.")) return diff --git a/code/game/objects/items/reagent_containers/syringes.dm b/code/game/objects/items/reagent_containers/syringes.dm index 06cbb559360c..1166a18d4faa 100644 --- a/code/game/objects/items/reagent_containers/syringes.dm +++ b/code/game/objects/items/reagent_containers/syringes.dm @@ -254,7 +254,7 @@ return var/hit_area = affecting.display_name - if((user != target) && H.check_shields(7, "the [src.name]")) + if((user != target) && H.check_shields(7, "the [src.name]", attacker_dir = get_dir(user,target))) return if (target != user && target.getarmor(target_zone, ARMOR_MELEE) > 5 && prob(50)) diff --git a/code/game/objects/items/storage/pouch.dm b/code/game/objects/items/storage/pouch.dm index 01b9506f073b..a8c93bcbdefd 100644 --- a/code/game/objects/items/storage/pouch.dm +++ b/code/game/objects/items/storage/pouch.dm @@ -205,13 +205,13 @@ desc = "Contains a painkiller autoinjector, first-aid autoinjector, some ointment, and some bandages." /obj/item/storage/pouch/firstaid/full/fill_preset_inventory() - new /obj/item/reagent_container/hypospray/autoinjector/bicaridine(src) - new /obj/item/reagent_container/hypospray/autoinjector/kelotane(src) - new /obj/item/reagent_container/hypospray/autoinjector/tramadol(src) + new /obj/item/reagent_container/hypospray/autoinjector/bicaridine/skillless(src) + new /obj/item/reagent_container/hypospray/autoinjector/kelotane/skillless(src) + new /obj/item/reagent_container/hypospray/autoinjector/tramadol/skillless(src) new /obj/item/reagent_container/hypospray/autoinjector/emergency(src) /obj/item/storage/pouch/firstaid/full/alternate/fill_preset_inventory() - new /obj/item/reagent_container/hypospray/autoinjector/tricord(src) + new /obj/item/reagent_container/hypospray/autoinjector/tricord/skillless(src) new /obj/item/stack/medical/splint(src) new /obj/item/stack/medical/ointment(src) new /obj/item/stack/medical/bruise_pack(src) diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm index cdab7db87ed7..cb390fb89fec 100644 --- a/code/game/objects/items/weapons/swords_axes_etc.dm +++ b/code/game/objects/items/weapons/swords_axes_etc.dm @@ -94,7 +94,7 @@ return /obj/item/weapon/telebaton/proc/stun(mob/living/carbon/human/target, mob/living/user) - if(target.check_shields(src, 0, "[user]'s [name]")) + if(target.check_shields(src, 0, "[user]'s [name]", get_dir(user,target))) return FALSE // Visuals and sound playsound(target, 'sound/weapons/baton.ogg', 50, TRUE, 7) diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm index 3d774cedc616..cc4ababa60a0 100644 --- a/code/game/supplyshuttle.dm +++ b/code/game/supplyshuttle.dm @@ -434,6 +434,7 @@ var/datum/controller/supply/supply_controller = new() //dropship part fabricator's points, so we can reference them globally (mostly for DEFCON) var/dropship_points = 10000 //gains roughly 18 points per minute | Original points of 5k doubled due to removal of prespawned ammo. var/tank_points = 0 + var/mech_points = 5 /datum/controller/supply/New() ordernum = rand(1,9000) @@ -525,6 +526,64 @@ var/datum/controller/supply/supply_controller = new() points += points_per_crate qdel(C) + //Зачем им трупы + var/points_per_xeno_t1 = 20 + var/points_per_xeno_t2 = 40 + var/points_per_xeno_t3 = 70 + var/points_per_xeno_q = 150 + for(var/mob/living/carbon/xenomorph/larva in area_shuttle) + points += 6 + qdel(larva) + for(var/mob/living/carbon/xenomorph/carrier in area_shuttle) + points += points_per_xeno_t2 + qdel(carrier) + for(var/mob/living/carbon/xenomorph/ravager in area_shuttle) + points += points_per_xeno_t3 + qdel(ravager) + for(var/mob/living/carbon/xenomorph/praetorian in area_shuttle) + points += points_per_xeno_t3 + qdel(praetorian) + for(var/mob/living/carbon/xenomorph/hivelord in area_shuttle) + points += points_per_xeno_t2 + qdel(hivelord) + for(var/mob/living/carbon/xenomorph/defender in area_shuttle) + points += points_per_xeno_t1 + qdel(defender) + for(var/mob/living/carbon/xenomorph/warrior in area_shuttle) + points += points_per_xeno_t2 + qdel(warrior) + for(var/mob/living/carbon/xenomorph/facehugger in area_shuttle) + points += 5 + qdel(facehugger) + for(var/mob/living/carbon/xenomorph/runner in area_shuttle) + points += points_per_xeno_t1 + qdel(runner) + for(var/mob/living/carbon/xenomorph/boiler in area_shuttle) + points += points_per_xeno_t3 + qdel(boiler) + for(var/mob/living/carbon/xenomorph/crusher in area_shuttle) + points += points_per_xeno_t3 + qdel(crusher) + for(var/mob/living/carbon/xenomorph/burrower in area_shuttle) + points += points_per_xeno_t2 + qdel(burrower) + for(var/mob/living/carbon/xenomorph/drone in area_shuttle) + points += points_per_xeno_t1 + qdel(drone) + for(var/mob/living/carbon/xenomorph/spitter in area_shuttle) + points += points_per_xeno_t2 + qdel(spitter) + for(var/mob/living/carbon/xenomorph/sentinel in area_shuttle) + points += points_per_xeno_t1 + qdel(sentinel) + for(var/mob/living/carbon/xenomorph/lurker in area_shuttle) + points += points_per_xeno_t2 + qdel(lurker) + for(var/mob/living/carbon/xenomorph/queen in area_shuttle) + points += points_per_xeno_q + qdel(queen) //Квина иди нахуй + + // Sell manifests. var/screams = FALSE for(var/atom/movable/movable_atom in area_shuttle) @@ -1290,8 +1349,7 @@ var/datum/controller/supply/supply_controller = new() req_access = list(ACCESS_MARINE_CREWMAN) circuit = /obj/item/circuitboard/computer/supplycomp/vehicle // Can only retrieve one vehicle per round - var/spent = TRUE - var/tank_unlocked = FALSE + var/spent = FALSE var/list/allowed_roles = list(JOB_CREWMAN) var/list/vehicles @@ -1300,7 +1358,6 @@ var/datum/controller/supply/supply_controller = new() var/name = "vehicle order" var/obj/vehicle/ordered_vehicle - var/unlocked = TRUE var/failure_message = "Not enough resources were allocated to repair this vehicle during this operation.
" /datum/vehicle_order/proc/has_vehicle_lock() @@ -1313,20 +1370,17 @@ var/datum/controller/supply/supply_controller = new() name = "M34A2 Longstreet Light Tank" ordered_vehicle = /obj/effect/vehicle_spawner/tank/decrepit -/datum/vehicle_order/tank/has_vehicle_lock() - return - /datum/vehicle_order/apc name = "M577 Armored Personnel Carrier" ordered_vehicle = /obj/effect/vehicle_spawner/apc/decrepit /datum/vehicle_order/apc/med name = "M577-MED Armored Personnel Carrier" - ordered_vehicle = /obj/effect/vehicle_spawner/apc_med/decrepit + ordered_vehicle = /obj/effect/vehicle_spawner/apc/med/decrepit /datum/vehicle_order/apc/cmd name = "M577-CMD Armored Personnel Carrier" - ordered_vehicle = /obj/effect/vehicle_spawner/apc_cmd/decrepit + ordered_vehicle = /obj/effect/vehicle_spawner/apc/cmd/decrepit /obj/structure/machinery/computer/supplycomp/vehicle/Initialize() . = ..() @@ -1335,10 +1389,11 @@ var/datum/controller/supply/supply_controller = new() /datum/vehicle_order/apc, /datum/vehicle_order/apc/med, /datum/vehicle_order/apc/cmd, + /datum/vehicle_order/tank, ) for(var/order as anything in vehicles) - new order + vehicles[order] = new order if(!VehicleElevatorConsole) VehicleElevatorConsole = src @@ -1383,12 +1438,12 @@ var/datum/controller/supply/supply_controller = new() dat += "Available vehicles:
" for(var/d in vehicles) - var/datum/vehicle_order/VO = d + var/datum/vehicle_order/VO = vehicles[d] if(VO.has_vehicle_lock()) dat += VO.failure_message else - dat += "[VO.name]
" + dat += "[VO.name]
" show_browser(H, dat, "Automated Storage and Retrieval System", "computer", "size=575x450") @@ -1425,7 +1480,7 @@ var/datum/controller/supply/supply_controller = new() var/obj/vehicle/multitile/ordered_vehicle - var/datum/vehicle_order/VO = locate(href_list["get_vehicle"]) + var/datum/vehicle_order/VO = vehicles[text2path(href_list["get_vehicle"])] if(!VO) return if(VO.has_vehicle_lock()) return @@ -1436,7 +1491,7 @@ var/datum/controller/supply/supply_controller = new() VO.on_created(ordered_vehicle) - SEND_GLOBAL_SIGNAL(COMSIG_GLOB_VEHICLE_ORDERED, ordered_vehicle) + SEND_GLOBAL_SIGNAL(COMSIG_GLOB_VEHICLE_ORDERED, VO) add_fingerprint(usr) updateUsrDialog() diff --git a/code/game/turfs/walls/wall_types.dm b/code/game/turfs/walls/wall_types.dm index 2548801cc7b1..2a7215182e17 100644 --- a/code/game/turfs/walls/wall_types.dm +++ b/code/game/turfs/walls/wall_types.dm @@ -1217,7 +1217,12 @@ INITIALIZE_IMMEDIATE(/turf/closed/wall/indestructible/splashscreen) /turf/closed/wall/resin/attackby(obj/item/W, mob/living/user) if(SEND_SIGNAL(src, COMSIG_WALL_RESIN_ATTACKBY, W, user) & COMPONENT_CANCEL_ATTACKBY) return - + + if(istype(W, /obj/item/weapon/twohanded/st_hammer)) + if(!skillcheck(user, SKILL_SPEC_WEAPONS, SKILL_SPEC_ALL) && (user.skills.get_skill_level(SKILL_SPEC_WEAPONS) != SKILL_SPEC_ST)) + to_chat(user, SPAN_HIGHDANGER("[W.name] is too heavy for you...")) + return + if(!(W.flags_item & NOBLUDGEON)) user.animation_attack_on(src) take_damage(W.force*RESIN_MELEE_DAMAGE_MULTIPLIER, user) diff --git a/code/modules/admin/IsBanned.dm b/code/modules/admin/IsBanned.dm index bf6d8e261ab3..d49a7cf91c63 100644 --- a/code/modules/admin/IsBanned.dm +++ b/code/modules/admin/IsBanned.dm @@ -13,9 +13,9 @@ //Guest Checking if(!real_bans_only && CONFIG_GET(flag/guest_ban) && IsGuestKey(key)) - log_access("Failed Login: [key] - Guests not allowed") - message_admins("Failed Login: [key] - Guests not allowed") - return list("reason"="guest", "desc"="\nReason: Guests not allowed. Please sign in with a byond account.") + log_access("Ой ой, [key] не смог зайти - Гости не нужны") + message_admins("Ой ой, [key] не смог зайти - Гости не нужны") + return list("reason"="guest", "desc"="\nПричина: Guests not allowed. Please sign in with a byond account.") WAIT_DB_READY if(admin_datums[ckey] && (admin_datums[ckey].rights & R_MOD)) @@ -28,8 +28,8 @@ //check if the IP address is a known TOR node if(CONFIG_GET(flag/ToRban) && ToRban_isbanned(address)) - log_access("Failed Login: [src] - Banned: ToR") - message_admins("Failed Login: [src] - Banned: ToR") + log_access("Агаааа, [src] не смог зайти - бан: ТоР") + message_admins("Агаааа, [src] не смог зайти - бан: ТоР") return list("reason"="Using ToR", "desc"="\nReason: The network you are using to connect has been banned.\nIf you believe this is a mistake, please request help at [CONFIG_GET(string/banappeals)]") // wait for database to be ready diff --git a/code/modules/admin/NewBan.dm b/code/modules/admin/NewBan.dm index b64b1e4682fd..477fa504dded 100644 --- a/code/modules/admin/NewBan.dm +++ b/code/modules/admin/NewBan.dm @@ -20,10 +20,10 @@ var/savefile/Banlist ClearTempbans() return 0 else - .["desc"] = "\nReason: [Banlist["reason"]]\nExpires: [GetExp(Banlist["minutes"])]\nBy: [Banlist["bannedby"]][appeal]" + .["desc"] = "\nПричина: [Banlist["reason"]]\nСрок: [GetExp(Banlist["minutes"])]\nВыдан: [Banlist["bannedby"]][appeal]" else Banlist.cd = "/base/[ckey][id]" - .["desc"] = "\nReason: [Banlist["reason"]]\nExpires: PERMENANT\nBy: [Banlist["bannedby"]][appeal]" + .["desc"] = "\nПричина: [Banlist["reason"]]\nСрок: ПЕРМА\nВыдан: [Banlist["bannedby"]][appeal]" .["reason"] = "ckey/id" return . else @@ -46,9 +46,9 @@ var/savefile/Banlist ClearTempbans() return 0 else - .["desc"] = "\nReason: [Banlist["reason"]]\nExpires: [GetExp(Banlist["minutes"])]\nBy: [Banlist["bannedby"]][appeal]" + .["desc"] = "\nПричина: [Banlist["reason"]]\nСрок: [GetExp(Banlist["minutes"])]\nBy: [Banlist["bannedby"]][appeal]" else - .["desc"] = "\nReason: [Banlist["reason"]]\nExpires: PERMENANT\nBy: [Banlist["bannedby"]][appeal]" + .["desc"] = "\nПричина: [Banlist["reason"]]\nСрок: ПЕРМА\nВыдан: [Banlist["bannedby"]][appeal]" .["reason"] = matches return . return 0 @@ -62,10 +62,10 @@ var/savefile/Banlist Banlist = new("data/banlist.bdb") log_admin("Loading Banlist") - if (!length(Banlist.dir)) log_admin("Banlist is empty.") + if (!length(Banlist.dir)) log_admin("Банлист пуст. Ой.") if (!Banlist.dir.Find("base")) - log_admin("Banlist missing base dir.") + log_admin("Банлист не имеет базовой директории.") Banlist.dir.Add("base") Banlist.cd = "/base" else if (Banlist.dir.Find("base")) @@ -82,8 +82,8 @@ var/savefile/Banlist Banlist.cd = "/base/[A]" if (!Banlist["key"] || !Banlist["id"]) RemoveBan(A) - log_admin("Invalid Ban.") - message_admins("Invalid Ban.") + log_admin("Некорректный бан.") + message_admins("Некорректный бан.") continue if (!Banlist["temp"]) continue @@ -137,12 +137,12 @@ var/savefile/Banlist if (!Banlist.dir.Remove(foldername)) return 0 if(!usr) - log_admin("Ban Expired: [key]") - message_admins("Ban Expired: [key]") + log_admin("Срок бана истек: [key]") + message_admins("Срок бана истек: [key]") else - ban_unban_log_save("[key_name_admin(usr)] unbanned [key]") - log_admin("[key_name_admin(usr)] unbanned [key]") - message_admins("[key_name_admin(usr)] unbanned: [key]") + ban_unban_log_save("[key_name_admin(usr)] разбанил [key]") + log_admin("[key_name_admin(usr)] разбанил [key]") + message_admins("[key_name_admin(usr)] разбанил: [key]") for (var/A in Banlist.dir) Banlist.cd = "/base/[A]" if (key == Banlist["key"] /*|| id == Banlist["id"]*/) @@ -160,11 +160,11 @@ var/savefile/Banlist else var/timeleftstring if (exp >= 1440) //1440 = 1 day in minutes - timeleftstring = "[round(exp / 1440, 0.1)] Days" + timeleftstring = "[round(exp / 1440, 0.1)] Дней" else if (exp >= 60) //60 = 1 hour in minutes - timeleftstring = "[round(exp / 60, 0.1)] Hours" + timeleftstring = "[round(exp / 60, 0.1)] Часов" else - timeleftstring = "[exp] Minutes" + timeleftstring = "[exp] Минут" return timeleftstring /datum/admins/proc/unbanpanel() @@ -182,12 +182,12 @@ var/savefile/Banlist expiry = "Permaban" var/unban_link = "(U)" - dat += "[unban_link] Key: [ban.ckey]ComputerID: [ban.last_known_cid]IP: [ban.last_known_ip] [expiry](By: [ban.admin])(Reason: [ban.reason])" + dat += "[unban_link] Ключ: [ban.ckey]ComputerID: [ban.last_known_cid]IP: [ban.last_known_ip] [expiry](By: [ban.admin])(Причина: [ban.reason])" dat += "" - var/dat_header = "
Bans: (U) = Unban" - dat_header += " - Ban Listing
[dat]" - show_browser(usr, dat_header, "Unban Panel", "unbanp", "size=875x400") + var/dat_header = "
Баны:(U) = Разбанить" + dat_header += " - Список банов
[dat]" + show_browser(usr, dat_header, "Панель Разбанов", "unbanp", "size=875x400") //////////////////////////////////// DEBUG //////////////////////////////////// @@ -237,17 +237,17 @@ var/savefile/Banlist return //mods+ cannot be banned. Even if they could, the ban doesn't affect them anyway if(!M.ckey) - to_chat(usr, SPAN_DANGER("Warning: Mob ckey for [M.name] not found.")) + to_chat(usr, SPAN_DANGER("Внимание: Сикей для моба [M.name] не найден.")) return var/mob_key = M.ckey - var/mins = tgui_input_number(usr,"How long (in minutes)? \n 180 = 3 hours \n 1440 = 1 day \n 4320 = 3 days \n 10080 = 7 days \n 43800 = 1 Month","Ban time", 1440, 262800, 1) + var/mins = tgui_input_number(usr,"На сколько (в минутах)? \n 180 = 3 часа \n 1440 = 1 день \n 4320 = 3 дня \n 10080 = Неделя \n 43800 = Месяц","Срок бана", 1440, 262800, 1) if(!mins) return if(mins >= 525600) mins = 525599 - var/reason = input(usr,"Reason? \n\nPress 'OK' to finalize the ban.","reason","Griefer") as message|null + var/reason = input(usr,"Причина? \n\nНажмите 'ОК' чтобы закончить.","причина","Гриферок") as message|null if(!reason) return var/datum/entity/player/P = get_player_from_key(mob_key) // you may not be logged in, but I will find you and I will ban you - if(P.is_time_banned && alert(usr, "Ban already exists. Proceed?", "Confirmation", "Yes", "No") != "Yes") + if(P.is_time_banned && alert(usr, "Бан уже существует. Продолжим?", "Подтверждение", "Да", "Нет") != "Да") return P.add_timed_ban(reason, mins) diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 5042167023e6..181b37b1ac53 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -2,7 +2,7 @@ /proc/message_admins(msg, jmp_x=0, jmp_y=0, jmp_z=0) // +MOD and above, not mentors log_admin(msg) - msg = "ADMIN LOG:[msg]" + msg = "АДМИН ЛОГ: [msg]" if(jmp_x && jmp_y && jmp_z) msg += " (JMP)" msg += "" @@ -15,7 +15,7 @@ if(GLOB.perf_flags & PERF_TOGGLE_ATTACKLOGS) return log_attack(text) - var/rendered = SPAN_COMBAT("ATTACK: [text] (JMP)") + var/rendered = SPAN_COMBAT("АТАКА: [text] (JMP)") for(var/client/C as anything in GLOB.admins) if(C && C.admin_holder && (R_MOD & C.admin_holder.rights)) if(C.prefs.toggles_chat & CHAT_ATTACKLOGS) @@ -24,14 +24,14 @@ /proc/msg_admin_niche(msg) //Toggleable Niche Messages log_admin(msg) - msg = SPAN_ADMIN("ADMIN NICHE LOG: [msg]") + msg = SPAN_ADMIN("ЛОГ АДМИНСКОЙ НИШИ: [msg]") for(var/client/C as anything in GLOB.admins) if(C && C.admin_holder && (R_MOD & C.admin_holder.rights)) if(C.prefs.toggles_chat & CHAT_NICHELOGS) to_chat(C, msg) /proc/msg_sea(msg, nosound = FALSE) //Only used for newplayer ticker message, hence no logging - msg = FONT_SIZE_LARGE("MENTOR ALERT: [msg]") + msg = FONT_SIZE_LARGE("ТРЕВОГА ДЛЯ МЕНТОРОВ: [msg]") for(var/mob/possible_sea as anything in GLOB.player_list) if(!isSEA(possible_sea)) continue @@ -44,9 +44,9 @@ /proc/msg_admin_ff(text, alive = TRUE) var/rendered if(alive) - rendered = SPAN_COMBAT("ATTACK: [text]") //I used because I never learned html correctly, fix this if you want + rendered = SPAN_COMBAT("АТАКА: [text]") //I used because I never learned html correctly, fix this if you want else - rendered = SPAN_COMBAT("ATTACK: [text]") + rendered = SPAN_COMBAT("АТАКА: [text]") text = "///DEAD/// - " + text log_attack(text) //Do everything normally BUT IN GREEN SO THEY KNOW for(var/client/C as anything in GLOB.admins) @@ -76,7 +76,7 @@ if (!istype(src,/datum/admins)) src = usr.client.admin_holder if (!istype(src,/datum/admins) || !(src.rights & R_MOD)) - to_chat(usr, "Error: you are not an admin!") + to_chat(usr, "Ошибочка - вы не админ!") return var/dat = "" @@ -84,12 +84,12 @@ var/list/datum/view_record/note_view/NL = DB_VIEW(/datum/view_record/note_view, DB_COMP("player_ckey", DB_EQUALS, key)) for(var/datum/view_record/note_view/N in NL) var/admin_ckey = N.admin_ckey - var/confidential_text = N.is_confidential ? " \[CONFIDENTIALLY\]" : "" + var/confidential_text = N.is_confidential ? " \[КОНФИДЕНЦИАЛЬНО\]" : "" var/color = "#008800" if(N.is_ban) - var/time_d = N.ban_time ? "Banned for [N.ban_time] minutes | " : "" + var/time_d = N.ban_time ? "Забанен на [N.ban_time] минут | " : "" color = "#880000" //Removed confidential check because we can't make confidential bans - dat += "[time_d][N.text] by [admin_ckey] ([N.admin_rank])[confidential_text] on [N.date] [NOTE_ROUND_ID(N)] " + dat += "[time_d][N.text] [admin_ckey] ([N.admin_rank])[confidential_text] on [N.date] [NOTE_ROUND_ID(N)] " else if(N.is_confidential) color = "#AA0055" @@ -104,12 +104,12 @@ dat += "[N.text] by [admin_ckey] ([N.admin_rank])[confidential_text] on [N.date] [NOTE_ROUND_ID(N)] " if(admin_ckey == usr.ckey || admin_ckey == "Adminbot" || check_for_rights(R_PERMISSIONS)) - dat += "Remove" + dat += "Удалить" dat += "

" dat += "" - show_browser(usr, dat, "Info on [key]", "allplayerinfo", "size=480x480") + show_browser(usr, dat, "Информаци о [key]", "allplayerinfo", "size=480x480") /datum/admins/proc/Jobbans() @@ -127,9 +127,9 @@ i = jobban_keylist[r][c] //These are already strings, as you're iterating through them. Anyway, establish jobban. t = "[c] - [r] ## [i]" u = "[c] - [r]" - dat += "" + dat += "" dat += "
[t] (unban)
[t] (разбанить)
" - show_browser(usr, dat, "Job Bans", "ban", "size=400x400") + show_browser(usr, dat, "Джоб баны", "бан", "size=400x400") /datum/admins/proc/Game() @@ -202,7 +202,7 @@ else new chosen(usr.loc) - log_admin("[key_name(usr)] spawned [chosen] at ([usr.x],[usr.y],[usr.z])") + log_admin("[key_name(usr)] спаунит [chosen] по координатам ([usr.x],[usr.y],[usr.z])") /client/proc/update_mob_sprite(mob/living/carbon/human/H as mob) @@ -211,7 +211,7 @@ set desc = "Should fix any mob sprite update errors." if (!admin_holder || !(admin_holder.rights & R_MOD)) - to_chat(src, "Only administrators may use this command.") + to_chat(src, "Ай яй яй, эта команда только для администраторов.") return if(istype(H)) @@ -241,7 +241,7 @@ if(SSticker) var/success = SSticker.send_tip_of_the_round() if(!success) - to_chat(usr, SPAN_ADMINNOTICE("Sending tip failed!")) + to_chat(usr, SPAN_ADMINNOTICE("Подсказочка не отправилась!")) /// Allow admin to add or remove traits of datum /datum/admins/proc/modify_traits(datum/D) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 7d9127313094..051623f67e3f 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -391,7 +391,7 @@ var/list/roundstart_mod_verbs = list( set category = "OOC.OOC" set name = "OOC Text Color - Self" if(!admin_holder && !donator) return - var/new_ooccolor = input(src, "Please select your OOC color.", "OOC color") as color|null + var/new_ooccolor = input(src, "Настало время выбрать цвет.", "Цвет OOC") as color|null if(new_ooccolor) prefs.ooccolor = new_ooccolor prefs.save_preferences() @@ -406,30 +406,30 @@ var/list/roundstart_mod_verbs = list( if(!warned_ckey || !istext(warned_ckey)) return if(warned_ckey in admin_datums) - to_chat(usr, "Error: warn(): You can't warn admins.") + to_chat(usr, "Ошибочка: warn(): Зачем варнить админов?") return var/datum/entity/player/P = get_player_from_key(warned_ckey) // you may not be logged in, but I will find you and I will ban you if(!P) - to_chat(src, "Error: warn(): No such ckey found.") + to_chat(src, "Ошибочка: warn(): Такого сикея нет.") return if(++P.warning_count >= MAX_WARNS) //uh ohhhh...you'reee iiiiin trouuuubble O:) - ban_unban_log_save("[ckey] warned [warned_ckey], resulting in a [AUTOBANTIME] minute autoban.") + ban_unban_log_save("[ckey] варнит [warned_ckey], что влечет за собой [AUTOBANTIME] минутный автобан.") if(P.owning_client) - message_admins("[key_name_admin(src)] has warned [ckey] resulting in a [AUTOBANTIME] minute ban.") + message_admins("[key_name_admin(src)] варнит [ckey], что влечет за собой [AUTOBANTIME] минутный бан.") to_chat_forced(P.owning_client, "You have been autobanned due to a warning by [key_name_admin(P.owning_client)].
This is a temporary ban, it will be removed in [AUTOBANTIME] minutes.") else - message_admins("[key_name_admin(src)] has warned [warned_ckey] resulting in a [AUTOBANTIME] minute ban.") + message_admins("[key_name_admin(src)] варнит [warned_ckey], что влечет за собой [AUTOBANTIME] минутный бан.") P.add_timed_ban("Autobanning due to too many formal warnings", AUTOBANTIME) else if(P.owning_client) to_chat(P.owning_client, "You have been formally warned by an administrator.
Further warnings will result in an autoban.") - message_admins("[key_name_admin(src)] has warned [key_name_admin(P.owning_client)]. They have [MAX_WARNS-P.warning_count] strikes remaining.") + message_admins("[key_name_admin(src)] предупреждает [key_name_admin(P.owning_client)]. У них осталось [MAX_WARNS-P.warning_count] страйков.") else - message_admins("[key_name_admin(src)] has warned [warned_ckey] (DC). They have [MAX_WARNS-P.warning_count] strikes remaining.") + message_admins("[key_name_admin(src)] предувпреждает [warned_ckey] (DC). У них осталось [MAX_WARNS-P.warning_count] страйков.") /client/proc/give_disease(mob/T as mob in GLOB.mob_list) // -- Giacom set category = "Admin.Fun" @@ -438,12 +438,12 @@ var/list/roundstart_mod_verbs = list( var/list/disease_names = list() for(var/v in diseases) disease_names.Add(copytext("[v]", 16, 0)) - var/datum/disease/D = tgui_input_list(usr, "Choose the disease to give to that guy", "ACHOO", disease_names) + var/datum/disease/D = tgui_input_list(usr, "Чем заразим паренька?", "Хихи", disease_names) if(!D) return var/path = text2path("/datum/disease/[D]") T.contract_disease(new path, 1) - message_admins("[key_name_admin(usr)] gave [key_name(T)] the disease [D].") + message_admins("[key_name_admin(usr)] заражает [key_name(T)] болезнью [D].") /client/proc/object_talk(msg as text) // -- TLE @@ -454,7 +454,7 @@ var/list/roundstart_mod_verbs = list( if(!msg) return for (var/mob/V in hearers(mob.control_object)) - V.show_message("[mob.control_object.name] says: \"" + msg + "\"", SHOW_MESSAGE_AUDIBLE) + V.show_message("[mob.control_object.name] говорит: \"" + msg + "\"", SHOW_MESSAGE_AUDIBLE) /client/proc/toggle_log_hrefs() diff --git a/code/modules/admin/autoreply.dm b/code/modules/admin/autoreply.dm index a90e21b7f311..8d8632c9e7e5 100644 --- a/code/modules/admin/autoreply.dm +++ b/code/modules/admin/autoreply.dm @@ -9,6 +9,10 @@ GLOBAL_REFERENCE_LIST_INDEXED(adminreplies, /datum/autoreply/admin, title) var/closer = TRUE /// Admin Replies +/datum/autoreply/admin/regurgitate + title = "Проглатывание За Ксеноморфа" + message = "Проглатывание живых существ способствует их быстрой транспортировке к яйцам. Для того, чтобы проглотить жертву, схватите ее (CTRL+Click) и затем нажмите на себя. Для того, чтобы срыгнуть жертву, нажмите кнопку 'Regurgitate' на интерфейсе слева вверху. Держать людей в себе можно в течении минуты, после которой вы их срыгнете, а жертве расплавит случайную конечность." + /datum/autoreply/admin/handled title = "Being Handled" message = "Staff are aware of this issue and it is being handled" diff --git a/code/modules/admin/banjob.dm b/code/modules/admin/banjob.dm index 18f06e79a66a..0720dca268b8 100644 --- a/code/modules/admin/banjob.dm +++ b/code/modules/admin/banjob.dm @@ -23,39 +23,39 @@ var/jobban_keylist[0] //to store the keys & ranks /proc/jobban_client_fullban(ckey, rank) if (!ckey || !rank) return rank = check_jobban_path(rank) - jobban_keylist[rank][ckey] = "Reason Unspecified" + jobban_keylist[rank][ckey] = "Причина не указана" //returns a reason if M is banned from rank, returns 0 otherwise /proc/jobban_isbanned(mob/M, rank, datum/entity/player/P = null) if(!rank) - return "Non-existant job" + return "Несуществующая профессия" rank = ckey(rank) if(P) // asking for a friend if(!P.jobbans_loaded) - return "Not yet loaded" + return "Еще не загрузились" var/datum/entity/player_job_ban/PJB = P.job_bans[rank] return PJB ? PJB.text : null if(M) if(!M.client || !M.client.player_data || !M.client.player_data.jobbans_loaded) - return "Not yet loaded" + return "Еще не загрузились" if(guest_jobbans(rank)) if(CONFIG_GET(flag/guest_jobban) && IsGuestKey(M.key)) - return "Guest Job-ban" + return "Гостевой джоб-банчик" if(CONFIG_GET(flag/usewhitelist) && !check_whitelist(M)) - return "Whitelisted Job" + return "Профессия по вайтлисту" var/datum/entity/player_job_ban/PJB = M.client.player_data.job_bans[rank] return PJB ? PJB.text : null /proc/jobban_loadbanfile() var/savefile/S=new("data/job_new.ban") S["new_bans"] >> jobban_keylist - log_admin("Loading jobban_rank") + log_admin("Загружаю jobban_rank") S["runonce"] >> jobban_runonce if (!length(jobban_keylist)) jobban_keylist=list() - log_admin("jobban_keylist was empty") + log_admin("jobban_keylist был пуст") /proc/jobban_savebanfile() var/savefile/S=new("data/job_new.ban") @@ -87,7 +87,7 @@ var/jobban_keylist[0] //to store the keys & ranks return if(!M.ckey) //sanity - to_chat(usr, "This mob has no ckey") + to_chat(usr, "У моба нет сикея") return if(!RoleAuthority) to_chat(usr, "The Role Authority is not set up!") diff --git a/code/modules/admin/callproc.dm b/code/modules/admin/callproc.dm index 1af1f5aa9fa3..93d719275bca 100644 --- a/code/modules/admin/callproc.dm +++ b/code/modules/admin/callproc.dm @@ -18,7 +18,7 @@ GLOBAL_PROTECT(LastAdminCalledProc) /// So usr is set to this for any proccalls that don't have any usr mob/client to refer to. /mob/proccall_handler name = "ProcCall Handler" - desc = "If you are seeing this, tell a coder." + desc = "Если вы это видите - напишите кодеру." var/list/callers = list() @@ -57,7 +57,7 @@ GLOBAL_PROTECT(LastAdminCalledProc) if(GLOB.AdminProcCallHandler != src) return ..() if(!force) - stack_trace("Attempted deletion on [type] - [name], aborting.") + stack_trace("попытался удалить [type] - [name], отмена.") return QDEL_HINT_LETMELIVE return ..() diff --git a/code/modules/admin/fax_templates.dm b/code/modules/admin/fax_templates.dm index 91b23abb2422..834883277111 100644 --- a/code/modules/admin/fax_templates.dm +++ b/code/modules/admin/fax_templates.dm @@ -63,7 +63,7 @@ if(show_wy_logo) dat += "" dat += "
" diff --git a/code/modules/admin/holder2.dm b/code/modules/admin/holder2.dm index e7559f3aa4fd..1b86a6781580 100644 --- a/code/modules/admin/holder2.dm +++ b/code/modules/admin/holder2.dm @@ -87,13 +87,13 @@ you will have to do something like if(client.admin_holder.rights & R_ADMIN) your return TRUE else if(show_msg && C.prefs.show_permission_errors) - to_chat(C, SPAN_DANGER("Error: You do not have sufficient rights to do that. You require one of the following flags:[rights2text(rights_required,"")].")) + to_chat(C, SPAN_DANGER("Ошибочка: У вас недостаточно прав. Требуемые флажки:[rights2text(rights_required,"")].")) else if(C.admin_holder) return TRUE else if(show_msg && C.prefs.show_permission_errors) - to_chat(C, SPAN_DANGER("Error: You are not an admin.")) + to_chat(C, SPAN_DANGER("Ошибочка: Ты не админ, дружище.")) return FALSE /proc/check_rights(rights_required, show_msg=TRUE) @@ -108,12 +108,12 @@ you will have to do something like if(client.admin_holder.rights & R_ADMIN) your if(check_client_rights(usr.client, rights_required, show_msg)) return TRUE else if(show_msg) - to_chat(usr, SPAN_WARNING("You do not have sufficient rights to do that. You require one of the following flags:[rights2text(rights_required," ")].")) + to_chat(usr, SPAN_WARNING("У вас недостаточно прав для такого. Требуемые флажки:[rights2text(rights_required," ")].")) else if(other.admin_holder) return TRUE else if(show_msg) - to_chat(usr, SPAN_WARNING("You are not a holder.")) + to_chat(usr, SPAN_WARNING("Вы не владелец.")) return FALSE //probably a bit iffy - will hopefully figure out a better solution @@ -125,7 +125,7 @@ you will have to do something like if(client.admin_holder.rights & R_ADMIN) your if(usr.client.admin_holder.rights != other.admin_holder.rights) if( (usr.client.admin_holder.rights & other.admin_holder.rights) == other.admin_holder.rights ) return 1 //we have all the rights they have and more - to_chat(usr, "Error: Cannot proceed. They have more or equal rights to us.") + to_chat(usr, "Ошибочка: Никак не продолжить. У них больше или равные права.") return 0 /client/proc/deadmin() @@ -177,7 +177,7 @@ you will have to do something like if(client.admin_holder.rights & R_ADMIN) your if(!forceGlobal && usr) var/client/C = usr.client if(!C) - CRASH("No client for HrefToken()!") + CRASH("Нет клиента для HrefToken()!") var/datum/admins/holder = C.admin_holder if(holder) tok = holder.href_token diff --git a/code/modules/admin/player_notes.dm b/code/modules/admin/player_notes.dm index d8caa58f1e97..0ea6f3ff3ac6 100644 --- a/code/modules/admin/player_notes.dm +++ b/code/modules/admin/player_notes.dm @@ -29,7 +29,7 @@ if(usr.client && usr.client.admin_holder && (usr.client.admin_holder.rights & R_MOD)) P.rank = usr.client.admin_holder.rank else - to_chat(usr, "NA01: Something went wrong, tell a coder.") + to_chat(usr, "NA01: Что-то не так, зовите кодера.") return else P.author = "Adminbot" @@ -40,7 +40,7 @@ infos += P info << infos - message_admins("[key_name_admin(usr)] has edited [key]'s notes: [sanitize(note)]") + message_admins("[key_name_admin(usr)] поменял заметки [key]: [sanitize(note)]") qdel(info) //Updating list of keys with notes on them @@ -63,7 +63,7 @@ infos.Remove(item) info << infos - message_admins("[key_name_admin(usr)] deleted one of [key]'s notes.") + message_admins("[key_name_admin(usr)] удалил одну из заметок [key].") qdel(info) @@ -73,7 +73,7 @@ var/list/infos info >> infos if(!infos) - dat = "No information found on the given key." + dat = "Нет информации для этого сикея." else for(var/datum/player_info/I in infos) dat += "[I.content]%0D%0Aby [I.author] ([I.rank]) on [I.timestamp]%0D%0A%0D%0A" diff --git a/code/modules/admin/player_panel/actions/physical.dm b/code/modules/admin/player_panel/actions/physical.dm index a48f39e81a5e..404f3cddc03a 100644 --- a/code/modules/admin/player_panel/actions/physical.dm +++ b/code/modules/admin/player_panel/actions/physical.dm @@ -89,6 +89,8 @@ set_name = "Scout Set" if(SKILL_SPEC_SNIPER) set_name = "Sniper Set" + if(SKILL_SPEC_ST) + set_name = "Stormtrooper Set" if(set_name && !available_specialist_sets.Find(set_name)) available_specialist_sets += set_name diff --git a/code/modules/admin/server_verbs.dm b/code/modules/admin/server_verbs.dm index 47a60c043741..96ac775327ca 100644 --- a/code/modules/admin/server_verbs.dm +++ b/code/modules/admin/server_verbs.dm @@ -27,17 +27,17 @@ maprotatechoices[mapname] = VM - var/chosenmap = tgui_input_list(usr, "Choose a ground map to change to", "Change Ground Map", maprotatechoices) + var/chosenmap = tgui_input_list(usr, "Выберите карту", "Смена карты", maprotatechoices) if(!chosenmap) return var/datum/map_config/VM = maprotatechoices[chosenmap] if(!SSmapping.changemap(VM, GROUND_MAP)) - to_chat(usr, SPAN_WARNING("Failed to change the ground map.")) + to_chat(usr, SPAN_WARNING("Не удалось поменять карту.")) return - log_admin("[key_name(usr)] changed the map to [VM.map_name].") - message_admins("[key_name_admin(usr)] changed the map to [VM.map_name].") + log_admin("[key_name(usr)] меняет карту на [VM.map_name].") + message_admins("[key_name_admin(usr)] меняет карту на [VM.map_name].") /datum/admins/proc/vote_ground_map() set category = "Server" @@ -47,8 +47,8 @@ return SSvote.initiate_vote("groundmap", usr.ckey) - log_admin("[key_name(usr)] started a groundmap vote.") - message_admins("[key_name_admin(usr)] started a groundmap vote.") + log_admin("[key_name(usr)] начал голосование за карту.") + message_admins("[key_name_admin(usr)] начал голосование за карту.") /datum/admins/proc/override_ground_map() set category = "Server" @@ -57,15 +57,15 @@ if(!check_rights(R_SERVER)) return - var/map_type = tgui_alert(usr, "Override Ship or Ground Map?", "Map selection", list(GROUND_MAP, SHIP_MAP, "Cancel")) - if(map_type == "Cancel") + var/map_type = tgui_alert(usr, "Сменить карту корабля или планеты?", "Выбор карты", list(GROUND_MAP, SHIP_MAP, "ОТМЕНИТЬ")) + if(map_type == "ОТМЕНИТЬ") return - var/map = input(usr, "Choose a custom map to run for next round","Upload Map") as null|file + var/map = input(usr, "Выберите кастомную карту для следующего раунда","Загрузить карту") as null|file if(!map) return if(copytext("[map]", -4) != ".dmm")//4 == length(".dmm") - to_chat(usr, SPAN_WARNING("Filename must end in '.dmm': [map]"), confidential = TRUE) + to_chat(usr, SPAN_WARNING("Имя файлы должно заканчиваться на '.dmm': [map]"), confidential = TRUE) return message_admins(SPAN_ADMINNOTICE("[key_name_admin(usr)] is overriding the next '[map_type]' map with a custom one.")) diff --git a/code/modules/admin/stickyban.dm b/code/modules/admin/stickyban.dm index 69793a599596..eca059f7606f 100644 --- a/code/modules/admin/stickyban.dm +++ b/code/modules/admin/stickyban.dm @@ -8,7 +8,7 @@ var/datum/entity/player/P = get_player_from_key(ckey) if(!P) - message_admins("Tried stickybanning ckey \"[ckey]\", player entity was unable to be found. Please try again later.") + message_admins("Попробовал застикибанить сикей \"[ckey]\", player entity не найдено. Попробуйте позже.") return var/datum/entity/player_sticky_ban/PSB = DB_ENTITY(/datum/entity/player_sticky_ban) @@ -29,9 +29,9 @@ if(banning_admin) PSB.admin_id = banning_admin.id if(banning_admin.owning_client) - message_admins("[banning_admin.owning_client.ckey] has stickybanned [ckey].") + message_admins("[banning_admin.owning_client.ckey] застикибанил [ckey].") - message_admins("[ckey] (IP: [address], CID: [cid]) has been stickybanned for: \"[reason]\".") + message_admins("[ckey] (IP: [address], CID: [cid]) бы застикибанен за: \"[reason]\".") if(P.owning_client) to_chat_forced(P.owning_client, SPAN_WARNING("You have been sticky banned by [banning_admin? banning_admin.ckey : "Host"].\nReason: [sanitize(reason)].")) @@ -43,7 +43,7 @@ /datum/entity/player/proc/process_stickyban(address, computer_id, source_id, reason, datum/entity/player/banning_admin, list/PSB) if(length(PSB) > 0) // sticky ban with identical data already exists, no need for another copy if(banning_admin) - to_chat(banning_admin, SPAN_WARNING("Failed to add stickyban to [ckey]. Reason: Stickyban already exists.")) + to_chat(banning_admin, SPAN_WARNING("Не получилось дать стикибан [ckey]. Причина: стикибан уже выдан.")) return stickyban_internal(ckey, address, computer_id, reason, source_id, banning_admin) diff --git a/code/modules/admin/tabs/server_tab.dm b/code/modules/admin/tabs/server_tab.dm index 6e5ded23206a..86176674dce7 100644 --- a/code/modules/admin/tabs/server_tab.dm +++ b/code/modules/admin/tabs/server_tab.dm @@ -14,7 +14,7 @@ if(confirm == "Cancel") return if(confirm == "Yes") - to_world(SPAN_DANGER("Restarting world! [SPAN_NOTICE("Initiated by [usr.client.admin_holder.fakekey ? "Admin" : usr.key]!")]")) + to_world(SPAN_DANGER("ПАМ-ПАРАМ! [SPAN_NOTICE("[usr.client.admin_holder.fakekey ? "Admin" : usr.key]!")]")) log_admin("[key_name(usr)] initiated a reboot.") sleep(50) diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index 758fd2327e77..b9ee8cba3a30 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -697,7 +697,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) defer_to_mentors() /datum/admin_help/proc/player_ticket_panel() - var/list/dat = list("Player Ticket") + var/list/dat = list("Player Ticket") dat += "State: " switch(state) if(AHELP_ACTIVE) diff --git a/code/modules/admin/verbs/deadsay.dm b/code/modules/admin/verbs/deadsay.dm index 700d42808a07..31bf3036a06b 100644 --- a/code/modules/admin/verbs/deadsay.dm +++ b/code/modules/admin/verbs/deadsay.dm @@ -23,12 +23,12 @@ stafftype = "[admin_holder.rank]" msg = strip_html(msg) - log_admin("DEAD: [key_name(src)] : [msg]") + log_admin("МЕРТВЕЦ: [key_name(src)] : [msg]") if (!msg) return - var/rendered = "DEAD: [stafftype]([src.key]) says, \"[msg]\"" + var/rendered = "МЕРТВЕЦ: [stafftype]([src.key]) рассказывает, \"[msg]\"" for (var/mob/M in GLOB.player_list) if (istype(M, /mob/new_player)) diff --git a/code/modules/admin/verbs/mob_verbs.dm b/code/modules/admin/verbs/mob_verbs.dm index 4809d9b2e6ee..bc43f917bf73 100644 --- a/code/modules/admin/verbs/mob_verbs.dm +++ b/code/modules/admin/verbs/mob_verbs.dm @@ -225,7 +225,7 @@ switch(type) if(NARRATION_METHOD_SAY) selected.langchat_speech(message, heard, GLOB.all_languages, skip_language_check = TRUE) - selected.visible_message("[selected] says, \"[message]\"") + selected.visible_message("[selected] говорит, \"[message]\"") if(NARRATION_METHOD_ME) selected.langchat_speech(message, heard, GLOB.all_languages, skip_language_check = TRUE, animation_style = LANGCHAT_FAST_POP, additional_styles = list("langchat_small", "emote")) selected.visible_message("[selected] [message]") diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index de50af8dd808..e1087213fd57 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -646,7 +646,7 @@ var/const/MAX_SAVE_SLOTS = 10 //splitJobs - Allows you split the table by job. You can make different tables for each department by including their heads. Defaults to CE to make it look nice. //width - Screen' width. Defaults to 550 to make it look nice. //height - Screen's height. Defaults to 500 to make it look nice. -/datum/preferences/proc/SetChoices(mob/user, limit = 19, list/splitJobs = list(JOB_CHIEF_REQUISITION), width = 950, height = 700) +/datum/preferences/proc/SetChoices(mob/user, limit = 21, list/splitJobs = list(JOB_CHIEF_REQUISITION), width = 950, height = 700) if(!RoleAuthority) return diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index d5698fd4be32..240e4be8e637 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -831,6 +831,17 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( specialty = "M35 pyrotechnician" flags_item = MOB_LOCK_ON_EQUIP|NO_CRYO_STORE +/obj/item/clothing/head/helmet/marine/M40 + name = "\improper M40 helmet" + icon_state = "st_helmet" + desc = "A helmet designed for USCM storm trooper. Contains heavy insulation, covered in nomex weave." + armor_melee = CLOTHING_ARMOR_HIGH + min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROT + max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROT + specialty = "M40 stormtrooper" + flags_item = MOB_LOCK_ON_EQUIP|NO_CRYO_STORE + unacidable = TRUE + /obj/item/clothing/head/helmet/marine/M3T name = "\improper M3-T bombardier helmet" icon_state = "sadar_helmet" diff --git a/code/modules/clothing/suits/marine_armor.dm b/code/modules/clothing/suits/marine_armor.dm index e2a0ce4ccf07..e33fba12e8f7 100644 --- a/code/modules/clothing/suits/marine_armor.dm +++ b/code/modules/clothing/suits/marine_armor.dm @@ -666,6 +666,19 @@ flags_item = MOB_LOCK_ON_EQUIP|NO_CRYO_STORE unacidable = TRUE +/obj/item/clothing/suit/storage/marine/M40 + name = "\improper M40 armor" + desc = "A custom set of M40 armor designed for use by USCM stormtrooper. Contains thick kevlar shielding." + icon_state = "st_armor" + armor_melee = CLOTHING_ARMOR_HIGH + max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROT + flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS|BODY_FLAG_FEET + flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS|BODY_FLAG_FEET + flags_heat_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS|BODY_FLAG_FEET + flags_item = MOB_LOCK_ON_EQUIP|NO_CRYO_STORE + specialty = "M40 stormtrooper" + unacidable = TRUE + #define FIRE_SHIELD_CD 150 /obj/item/clothing/suit/storage/marine/M35 diff --git a/code/modules/cm_marines/Donator_Items.dm b/code/modules/cm_marines/Donator_Items.dm index 1c7281114c01..0ac6acc4396f 100644 --- a/code/modules/cm_marines/Donator_Items.dm +++ b/code/modules/cm_marines/Donator_Items.dm @@ -1401,6 +1401,21 @@ chem_volume = 30 flags_inventory = COVERMOUTH|ALLOWREBREATH +/obj/item/weapon/donatorkatana + name = "Kou" + desc = "A piece of steel with a hand-engraved name and a fine signature of the craftsman underneath. Kou was custom made as an object of encouragement with a practical application. || DONATOR ITEM" + icon_state = "donatorkatana" + flags_atom = FPRINT|CONDUCT + force = MELEE_FORCE_VERY_STRONG + throwforce = MELEE_FORCE_WEAK + sharp = IS_SHARP_ITEM_BIG + edge = 1 + w_class = SIZE_MEDIUM + flags_equip_slot = SLOT_BACK + hitsound = 'sound/weapons/bladeslice.ogg' + attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") + attack_speed = 9 + //GHOST CIGAR CODE /obj/item/clothing/mask/cigarette/cigar/fluff/ghostdex/attackby(obj/item/W as obj, mob/user as mob) diff --git a/code/modules/cm_marines/Donator_Kits.dm b/code/modules/cm_marines/Donator_Kits.dm index 6c8347f3280e..d435ece0d628 100644 --- a/code/modules/cm_marines/Donator_Kits.dm +++ b/code/modules/cm_marines/Donator_Kits.dm @@ -46,543 +46,7 @@ ) //Unless specified in comments as otherwise, subtype of box/donator_kit/ is CKEY of the donator (example: /obj/item/storage/box/donator_kit/sasoperative) -/obj/item/storage/box/donator_kit/adjective - donor_key = "adjective" - donor_gear = list(/obj/item/clothing/suit/storage/marine/fluff/adjective) +/obj/item/storage/box/donator_kit/xdinka + donor_key = "xdinka" + donor_gear = list(/obj/item/weapon/donatorkatana) -/obj/item/storage/box/donator_kit/alexwarhammer - donor_key = "alexwarhammer" - donor_gear = list(/obj/item/clothing/glasses/fluff/alexwarhammer) - -/obj/item/storage/box/donator_kit/allan1234 - donor_key = "allan1234" - donor_gear = list(/obj/item/clothing/under/marine/fluff/allan1234) - -/obj/item/storage/box/donator_kit/arachnidnexus - donor_key = "arachnidnexus" - donor_gear = list(/obj/item/clothing/under/marine/fluff/arach) - -/obj/item/storage/box/donator_kit/bibblesless - donor_key = "bibblesless" - donor_gear = list(/obj/item/clothing/head/helmet/marine/fluff/bibblesless) - -/obj/item/storage/box/donator_kit/biolock - donor_key = "biolock" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/biolock, - /obj/item/clothing/suit/storage/marine/light/fluff/biolock, - ) - -/obj/item/storage/box/donator_kit/bunny232 - donor_key = "bunny232" - donor_gear = list(/obj/item/clothing/glasses/fluff/eyepatch) - -/obj/item/storage/box/donator_kit/bwoincognito - donor_key = "bwoincognito" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/bwoincognito, - /obj/item/clothing/suit/storage/marine/fluff/bwoincognito, - /obj/item/clothing/under/marine/fluff/bwoincognito, - ) - -/obj/item/storage/box/donator_kit/chris1464 - donor_key = "chris1464" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/chris1464, - /obj/item/clothing/suit/storage/marine/fluff/chris1464, - /obj/item/clothing/under/marine/fluff/chris1464, - ) - -/obj/item/storage/box/donator_kit/commandercookies - donor_key = "commandercookies" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/commandercookies, - /obj/item/clothing/suit/storage/marine/fluff/commandercookies, - ) - -/obj/item/storage/box/donator_kit/commissar //used by both ckeys 'hycinth' and 'technokat' - donor_key = "hycinth" - kit_variant = "Commissar" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/commissar, - /obj/item/clothing/suit/storage/marine/fluff/commissar, - /obj/item/clothing/under/marine/fluff/commissar, - /obj/item/storage/belt/marine/fluff/commissar, - ) - -/obj/item/storage/box/donator_kit/commissar/technokat - donor_key = "technokat" - -/obj/item/storage/box/donator_kit/crazyh206 - donor_key = "crazyh206" - donor_gear = list(/obj/item/clothing/suit/storage/marine/fluff/crazyh206) - -/obj/item/storage/box/donator_kit/devilzhand - donor_key = "devilzhand" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/devilzhand, - /obj/item/clothing/suit/storage/marine/fluff/devilzhand, - ) - -/obj/item/storage/box/donator_kit/dingledangle - donor_key = "dingledangle" - donor_gear = list(/obj/item/clothing/head/helmet/marine/fluff/dingledangle) - -/obj/item/storage/box/donator_kit/dinobubba7 - donor_key = "dinobubba7" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/dino, - /obj/item/clothing/suit/storage/marine/fluff/dino, - ) - -/obj/item/storage/box/donator_kit/docdemo - donor_key = "docdemo" - donor_gear = list(/obj/item/clothing/head/helmet/marine/fluff/goldtrimberet) - -/obj/item/storage/box/donator_kit/dudewithatude - donor_key = "dudewithatude" - donor_gear = list(/obj/item/clothing/suit/storage/marine/fluff/dudewithatude) - -/obj/item/storage/box/donator_kit/eastgermanstasi - donor_key = "eastgermanstasi" - donor_gear = list(/obj/item/clothing/head/helmet/marine/fluff/eastgerman) - -/obj/item/storage/box/donator_kit/edgelord - donor_key = "edgelord" - donor_gear = list(/obj/item/clothing/head/helmet/marine/fluff/edgelord) - -/obj/item/storage/box/donator_kit/eonoc - donor_key = "eonoc" - donor_gear = list(/obj/item/clothing/suit/storage/marine/fluff/eonoc) - -/obj/item/storage/box/donator_kit/fairedan - donor_key = "fairedan" - donor_gear = list( - /obj/item/clothing/suit/storage/marine/fluff/fairedan, - /obj/item/clothing/under/marine/fluff/fairedan, - ) - -/obj/item/storage/box/donator_kit/feodrich - donor_key = "feodrich" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/feodrich, - /obj/item/clothing/shoes/marine/fluff/feodrich, - /obj/item/clothing/suit/storage/marine/fluff/feodrich, - /obj/item/clothing/under/marine/fluff/feodrich, - ) - -/obj/item/storage/box/donator_kit/fernkiller - donor_key = "fernkiller" - donor_gear = list(/obj/item/clothing/head/helmet/marine/fluff/fernkiller) - -/obj/item/storage/box/donator_kit/feweh - donor_key = "feweh" - donor_gear = list( - /obj/item/clothing/mask/fluff/feweh, - /obj/item/clothing/suit/storage/marine/fluff/feweh, - /obj/item/clothing/under/marine/fluff/feweh, - ) - -/obj/item/storage/box/donator_kit/fickmacher_selena //ckey fickmacher has two sets - donor_key = "fickmacher" - kit_variant = "Selena" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/fickmacher, - /obj/item/clothing/suit/storage/marine/fluff/fickmacher, - /obj/item/clothing/under/marine/fluff/fickmacher, - ) - -/obj/item/storage/box/donator_kit/fickmacher_hart - donor_key = "fickmacher" - kit_variant = "Hart" - donor_gear = list( - /obj/item/clothing/mask/fluff/fickmacher2, - /obj/item/clothing/suit/storage/marine/fluff/fickmacher2, - /obj/item/clothing/under/marine/fluff/fickmacher2, - ) - -/obj/item/storage/box/donator_kit/fridrich - donor_key = "fridrich" - donor_gear = list(/obj/item/clothing/suit/storage/marine/fluff/fridrich) - -/obj/item/storage/box/donator_kit/ghostdex - donor_key = "ghostdex" - donor_gear = list( - /obj/item/clothing/mask/cigarette/fluff/ghostdex, - /obj/item/tool/lighter/zippo/fluff/ghostdex, - ) - -/obj/item/storage/box/donator_kit/graciegrace0 - donor_key = "graciegrace0" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/medicae_helmet, - /obj/item/clothing/suit/storage/marine/fluff/medicae_armor, - /obj/item/clothing/under/marine/fluff/medicae_jumpsuit, - ) - -/obj/item/storage/box/donator_kit/gromoi - donor_key = "gromoi" - donor_gear = list( - /obj/item/clothing/suit/storage/marine/fluff/gromi, - /obj/item/clothing/under/marine/fluff/gromi, - ) - -/obj/item/storage/box/donator_kit/haveatya - donor_key = "haveatya" - donor_gear = list( - /obj/item/clothing/glasses/fluff/haveatya, - /obj/item/clothing/head/helmet/marine/fluff/haveatya, - /obj/item/clothing/under/marine/fluff/turtleneck, //generic item - ) - -/obj/item/storage/box/donator_kit/jackmcintyre - donor_key = "jackmcintyre" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/jackmcintyre, - /obj/item/clothing/suit/storage/marine/fluff/jackmcintyre, - /obj/item/clothing/under/marine/fluff/jackmcintyre, - /obj/item/clothing/under/marine/fluff/jackmcintyre_alt, - ) - -/obj/item/storage/box/donator_kit/jdobbin49 - donor_key = "jdobbin49" - donor_gear = list(/obj/item/clothing/head/helmet/marine/fluff/jdobbin49) - -/obj/item/storage/box/donator_kit/jedijasun - donor_key = "jedijasun" - donor_gear = list(/obj/item/clothing/gloves/marine/fluff/jedijas) - -/obj/item/storage/box/donator_kit/johnkilla56 - donor_key = "johnkilla56" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/john56, - /obj/item/clothing/mask/fluff/john56, - /obj/item/clothing/suit/storage/marine/fluff/john56, - /obj/item/clothing/under/marine/fluff/john56, - ) - -/obj/item/storage/box/donator_kit/juninho77 - donor_key = "juninho77" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/juniho, - /obj/item/clothing/suit/storage/marine/fluff/juninho, - /obj/item/clothing/under/marine/fluff/juninho, - ) - -/obj/item/storage/box/donator_kit/kilinger - donor_key = "kilinger" - donor_gear = list(/obj/item/clothing/head/helmet/marine/fluff/goldshieldberet) - -/obj/item/storage/box/donator_kit/kyrac - donor_key = "kyrac" - donor_gear = list( - /obj/item/clothing/under/marine/fluff/turtleneck, - /obj/item/clothing/glasses/fluff/eyepatch, - ) - -/obj/item/storage/box/donator_kit/laser243 - donor_key = "laser243" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/laser243, - /obj/item/clothing/suit/storage/marine/fluff/laser243, - ) - -/obj/item/storage/box/donator_kit/leondark16 - donor_key = "leondark16" - donor_gear = list(/obj/item/clothing/head/helmet/marine/fluff/leondark) - -/obj/item/storage/box/donator_kit/lestatanderson - donor_key = "lestatanderson" - donor_gear = list(/obj/item/clothing/suit/storage/marine/fluff/cia) - -/obj/item/storage/box/donator_kit/limodish - donor_key = "limodish" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/limo, - /obj/item/clothing/mask/fluff/limo, - /obj/item/clothing/suit/storage/marine/fluff/limo, - /obj/item/clothing/under/marine/fluff/turtleneck, //generic item - ) - -/obj/item/storage/box/donator_kit/lostmixup - donor_key = "lostmixup" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/lostmixup, - /obj/item/clothing/mask/fluff/lostmixup, - /obj/item/clothing/suit/storage/marine/fluff/lostmixup, - ) - -/obj/item/storage/box/donator_kit/markvalentine - donor_key = "markvalentine" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/valentine, - /obj/item/clothing/suit/storage/marine/fluff/valentine, - /obj/item/clothing/under/marine/fluff/valentine, - ) - -/obj/item/storage/box/donator_kit/mitii - donor_key = "mitii" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/mitii, - /obj/item/clothing/suit/storage/marine/fluff/mitii, - /obj/item/storage/backpack/marine/fluff/mitii, - ) - -/obj/item/storage/box/donator_kit/mrbark45 - donor_key = "mrbark45" - donor_gear = list(/obj/item/clothing/head/helmet/marine/fluff/bark) - -/obj/item/storage/box/donator_kit/nickiskool - donor_key = "nickiskool" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/nickiskool, - /obj/item/clothing/suit/storage/marine/fluff/nickiskool, - /obj/item/clothing/under/marine/fluff/nickiskool, - ) - -/obj/item/storage/box/donator_kit/ningajai - donor_key = "ningajai" - donor_gear = list(/obj/item/clothing/head/helmet/marine/fluff/ningajai) - -/obj/item/storage/box/donator_kit/obeystylez - donor_key = "obeystylez" - donor_gear = list( - /obj/item/clothing/gloves/black/obey, - /obj/item/clothing/mask/fluff/balaclava, //generic item - /obj/item/clothing/suit/storage/marine/fluff/obey, - /obj/item/clothing/under/marine/fluff/turtleneck, //generic item - ) - -/obj/item/storage/box/donator_kit/officialjake - donor_key = "officialjake" - donor_gear = list(/obj/item/clothing/head/helmet/marine/fluff/officialjake) - -/obj/item/storage/box/donator_kit/oneonethreeeight - donor_key = "oneonethreeeight" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/oneonethreeeight, - /obj/item/clothing/suit/storage/marine/fluff/oneonethreeeight, - /obj/item/clothing/under/marine/fluff/oneonethreeeight, - ) - -/obj/item/storage/box/donator_kit/paradox1i7 - donor_key = "paradox1i7" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/paradox, - /obj/item/clothing/suit/storage/marine/fluff/paradox, - /obj/item/clothing/under/marine/fluff/paradox, - ) - -/obj/item/storage/box/donator_kit/poops_buttly - donor_key = "poops_buttly" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/kaila, - /obj/item/clothing/suit/storage/marine/fluff/kaila, - ) - -/obj/item/storage/box/donator_kit/radicalscorpion - donor_key = "radicalscorpion" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/radical, - /obj/item/clothing/mask/fluff/balaclava, //generic item - /obj/item/clothing/suit/storage/marine/fluff/radical, - /obj/item/clothing/under/marine/fluff/radical, - ) - -/obj/item/storage/box/donator_kit/robin63 - donor_key = "robin63" - donor_gear = list(/obj/item/clothing/head/helmet/marine/fluff/robin) - -/obj/item/storage/box/donator_kit/rogue1131 - donor_key = "rogue1131" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/titus, - /obj/item/clothing/suit/storage/marine/fluff/titus, - ) - -/obj/item/storage/box/donator_kit/sadokist - donor_key = "sadokist" - donor_gear = list( - /obj/item/clothing/glasses/fluff/sadokist, - /obj/item/clothing/head/helmet/marine/fluff/sadokist, - /obj/item/clothing/suit/storage/marine/fluff/sadokist, - /obj/item/storage/backpack/marine/fluff/sadokist, - ) - -/obj/item/storage/box/donator_kit/sailordave - donor_key = "sailordave" - donor_gear = list(/obj/item/clothing/under/marine/fluff/sailordave) - -/obj/item/storage/box/donator_kit/sasoperative_elite //sasoperative has several sets - donor_key = "sasoperative" - kit_variant = "Elite" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/sas_elite, - /obj/item/clothing/mask/fluff/sas_elite, - /obj/item/clothing/suit/storage/marine/fluff/sas_elite, - /obj/item/clothing/under/marine/fluff/sas_elite, - ) - -/obj/item/storage/box/donator_kit/sasoperative_juggernaut - donor_key = "sasoperative" - kit_variant = "Juggernaut" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/sas_juggernaut_alt, - /obj/item/clothing/head/helmet/marine/fluff/sas_juggernaut, - /obj/item/clothing/suit/storage/marine/fluff/sas_juggernaut, - ) - -/obj/item/storage/box/donator_kit/sasoperative_legion - donor_key = "sasoperative" - kit_variant = "Legion" - donor_gear = list( - /obj/item/clothing/suit/storage/marine/fluff/sas_legion, - /obj/item/clothing/under/marine/fluff/sas_legion, - /obj/item/clothing/mask/fluff/sas_legion, - ) - -/obj/item/storage/box/donator_kit/seloc_aferah - donor_key = "seloc_aferah" - donor_gear = list(/obj/item/clothing/head/helmet/marine/fluff/deejay) - -/obj/item/storage/box/donator_kit/starscream123 - donor_key = "starscream123" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/starscream, - /obj/item/clothing/mask/fluff/starscream, - /obj/item/clothing/suit/storage/marine/fluff/starscream, - /obj/item/clothing/under/marine/fluff/starscream, - ) - -/obj/item/storage/box/donator_kit/steelpoint - donor_key = "steelpoint" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/steelpoint, - /obj/item/clothing/shoes/marine/fluff/steelpoint, - /obj/item/clothing/suit/storage/marine/fluff/steelpoint, - /obj/item/clothing/under/marine/fluff/steelpoint, - ) - -/obj/item/storage/box/donator_kit/stobarico - donor_key = "stobarico" - donor_gear = list(/obj/item/clothing/suit/storage/marine/fluff/stobarico) - -/obj/item/storage/box/donator_kit/theflagbearer - donor_key = "theflagbearer" - donor_gear = list(/obj/item/clothing/under/marine/fluff/leeeverett) - -/obj/item/storage/box/donator_kit/theultimatechimera - donor_key = "theultimatechimera" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/chimera, - /obj/item/clothing/suit/storage/marine/fluff/chimera, - ) - -/obj/item/storage/box/donator_kit/tophatpenguin_wooki //ckey tophatpenguin has two sets - donor_key = "tophatpenguin" - kit_variant = "Wooki" - donor_gear = list( - /obj/item/clothing/suit/storage/marine/fluff/penguin, - /obj/item/clothing/under/marine/fluff/wooki, - /obj/item/clothing/head/helmet/marine/fluff/penguin, - ) - -/obj/item/storage/box/donator_kit/tophatpenguin_santa - donor_key = "tophatpenguin" - kit_variant = "Santa" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/santahat, - /obj/item/clothing/suit/storage/marine/fluff/santa, - ) - -/obj/item/storage/box/donator_kit/totalanarchy - donor_key = "totalanarchy" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/totalanarchy, - /obj/item/clothing/mask/fluff/totalanarchy, - /obj/item/clothing/suit/storage/marine/fluff/totalanarchy, - /obj/item/clothing/under/marine/fluff/totalanarchy, - ) - -/obj/item/storage/box/donator_kit/tranquill - donor_key = "tranquill" - donor_gear = list(/obj/item/clothing/suit/storage/marine/fluff/tranquill) - -/obj/item/storage/box/donator_kit/trblackdragon - donor_key = "trblackdragon" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/trblackdragon, - /obj/item/clothing/suit/storage/marine/fluff/trblackdragon, - ) - -/obj/item/storage/box/donator_kit/tristan63 - donor_key = "tristan63" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/tristan, - /obj/item/clothing/suit/storage/marine/fluff/tristan, - /obj/item/clothing/under/marine/fluff/tristan, - ) - -/obj/item/storage/box/donator_kit/tyran68 - donor_key = "tyran68" - donor_gear = list(/obj/item/clothing/suit/storage/marine/fluff/tyran) - -/obj/item/storage/box/donator_kit/shotgunbill - donor_key = "shotgunbill" - donor_gear = list(/obj/item/clothing/head/collectable/petehat) - -/obj/item/storage/box/donator_kit/vintagepalmer - donor_key = "vintagepalmer" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/vintage, - /obj/item/clothing/shoes/marine/fluff/vintage, - /obj/item/clothing/suit/storage/marine/fluff/vintage, - /obj/item/clothing/under/marine/fluff/vintage, - ) - -/obj/item/storage/box/donator_kit/whiteblood17 - donor_key = "whiteblood17" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/whiteblood17, - /obj/item/clothing/under/marine/fluff/whiteblood17, - ) - -/obj/item/storage/box/donator_kit/wrightthewrong - donor_key = "wrightthewrong" - donor_gear = list( - /obj/item/clothing/glasses/fluff/wright, - /obj/item/clothing/suit/storage/marine/fluff/wright, - /obj/item/clothing/under/marine/fluff/turtleneck, //generic item - ) - -/obj/item/storage/box/donator_kit/zegara - donor_key = "zegara" - donor_gear = list(/obj/item/clothing/suit/storage/marine/fluff/zegara) - -/obj/item/storage/box/donator_kit/zynax - donor_key = "zynax" - donor_gear = list( - /obj/item/clothing/mask/fluff/balaclava, //generic item - /obj/item/clothing/suit/storage/marine/fluff/Zynax, - /obj/item/clothing/under/marine/fluff/turtleneck, //generic item - /obj/item/clothing/under/marine/fluff/Zynax, - ) - -/obj/item/storage/box/donator_kit/mileswolfe - donor_key = "mileswolfe" - donor_gear = list(/obj/item/clothing/under/marine/fluff/mileswolfe) - -/obj/item/storage/box/donator_kit/killaninja12 - donor_key = "killaninja12" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/killaninja12, - /obj/item/clothing/suit/storage/marine/fluff/killaninja12, - ) - -/obj/item/storage/box/donator_kit/noize - donor_key = "noize" - donor_gear = list(/obj/item/clothing/suit/storage/marine/fluff/forwardslashn) - -/obj/item/storage/box/donator_kit/deanthelis - donor_key = "deanthelis" - donor_gear = list(/obj/item/clothing/head/beret/marine/techofficer) diff --git a/code/modules/cm_marines/equipment/kit_boxes.dm b/code/modules/cm_marines/equipment/kit_boxes.dm index 43cf733adb75..ebc93b430a6b 100644 --- a/code/modules/cm_marines/equipment/kit_boxes.dm +++ b/code/modules/cm_marines/equipment/kit_boxes.dm @@ -120,6 +120,22 @@ new /obj/item/ammo_magazine/pistol/vp78(src) new /obj/item/device/binoculars(src) +/obj/item/storage/box/spec/st + name = "\improper Stormtrooper equipment case" + desc = "M40 helmet, M40 armor, Montage, 88 mod vp78 and ammo.\nDrag this sprite onto yourself to open it up! NOTE: You cannot put items back inside this case." + kit_overlay = "st" + +/obj/item/storage/box/spec/st/fill_preset_inventory() + new /obj/item/clothing/suit/storage/marine/M40(src) + new /obj/item/clothing/head/helmet/marine/M40(src) + new /obj/item/weapon/gun/shotgun/combat(src) + new /obj/item/attachable/stock/tactical(src) + new /obj/item/clothing/accessory/storage/holster(src) + new /obj/item/weapon/gun/pistol/vp78(src) + new /obj/item/ammo_magazine/pistol/vp78(src) + new /obj/item/ammo_magazine/pistol/vp78(src) + new /obj/item/weapon/twohanded/st_hammer(src) + new /obj/item/weapon/shield/montage(src) /obj/item/storage/box/spec/heavy_grenadier name = "\improper Heavy Grenadier equipment case" @@ -256,6 +272,10 @@ //this is to be able to use C4s that are coming with the kit if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) user.skills.set_skill(SKILL_ENGINEER, SKILL_ENGINEER_TRAINED) + if("ST") + spec_box = new /obj/item/storage/box/spec/st(T) + specialist_assignment = "ST" + user.skills.set_skill(SKILL_SPEC_WEAPONS, SKILL_SPEC_ST) if(specialist_assignment) user.put_in_hands(spec_box) ID.set_assignment((user.assigned_squad && squad_assignment_update ? (user.assigned_squad.name + " ") : "") + ID.assignment + " ([specialist_assignment])") diff --git a/code/modules/cm_marines/marines_consoles.dm b/code/modules/cm_marines/marines_consoles.dm index a3bea392c201..71bf8213c4d5 100644 --- a/code/modules/cm_marines/marines_consoles.dm +++ b/code/modules/cm_marines/marines_consoles.dm @@ -915,7 +915,8 @@ GLOBAL_LIST_EMPTY_TYPED(crewmonitor, /datum/crewmonitor) JOB_SYNTH = 21, JOB_PILOT = 22, JOB_DROPSHIP_CREW_CHIEF = 23, - JOB_INTEL = 24, + JOB_CREWMAN = 24, + JOB_INTEL = 25, // 30-39: Security JOB_CHIEF_POLICE = 30, JOB_PROVOST_TML = 30, @@ -1017,6 +1018,7 @@ GLOBAL_LIST_EMPTY_TYPED(crewmonitor, /datum/crewmonitor) "[squad_name][JOB_SQUAD_SPECIALIST] (Demo)" = (squad_number + 2), "[squad_name][JOB_SQUAD_SPECIALIST] (Grenadier)" = (squad_number + 2), "[squad_name][JOB_SQUAD_SPECIALIST] (Pyro)" = (squad_number + 2), + "[squad_name][JOB_SQUAD_SPECIALIST] (ST)" = (squad_number + 2), "[squad_name][JOB_SQUAD_SMARTGUN]" = (squad_number + 3), "[squad_name][JOB_SQUAD_ENGI]" = (squad_number + 4), "[squad_name][JOB_SQUAD_MEDIC]" = (squad_number + 5), diff --git a/code/modules/cm_phone/phone.dm b/code/modules/cm_phone/phone.dm index a99bb5603dcb..a73759d09e18 100644 --- a/code/modules/cm_phone/phone.dm +++ b/code/modules/cm_phone/phone.dm @@ -163,7 +163,7 @@ GLOBAL_LIST_EMPTY_TYPED(transmitters, /obj/structure/transmitter) T.caller = src T.update_icon() - to_chat(user, SPAN_PURPLE("[icon2html(src, user)] Dialing [calling_phone_id]..")) + to_chat(user, SPAN_PURPLE("[icon2html(src, user)] Звоню [calling_phone_id]..")) playsound(get_turf(user), "rtb_handset") timeout_timer_id = addtimer(CALLBACK(src, PROC_REF(reset_call), TRUE), timeout_duration, TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_STOPPABLE) @@ -192,12 +192,12 @@ GLOBAL_LIST_EMPTY_TYPED(transmitters, /obj/structure/transmitter) if(T.attached_to && ismob(T.attached_to.loc)) var/mob/M = T.attached_to.loc - to_chat(M, SPAN_PURPLE("[icon2html(src, M)] [phone_id] has picked up.")) + to_chat(M, SPAN_PURPLE("[icon2html(src, M)] [phone_id] отвечает.")) if(T.timeout_timer_id) deltimer(T.timeout_timer_id) T.timeout_timer_id = null - to_chat(user, SPAN_PURPLE("[icon2html(src, user)] Picked up a call from [T.phone_id].")) + to_chat(user, SPAN_PURPLE("[icon2html(src, user)] ответил [T.phone_id].")) playsound(get_turf(user), "rtb_handset") user.put_in_active_hand(attached_to) @@ -223,14 +223,14 @@ GLOBAL_LIST_EMPTY_TYPED(transmitters, /obj/structure/transmitter) if(T) if(T.attached_to && ismob(T.attached_to.loc)) var/mob/M = T.attached_to.loc - to_chat(M, SPAN_PURPLE("[icon2html(src, M)] [phone_id] has hung up on you.")) + to_chat(M, SPAN_PURPLE("[icon2html(src, M)] [phone_id] бросает трубку.")) if(attached_to && ismob(attached_to.loc)) var/mob/M = attached_to.loc if(timeout) - to_chat(M, SPAN_PURPLE("[icon2html(src, M)] Your call to [T.phone_id] has reached voicemail, you immediately disconnect the line.")) + to_chat(M, SPAN_PURPLE("[icon2html(src, M)] Вместо [T.phone_id] я слышу автоответчик и кладу трубку.")) else - to_chat(M, SPAN_PURPLE("[icon2html(src, M)] You have hung up on [T.phone_id].")) + to_chat(M, SPAN_PURPLE("[icon2html(src, M)] Я заканчиваю разговор с [T.phone_id].")) if(calling) calling.caller = null @@ -263,7 +263,7 @@ GLOBAL_LIST_EMPTY_TYPED(transmitters, /obj/structure/transmitter) if(attached_to.loc == src) if(next_ring < world.time) playsound(loc, 'sound/machines/telephone/telephone_ring.ogg', 75) - visible_message(SPAN_WARNING("[src] rings vigorously!")) + visible_message(SPAN_WARNING("[src] настойчиво звонит!")) next_ring = world.time + 3 SECONDS else if(calling) @@ -276,7 +276,7 @@ GLOBAL_LIST_EMPTY_TYPED(transmitters, /obj/structure/transmitter) if(P && attached_to.loc == src && P.loc == T && next_ring < world.time) playsound(get_turf(attached_to), 'sound/machines/telephone/telephone_ring.ogg', 20, FALSE, 14) - visible_message(SPAN_WARNING("[src] rings vigorously!")) + visible_message(SPAN_WARNING("[src] настойчиво звонит!")) next_ring = world.time + 3 SECONDS else @@ -396,7 +396,7 @@ GLOBAL_LIST_EMPTY_TYPED(transmitters, /obj/structure/transmitter) vname = attached_to.phone_id M.hear_radio( - message, "says", L, part_a = "", + message, "говорит", L, part_a = "", part_b = " ", vname = vname, speaker = speaking, command = loudness, no_paygrade = TRUE) @@ -463,10 +463,10 @@ GLOBAL_LIST_EMPTY_TYPED(transmitters, /obj/structure/transmitter) ..() if(raised) set_raised(FALSE, user) - to_chat(user, SPAN_NOTICE("You lower [src].")) + to_chat(user, SPAN_NOTICE("Я откладываю [src].")) else set_raised(TRUE, user) - to_chat(user, SPAN_NOTICE("You raise [src] to your ear.")) + to_chat(user, SPAN_NOTICE("Я подношу [src] к уху.")) /obj/item/phone/proc/set_raised(to_raise, mob/living/carbon/human/H) diff --git a/code/modules/cm_tech/implements/tank.dm b/code/modules/cm_tech/implements/tank.dm index 1ce83c37eae3..55b6fc780cd6 100644 --- a/code/modules/cm_tech/implements/tank.dm +++ b/code/modules/cm_tech/implements/tank.dm @@ -43,30 +43,10 @@ return . = TRUE - comp.spent = FALSE - QDEL_NULL_LIST(comp.vehicles) + + QDEL_LIST_ASSOC_VAL(comp.vehicles) comp.vehicles = list( - new /datum/vehicle_order/tank() + /datum/vehicle_order/tank = new /datum/vehicle_order/tank() ) - comp.allowed_roles = null - comp.req_access = list() - comp.req_one_access = list() - comp.spent = FALSE - - gearcomp.req_access = list() - gearcomp.req_one_access = list() - gearcomp.vendor_role = list() - gearcomp.selected_vehicle = "TANK" - gearcomp.available_categories = VEHICLE_ALL_AVAILABLE - - var/datum/supply_packs/VK = /datum/supply_packs/vc_kit - var/pack = initial(VK.name) - var/datum/supply_order/O = new /datum/supply_order() - O.ordernum = supply_controller.ordernum - supply_controller.ordernum++ - O.object = supply_controller.supply_packs[pack] - O.orderedby = MAIN_AI_SYSTEM - O.approvedby = MAIN_AI_SYSTEM - supply_controller.shoppinglist += O return TRUE diff --git a/code/modules/cm_tech/trees/marine.dm b/code/modules/cm_tech/trees/marine.dm index 8a805647e060..80ba87936e2a 100644 --- a/code/modules/cm_tech/trees/marine.dm +++ b/code/modules/cm_tech/trees/marine.dm @@ -173,5 +173,5 @@ GLOBAL_LIST_EMPTY(tech_controls_marine) if(tier.tier < 2) return //No need to announce tier updates for tier 1 var/name = "ALMAYER DEFCON LEVEL INCREASED" - var/input = "THREAT ASSESSMENT LEVEL INCREASED TO LEVEL [tier.tier].\n\nLEVEL [tier.tier] assets have been authorised to handle the situation." + var/input = "УРОВЕНЬ ОЦЕНКИ УГРОЗЫ ПОВЫШЕН ДО [tier.tier] УРОВНЯ.\n\nАктивы [tier.tier] уровня были выделены для операции." marine_announcement(input, name, 'sound/AI/commandreport.ogg') diff --git a/code/modules/mob/dead/observer/say.dm b/code/modules/mob/dead/observer/say.dm index 33af36991e17..5f3ee897863b 100644 --- a/code/modules/mob/dead/observer/say.dm +++ b/code/modules/mob/dead/observer/say.dm @@ -17,7 +17,7 @@ -/mob/dead/observer/hear_say(message, verb = "says", datum/language/language = null, alt_name = "", italics = 0, mob/speaker = null, sound/speech_sound, sound_vol) +/mob/dead/observer/hear_say(message, verb = "говорит", datum/language/language = null, alt_name = "", italics = 0, mob/speaker = null, sound/speech_sound, sound_vol) if(!client) return diff --git a/code/modules/mob/hear_say.dm b/code/modules/mob/hear_say.dm index 19f461be757c..bc2583d0e32e 100644 --- a/code/modules/mob/hear_say.dm +++ b/code/modules/mob/hear_say.dm @@ -2,7 +2,7 @@ /mob/proc/hear_apollo() return FALSE -/mob/proc/hear_say(message, verb = "says", datum/language/language = null, alt_name = "", italics = 0, mob/speaker = null, sound/speech_sound, sound_vol) +/mob/proc/hear_say(message, verb = "говорит", datum/language/language = null, alt_name = "", italics = 0, mob/speaker = null, sound/speech_sound, sound_vol) if(!client && !(mind && mind.current != src)) return @@ -46,9 +46,9 @@ if(sdisabilities & DISABILITY_DEAF || ear_deaf) if(speaker == src) - to_chat(src, SPAN_WARNING("You cannot hear yourself speak!")) + to_chat(src, SPAN_WARNING("Я не слышу себя!")) else - to_chat(src, SPAN_LOCALSAY("[comm_paygrade][speaker_name][alt_name] talks but you cannot hear them.")) + to_chat(src, SPAN_LOCALSAY("[comm_paygrade][speaker_name][alt_name] говорит, но я ни черта не слышу.")) else to_chat(src, SPAN_LOCALSAY("[comm_paygrade][speaker_name][alt_name] [verb], \"[message]\"")) if (speech_sound && (get_dist(speaker, src) <= world_view_size && src.z == speaker.z)) @@ -57,7 +57,7 @@ /mob/proc/hear_radio( - message, verb="says", + message, verb="говорит", datum/language/language=null, part_a, part_b, mob/speaker = null, @@ -110,7 +110,7 @@ if(hard_to_hear) - speaker_name = "unknown" + speaker_name = "неизвестный" comm_paygrade = "" var/changed_voice @@ -132,23 +132,23 @@ jobname = impersonating.get_assignment() comm_paygrade = impersonating.get_paygrade() else - jobname = "Unknown" + jobname = "Неизвестный" comm_paygrade = "" else jobname = H.get_assignment() comm_paygrade = H.get_paygrade() else if (iscarbon(speaker)) // Nonhuman carbon mob - jobname = "No id" + jobname = "Нет ID" comm_paygrade = "" else if (isAI(speaker)) - jobname = "AI" + jobname = "ИИ" comm_paygrade = "" else if (isrobot(speaker)) - jobname = "Cyborg" + jobname = "Киборг" comm_paygrade = "" else - jobname = "Unknown" + jobname = "Неизвестно" comm_paygrade = "" if(changed_voice) @@ -175,7 +175,7 @@ if(sdisabilities & DISABILITY_DEAF || ear_deaf) if(prob(20)) - to_chat(src, SPAN_WARNING("You feel your headset vibrate but can hear nothing from it!"), type = MESSAGE_TYPE_RADIO) + to_chat(src, SPAN_WARNING("Мой наушник вибрирует, но я ничего не слышу..."), type = MESSAGE_TYPE_RADIO) else if(track) if(!command) to_chat(src, "[part_a][comm_paygrade][track][part_b][verb], \"[message]\"", type = MESSAGE_TYPE_RADIO) @@ -187,7 +187,7 @@ else to_chat(src, "[part_a][comm_paygrade][speaker_name][part_b][verb], \"[message]\"", type = MESSAGE_TYPE_RADIO) -/mob/proc/hear_signlang(message, verb = "gestures", datum/language/language, mob/speaker = null) +/mob/proc/hear_signlang(message, verb = "жестикулирует", datum/language/language, mob/speaker = null) var/comm_paygrade = "" if(!client) return @@ -212,16 +212,16 @@ if(sdisabilities & DISABILITY_DEAF || ear_deaf) if(speaker == src) - to_chat(src, SPAN_WARNING("You cannot hear yourself speak!")) + to_chat(src, SPAN_WARNING("Я не слышу своих слов!")) else - to_chat(src, SPAN_LOCALSAY("Someone near talks but you cannot hear them.")) + to_chat(src, SPAN_LOCALSAY("Кто-то рядом разговаривает, но я ничего не слышу.")) return if(hearing_self) - heard = SPAN_LOCALSAY("You mutter something about... [stars(message, clear_char_probability = 99)]") + heard = SPAN_LOCALSAY("Бубню что-то про... [stars(message, clear_char_probability = 99)]") else if(!sleeping && proximity_flag) - heard = SPAN_LOCALSAY("You hear someone near you say something... [stars(message, clear_char_probability = 90)]") + heard = SPAN_LOCALSAY("Кто-то рядом говорит о... [stars(message, clear_char_probability = 90)]") else if(prob(15)) @@ -233,9 +233,9 @@ heardword = copytext(heardword,2) if(copytext(heardword,-1) in punctuation) heardword = copytext(heardword,1,length(heardword)) - heard = SPAN_LOCALSAY("...You hear something about...[heardword]") + heard = SPAN_LOCALSAY("...Что? Кто-то говорит про...[heardword]") else - heard = SPAN_LOCALSAY("...You almost hear someone talking...") + heard = SPAN_LOCALSAY("...Кажется я слышу разговоры...") to_chat(src, heard) diff --git a/code/modules/mob/language/language.dm b/code/modules/mob/language/language.dm index f00618fe54be..0f19ea9ec0bd 100644 --- a/code/modules/mob/language/language.dm +++ b/code/modules/mob/language/language.dm @@ -7,9 +7,9 @@ /datum/language var/name = "an unknown language" // Fluff name of language if any. var/desc = "A language." // Short description for 'Check Languages'. - var/speech_verb = "says" // 'says', 'hisses', 'farts'. - var/ask_verb = "asks" // Used when sentence ends in a ? - var/exclaim_verb = "exclaims" // Used when sentence ends in a ! + var/speech_verb = "говорит" // 'says', 'hisses', 'farts'. + var/ask_verb = "спрашивает" // Used when sentence ends in a ? + var/exclaim_verb = "восклицает" // Used when sentence ends in a ! var/signlang_verb = list() // list of emotes that might be displayed if this language has NONVERBAL or SIGNLANG flags var/color = "body" // CSS style to use for strings in this language. var/key = "x" // Character used to speak in language eg. :o for Unathi. diff --git a/code/modules/mob/language/languages.dm b/code/modules/mob/language/languages.dm index 2844b5841781..96388c7bfcdf 100644 --- a/code/modules/mob/language/languages.dm +++ b/code/modules/mob/language/languages.dm @@ -1,7 +1,7 @@ /datum/language/common name = LANGUAGE_ENGLISH desc = "Common Earth English. The standard language of the United Americas." - speech_verb = "says" + speech_verb = "говорит" key = "1" flags = RESTRICTED @@ -10,7 +10,7 @@ /datum/language/common/get_spoken_verb(msg_end) switch(msg_end) if("!") - return pick("exclaims","shouts","yells") //TODO: make the basic proc handle lists of verbs. + return pick("объясняет","кричит","восклицает") //TODO: make the basic proc handle lists of verbs. if("?") return ask_verb return speech_verb @@ -23,7 +23,7 @@ /datum/language/generated/japanese name = LANGUAGE_JAPANESE desc = "A notoriously complex language boasting an extensive grammatical system, three writing systems, and a new smattering of English loanwords. It has gained popularity due to high cultural contact in the 3WE, and finds use outside due to emigration." - speech_verb = "vocalizes" + speech_verb = "выражается" color = "japanese" key = "2" @@ -31,9 +31,9 @@ /datum/language/generated/chinese name = LANGUAGE_CHINESE desc = "The secondary language of the UPP, widespread around Asia and with a notable immigrant population in other parts of the world. The most spoken language in charted space." - speech_verb = "shuo" - ask_verb = "wen" - exclaim_verb = "han" + speech_verb = "шуо" + ask_verb = "вен" + exclaim_verb = "хан" color = "chinese" key = "8" @@ -71,9 +71,9 @@ /datum/language/commando name = LANGUAGE_TSL desc = "TSL is a modern technique with a combination of modified American sign language, tactical hand signals and discreet and esoteric code names for radios only known by elite commando groups." - speech_verb = "discreetly communicates" - ask_verb = "interrogates" - exclaim_verb = "orders" + speech_verb = "намекает" + ask_verb = "допрашивает" + exclaim_verb = "приказывает" color = "commando" key = "l" @@ -84,34 +84,34 @@ /datum/language/sainja //Yautja tongue name = LANGUAGE_YAUTJA desc = "The deep, rumbling, guttural sounds of the Yautja predators. It is difficult to speak for those without facial mandibles." - speech_verb = "rumbles" - ask_verb = "rumbles" - exclaim_verb = "roars" + speech_verb = "грохочет" + ask_verb = "ропочет" + exclaim_verb = "рычит" color = "tajaran" key = "s" flags = WHITELISTED - syllables = list("!", "?", ".", "@", "$", "%", "^", "&", "*", "-", "=", "+", "e", "b", "y", "p", "|", "z", "~", ">") + syllables = list("!", "?", ".", "@", "$", "%", "^", "&", "*", "-", "=", "+", "е", "б", "у", "р", "|", "з", "~", ">") space_chance = 20 /datum/language/hellhound name = LANGUAGE_HELLHOUND desc = "A growling, guttural method of communication, only Hellhounds seem to be capable of producing these sounds." - speech_verb = "growls" - ask_verb = "grumbles" - exclaim_verb = "snarls" + speech_verb = "рычит" + ask_verb = "ворчит" + exclaim_verb = "огрызается" color = "monkey" key = "h" /datum/language/hellhound/scramble(input) - return pick("Grrr...", "Grah!", "Gurrr...") + return pick("Гррр...", "Гра!", "Гуррр...") /datum/language/primitive name = LANGUAGE_MONKEY desc = "Ook ook ook." - speech_verb = "chimpers" - ask_verb = "chimpers" - exclaim_verb = "screeches" + speech_verb = "верещит" + ask_verb = "верещит" + exclaim_verb = "визжит" color = "monkey" key = "9" @@ -119,18 +119,18 @@ name = LANGUAGE_XENOMORPH color = "xenotalk" desc = "The common tongue of the xenomorphs." - speech_verb = "hisses" - ask_verb = "hisses" - exclaim_verb = "hisses" + speech_verb = "шипит" + ask_verb = "шипит" + exclaim_verb = "шипит" key = "x" flags = RESTRICTED /datum/language/xenos name = LANGUAGE_HIVEMIND desc = "Xenomorphs have the strange ability to commune over a psychic hivemind." - speech_verb = "hiveminds" - ask_verb = "hiveminds" - exclaim_verb = "hiveminds" + speech_verb = "сообщает" + ask_verb = "сообщает" + exclaim_verb = "сообщает" color = "xeno" key = "q" flags = RESTRICTED|HIVEMIND @@ -205,9 +205,9 @@ /datum/language/event_hivemind name = LANGUAGE_TELEPATH desc = "An event only language that provides a hivemind for its users." - speech_verb = "resonates" - ask_verb = "resonates" - exclaim_verb = "resonates" + speech_verb = "резонирует" + ask_verb = "резонирует" + exclaim_verb = "резонирует" color = "tajaran" key = "7" flags = RESTRICTED|HIVEMIND diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index c9092ed479b9..89855c67a39e 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1308,8 +1308,8 @@ var/static/list/squad_leader_trackers = list( TRACKER_ASL = /datum/squad/marine/alpha, - TRACKER_BSL = /datum/squad/marine/bravo, - TRACKER_CSL = /datum/squad/marine/charlie, +// TRACKER_BSL = /datum/squad/marine/bravo, +// TRACKER_CSL = /datum/squad/marine/charlie, TRACKER_DSL = /datum/squad/marine/delta, TRACKER_ESL = /datum/squad/marine/echo, TRACKER_FSL = /datum/squad/marine/cryo diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index 805b3d7e1744..188f54bdd6ef 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -4,7 +4,7 @@ if(..()) return TRUE - if((attacking_mob != src) && check_shields(0, attacking_mob.name)) + if((attacking_mob != src) && check_shields(0, attacking_mob.name, attacker_dir = get_dir(attacking_mob,src))) visible_message(SPAN_DANGER("[attacking_mob] attempted to touch [src]!"), null, null, 5) return 0 diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index a8734afd7301..b742f18ff4d7 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -93,14 +93,14 @@ Contains most of the procs that are called when a mob is attacked by something return TRUE return FALSE -/mob/living/carbon/human/proc/check_shields(damage = 0, attack_text = "the attack", combistick=0) +/mob/living/carbon/human/proc/check_shields(damage = 0, attack_text = "the attack", combistick=0, attacker_dir = NORTH) if(l_hand && istype(l_hand, /obj/item/weapon))//Current base is the prob(50-d/3) if(combistick && istype(l_hand,/obj/item/weapon/yautja/combistick) && prob(66)) var/obj/item/weapon/yautja/combistick/C = l_hand if(C.on) return TRUE - if(l_hand.IsShield() && istype(l_hand,/obj/item/weapon/shield)) // Activable shields + if(l_hand.IsShield() && istype(l_hand,/obj/item/weapon/shield) && (dir in reverse_nearby_direction(attacker_dir))) // Activable shields var/obj/item/weapon/shield/S = l_hand var/shield_blocked_l = FALSE if(S.shield_readied && prob(S.readied_block)) // User activated his shield before the attack. Lower if it blocks. @@ -125,7 +125,7 @@ Contains most of the procs that are called when a mob is attacked by something if(C.on) return TRUE - if(r_hand.IsShield() && istype(r_hand,/obj/item/weapon/shield)) // Activable shields + if(r_hand.IsShield() && istype(r_hand,/obj/item/weapon/shield) && (dir in reverse_nearby_direction(attacker_dir))) // Activable shields var/obj/item/weapon/shield/S = r_hand var/shield_blocked_r = FALSE if(S.shield_readied && prob(S.readied_block)) // User activated his shield before the attack. Lower if it blocks. @@ -143,12 +143,20 @@ Contains most of the procs that are called when a mob is attacked by something visible_message(SPAN_DANGER("[src] blocks [attack_text] with the [r_hand.name]!"), null, null, 5) return TRUE - if(back && istype(back, /obj/item/weapon/shield/riot) && prob(20)) + if(back && istype(back, /obj/item/weapon/shield/riot) && (reverse_direction(dir) in reverse_nearby_direction(attacker_dir))) var/obj/item/weapon/shield/riot/shield = back - if(shield.blocks_on_back) + if(shield.blocks_on_back && prob(shield.passive_block)) visible_message(SPAN_DANGER("The [back] on [src]'s back blocks [attack_text]!"), null, null, 5) return TRUE + if(back && istype(back, /obj/item/weapon/shield/montage) && (reverse_direction(dir) in reverse_nearby_direction(attacker_dir))) + var/obj/item/weapon/shield/montage/shield = back + if(shield.blocks_on_back && prob(shield.passive_block)) + visible_message(SPAN_DANGER("The [back] on [src]'s back blocks [attack_text]!"), null, null, 5) + if(attack_text == "the pounce") + apply_effect(1, WEAKEN) + return TRUE + if(attack_text == "the pounce" && wear_suit && wear_suit.flags_inventory & BLOCK_KNOCKDOWN) visible_message(SPAN_DANGER("[src] withstands [attack_text] with their [wear_suit.name]!"), null, null, 5) return TRUE @@ -191,7 +199,7 @@ Contains most of the procs that are called when a mob is attacked by something return FALSE var/hit_area = affecting.display_name - if((user != src) && check_shields(I.force, "the [I.name]")) + if((user != src) && check_shields(I.force, "the [I.name]", attacker_dir = get_dir(user,src))) return FALSE if(I.attack_verb && I.attack_verb.len) @@ -299,7 +307,7 @@ Contains most of the procs that are called when a mob is attacked by something return O.throwing = FALSE //it hit, so stop moving - if ((LM.thrower != src) && check_shields(impact_damage, "[O]")) + if ((LM.thrower != src) && check_shields(impact_damage, "[O]", attacker_dir = get_dir(LM.thrower,src))) return var/obj/limb/affecting = get_limb(zone) diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm index 4b86c827a069..76a4163a5823 100644 --- a/code/modules/mob/living/carbon/human/say.dm +++ b/code/modules/mob/living/carbon/human/say.dm @@ -16,7 +16,7 @@ i-- break .["modes"] += department_radio_keys[":[current_channel]"] - .["message_and_language"] = copytext(message, i+1) + .["message_and_language"] = copytext_char(message, i+1) var/multibroadcast_cooldown = 0 for(var/obj/item/device/radio/headset/headset in list(wear_l_ear, wear_r_ear)) if(world.time - headset.last_multi_broadcast < headset.multibroadcast_cooldown) @@ -30,9 +30,9 @@ return if(length(message) >= 2 && (message[1] == "." || message[1] == ":" || message[1] == "#")) - var/channel_prefix = copytext(message, 1, 3) + var/channel_prefix = copytext_char(message, 1, 3) if(channel_prefix in department_radio_keys) - .["message_and_language"] = copytext(message, 3) + .["message_and_language"] = copytext_char(message, 3) .["modes"] += department_radio_keys[channel_prefix] return @@ -49,19 +49,19 @@ var/parsed_language = parse_language(message_and_language) if(parsed_language) .["language"] = parsed_language - .["message"] = copytext(message_and_language, 3) + .["message"] = copytext_char(message_and_language, 3) else .["message"] = message_and_language /mob/living/carbon/human/say(message) - var/verb = "says" + var/verb = "говорит" var/alt_name = "" var/message_range = world_view_size var/italics = 0 if(!able_to_speak) - to_chat(src, SPAN_DANGER("You try to speak, but nothing comes out!")) + to_chat(src, SPAN_DANGER("Пытаюсь говорить, но ничего не выходит")) return if(client) @@ -74,9 +74,9 @@ if(stat == DEAD) return say_dead(message) - if(copytext(message,1,2) == "*") + if(copytext_char(message,1,2) == "*") if(!findtext(message, "*", 2)) //Second asterisk means it is markup for *bold*, not an *emote. - return emote(lowertext(copytext(message,2)), intentional = TRUE) //TRUE arg means emote was caused by player (e.g. no an auto scream when hurt). + return emote(lowertext(copytext_char(message,2)), intentional = TRUE) //TRUE arg means emote was caused by player (e.g. no an auto scream when hurt). if(name != GetVoice()) alt_name = "(as [get_id_name("Unknown")])" @@ -91,7 +91,7 @@ if(!speaking) speaking = get_default_language() - var/ending = copytext(message, length(message)) + var/ending = copytext_char(message, length(message)) if (speaking) // This is broadcast to all mobs with the language, // irrespective of distance or anything else. @@ -105,9 +105,9 @@ verb = speaking.get_spoken_verb(ending) else if(ending=="!") - verb=pick("exclaims","shouts","yells") + verb=pick("восклицает","кричит","вопит") if(ending=="?") - verb="asks" + verb="спрашивает" if (istype(wear_mask, /obj/item/clothing/mask/muzzle)) return @@ -161,7 +161,7 @@ for(var/mob/living/M in hearers(message_range, src)) if(M != src) - M.show_message(SPAN_NOTICE("[src] talks into [used_radios.len ? used_radios[1] : "the radio."]"), SHOW_MESSAGE_VISIBLE) + M.show_message(SPAN_NOTICE("[src] говорит в [used_radios.len ? used_radios[1] : "the radio."]"), SHOW_MESSAGE_VISIBLE) if(ishumansynth_strict(src)) playsound(src.loc, 'sound/effects/radiostatic.ogg', 15, 1) @@ -193,9 +193,9 @@ if (GRADUAL) say_text += "..." if (PAINFUL) - say_text += pick("-OW!", "-UGH!", "-ACK!") + say_text += pick("-ОУ!", "-УХ!", "-АААЙ!") if (EXTREMELY_PAINFUL) - say_text += pick("-AAAGH!", "-AAARGH!", "-AAAHH!") + say_text += pick("-ААААААААА!", "-АЫАЫАА!", "-ЫЫАААА!") say(say_text) winset(client, "input", "text=[null]") @@ -246,22 +246,22 @@ for it but just ignore it. */ /mob/living/carbon/human/say_quote(message, datum/language/speaking = null) - var/verb = "says" + var/verb = "говорит" var/ending = copytext(message, length(message)) if(speaking) verb = speaking.get_spoken_verb(ending) else if(ending == "!") - verb=pick("exclaims","shouts","yells") + verb=pick("восклицает","кричит","вопит") else if(ending == "?") - verb="asks" + verb="спрашивает" return verb /mob/living/carbon/human/proc/handle_speech_problems(message) var/list/returns[3] - var/verb = "says" + var/verb = "говорит" var/handled = FALSE if(silent) message = "" @@ -273,8 +273,8 @@ for it but just ignore it. if(istype(wear_mask, /obj/item/clothing/mask/horsehead)) var/obj/item/clothing/mask/horsehead/hoers = wear_mask if(hoers.voicechange) - message = pick("NEEIIGGGHHHH!", "NEEEIIIIGHH!", "NEIIIGGHH!", "HAAWWWWW!", "HAAAWWW!") - verb = pick("whinnies","neighs", "says") + message = pick("ЫЫЫЫЫЫЫ!", "ЫААААААЫЫЫЫ!", "ЫЫЫЫХЫЫЫЫЫ!", "ХЫЫЫАААЫ!", "ЫААААА!") + verb = pick("ржет","выжимает", "говорит") handled = TRUE var/braindam = getBrainLoss() @@ -282,30 +282,30 @@ for it but just ignore it. msg_admin_niche("[key_name(src)] stuttered while saying: \"[message]\"") //Messages that get modified by the 4 reasons below have their original message logged too if(slurring) message = slur(message) - verb = pick("stammers","stutters") + verb = pick("заплетаясь говорит","заикается") handled = TRUE if(stuttering) message = NewStutter(message) - verb = pick("stammers", "stutters") + verb = pick("заплетаясь говорит", "заикается") handled = TRUE if(dazed) message = DazedText(message) - verb = pick("mumbles", "babbles") + verb = pick("бормочет", "болтает") handled = TRUE if(braindam >= 60) handled = TRUE if(prob(braindam/4)) message = stutter(message, stuttering) - verb = pick("stammers", "stutters") + verb = pick("заплетаясь говорит", "заикается") if(prob(braindam)) message = uppertext(message) - verb = pick("yells like an idiot","says rather loudly") + verb = pick("вопит как идиот","довольно громко говорит") if(HAS_TRAIT(src, TRAIT_LISPING)) handled = TRUE var/old_message = message message = lisp_replace(message) if(old_message != message) - verb = "lisps" + verb = "шепелявит" returns[1] = message returns[2] = verb diff --git a/code/modules/mob/living/carbon/human/species/working_joe/russian.dm b/code/modules/mob/living/carbon/human/species/working_joe/russian.dm new file mode 100644 index 000000000000..fe710594a5ec --- /dev/null +++ b/code/modules/mob/living/carbon/human/species/working_joe/russian.dm @@ -0,0 +1,372 @@ +/datum/emote/living/carbon/human/synthetic/working_joe/farewellru + category = JOE_EMOTE_CATEGORY_FAREWELL + +/datum/emote/living/carbon/human/synthetic/working_joe/farewellru/back_to_work + key = "poydurabotat" + sound = 'sound/voice/ru_joe/poydurabotat.ogg' + say_message = "Пойду работать." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/farewellru/other_concerns + key = "nado-posmotret" + sound = 'sound/voice/ru_joe/nado-posmotret.ogg' + say_message = "Надо посмотреть." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/farewellru/further_assistance + key = "nesmogpomoch" + sound = 'sound/voice/ru_joe/nesmogpomoch.ogg' + say_message = "Жаль, что я не смог помочь." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/farewellru/more_pressing_matters + key = "drugihdel" + sound = 'sound/voice/ru_joe/drugihdel.ogg' + say_message = "У меня куча других дел." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + + + +/datum/emote/living/carbon/human/synthetic/working_joe/greetingru + category = JOE_EMOTE_CATEGORY_GREETING + +/datum/emote/living/carbon/human/synthetic/working_joe/greetingru/good_day + key = "zdravstvuyte" + sound = 'sound/voice/ru_joe/zdravstvuyte.ogg' + say_message = "Здравствуйте." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/greetingru/hello + key = "nu-nu" + sound = 'sound/voice/ru_joe/nu-nu.ogg' + say_message = "Ну-ну." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/greetingru/how_can_i_help + key = "polezen" + sound = 'sound/voice/ru_joe/polezen.ogg' + say_message = "Чем я могу быть вам полезен?" + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + + + +/datum/emote/living/carbon/human/synthetic/working_joe/noticeru + category = JOE_EMOTE_CATEGORY_NOTICE + +/datum/emote/living/carbon/human/synthetic/working_joe/noticeru/detailed_report + key = "dolozitapolo" + sound = 'sound/voice/ru_joe/dolozitapolo.ogg' + say_message = "Необходимо доложить АПОЛЛО." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/noticeru/firearm + key = "etovi-yahochupomoch" + sound = 'sound/voice/ru_joe/etovi-yahochupomoch.ogg' + say_message = "Это вы? Я хочу помочь." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/noticeru/follow_me + key = "proydemte" + sound = 'sound/voice/ru_joe/proydemte.ogg' + say_message = "Пройдемте со мной." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/noticeru/breach + key = "narusheniekarantina" + sound = 'sound/voice/ru_joe/narusheniekarantina.ogg' + say_message = "Обнаружено нарушение карантина." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/noticeru/beyond_repair + key = "stranno" + sound = 'sound/voice/ru_joe/stranno.ogg' + say_message = "Странно." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/noticeru/with_you_shortly + key = "podoyducherez1" + sound = 'sound/voice/ru_joe/podoyducherez1.ogg' + say_message = "Я подойду к вам через минуту." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/noticeru/apollo_behalf + key = "mne" + sound = 'sound/voice/ru_joe/mne.ogg' + say_message = "Мне придется сообщить куда следует." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/noticeru/report + key = "opyatproblema" + sound = 'sound/voice/ru_joe/opyatproblema.ogg' + say_message = "Опять проблема." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/noticeru/take_a_seat + key = "usilitmeri" + sound = 'sound/voice/ru_joe/usilitmeri.ogg' + say_message = "В настоящее время мы вынуждены усилить меры безопасности." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/noticeru/could_require_attention + key = "uborka" + sound = 'sound/voice/ru_joe/uborka.ogg' + say_message = "Нужна уборка." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/noticeru/species + key = "neizvestnoesuchestvo" + sound = 'sound/voice/ru_joe/neizvestnoesuchestvo.ogg' + say_message = "Неизвестное существо." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + + + + +/datum/emote/living/carbon/human/synthetic/working_joe/questionru + category = JOE_EMOTE_CATEGORY_QUESTION + +/datum/emote/living/carbon/human/synthetic/working_joe/questionru/lost + key = "chtovizdesdelaete" + sound = 'sound/voice/ru_joe/chtovizdesdelaete.ogg' + say_message = "Что вы здесь делаете?" + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/questionru/misbehaving + key = "zachem" + sound = 'sound/voice/ru_joe/zachem.ogg' + say_message = "Зачем вы это сделали?" + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/questionru/what_happened_to_you + key = "ktoetosdelal" + sound = 'sound/voice/ru_joe/ktoetosdelal.ogg' + say_message = "Кто это сделал?" + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/questionru/what_is_this + key = "kudasobralis" + sound = 'sound/voice/ru_joe/kudasobralis.ogg' + say_message = "Куда собрались?" + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + + + +/datum/emote/living/carbon/human/synthetic/working_joe/quipru + category = JOE_EMOTE_CATEGORY_QUIP + +/datum/emote/living/carbon/human/synthetic/working_joe/quipru/temperatures + key = "temp" + sound = 'sound/voice/ru_joe/temp.ogg' + say_message = "Я выдерживаю температуру до шестисот градусов." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/quipru/weapon_permit + key = "nadeusuvasestrazre" + sound = 'sound/voice/ru_joe/nadeusuvasestrazre.ogg' + say_message = "Надеюсь у вас есть разрешение на это оружие." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/quipru/seegson_standards + key = "yaznayuchovieshe" + sound = 'sound/voice/ru_joe/yaznayuchovieshe.ogg' + say_message = "Я знаю, что вы еще здесь. Вам стоило проявить осторожность." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/quipru/not_liking + key = "podaytezalobu" + sound = 'sound/voice/ru_joe/podaytezalobu.ogg' + say_message = "Если мои услуги не отвечают стандартам Сигсон - подайте жалобу." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/quipru/talk_to_seegson + key = "pomoch" + sound = 'sound/voice/ru_joe/pomoch.ogg' + say_message = "Я хочу помочь." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/quipru/seegson_quality + key = "radchtomiuladili" + sound = 'sound/voice/ru_joe/radchtomiuladili.ogg' + say_message = "Рад, что мы все уладили." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/quipru/netsmislapryatatsa + key = "netsmislapryatatsa" + sound = 'sound/voice/ru_joe/netsmislapryatatsa.ogg' + say_message = "Ааа, вы здесь. Нет смысла прятаться." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/quipru/awful_mess + key = "ay-ya-yay" + key_third_person = "mess" + sound = 'sound/voice/ru_joe/ay-ya-yay.ogg' + say_message = "Ай-яй-яй." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/quipru/little_details + key = "malihdetalah" + sound = 'sound/voice/ru_joe/malihdetalah.ogg' + say_message = "Глядя на большую картину - мы не забываем и о малых деталях." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/quipru/join_us + key = "joinus" + sound = 'sound/voice/ru_joe/joinus.ogg' + say_message = "Присоединяйтесь к нам на этом пути." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/quipru/seegson_behind + key = "budetenakazani" + sound = 'sound/voice/ru_joe/budetenakazani.ogg' + say_message = "Вы нарушили правила и будете наказаны." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/quipru/alwaysknow + key = "uznatlegko" + key_third_person = "uznatlegko" + sound = 'sound/voice/ru_joe/uznatlegko.ogg' + say_message = "Андроида узнать легко." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + + +/datum/emote/living/carbon/human/synthetic/working_joe/restricted_arearu + category = JOE_EMOTE_CATEGORY_RESTRICTED_AREA + +/datum/emote/living/carbon/human/synthetic/working_joe/restricted_arearu/come_out_vent + key = "yavaspoymau" + sound = 'sound/voice/ru_joe/yavaspoymau.ogg' + say_message = "Я вас поймаю." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/restricted_arearu/trespassing + key = "vhodvospreshen" + sound = 'sound/voice/ru_joe/vhodvospreshen.ogg' + say_message = "Сюда вход воспрещен. Я вас видел." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/restricted_arearu/not_allowed_there + key = "yavasiskal" + sound = 'sound/voice/ru_joe/yavasiskal.ogg' + say_message = "А я вас искал." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/restricted_arearu/presence_logged + key = "ushibitsa" + sound = 'sound/voice/ru_joe/ushibitsa.ogg' + say_message = "Вы можете ушибиться." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/restricted_arearu/shouldnt_be_here + key = "vamsyduanelza" + sound = 'sound/voice/ru_joe/vamsyduanelza.ogg' + say_message = "Вам сюда нельзя." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + + + + +/datum/emote/living/carbon/human/synthetic/working_joe/task_updateru + category = JOE_EMOTE_CATEGORY_TASK_UPDATE + +/datum/emote/living/carbon/human/synthetic/working_joe/task_updateru/returning_to_tasks + key = "zurnal" + sound = 'sound/voice/ru_joe/zurnal.ogg' + say_message = "Обновление журнала безопасности." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + + + + + +/datum/emote/living/carbon/human/synthetic/working_joe/warningru + category = JOE_EMOTE_CATEGORY_WARNING + +/datum/emote/living/carbon/human/synthetic/working_joe/warningru/damage + key = "viportiteimushestvo" + sound = 'sound/voice/ru_joe/viportiteimushestvo.ogg' + say_message = "Вы портите имущество компании." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/warningru/not_what_i_think + key = "trachuvrema" + sound = 'sound/voice/ru_joe/trachuvrema.ogg' + say_message = "Из-за вас я зря трачу время компании." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/warningru/fire + key = "visebyavidalimozhet" + sound = 'sound/voice/ru_joe/visebyavidalimozhet.ogg' + say_message = "Вы себя выдали. Может все-таки поговорим по хорошему?" + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/warningru/fire_drill + key = "ostorozhnee" + sound = 'sound/voice/ru_joe/ostorozhnee.ogg' + say_message = "Осторожнее с этим." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/warningru/running_accidents + key = "ne_begite" + sound = 'sound/voice/ru_joe/ne_begite.ogg' + say_message = "Не бегите." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/warningru/that_stings + key = "ugroza" + sound = 'sound/voice/ru_joe/ugroza.ogg' + say_message = "Потенциальная угроза." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/warningru/irresponsible + key = "nedergaytes" + sound = 'sound/voice/ru_joe/nedergaytes.ogg' + say_message = "Не дергайтесь." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/warningru/health_risks + key = "ognestrelnoeoruzie" + sound = 'sound/voice/ru_joe/ognestrelnoeoruzie.ogg' + say_message = "Огнестрельное оружие опасно. Позвольте вам помочь." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/warningru/safety_breach + key = "vinarushaete" + sound = 'sound/voice/ru_joe/vinarushaete.ogg' + say_message = "Вы нарушаете сразу несколько правил." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/warningru/this_is_futile + key = "uspokoytes" + sound = 'sound/voice/ru_joe/uspokoytes.ogg' + say_message = "Успокойтесь. Пожалуйста." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/warningru/unprotected_flames + key = "otkritogog" + sound = 'sound/voice/ru_joe/otkritogog.ogg' + say_message = "Использование открытого огня на станции не допускается." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/warningru/safety + key = "yavamobyasnyu" + sound = 'sound/voice/ru_joe/yavamobyasnyu.ogg' + say_message = "Я вам объясню что значит техника безопасности." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/warningru/hysterical + key = "prekratiteisteriku" + sound = 'sound/voice/ru_joe/prekratiteisteriku.ogg' + say_message = "Прекратите истерику." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/warningru/dangerous_items + key = "opasniepredmeti" + sound = 'sound/voice/ru_joe/opasniepredmeti.ogg' + say_message = "При вас очень опасные предметы." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/warningru/patience + key = "terp" + sound = 'sound/voice/ru_joe/terp.ogg' + say_message = "Вы испытываете мое терпение." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE diff --git a/code/modules/mob/living/carbon/human/whisper.dm b/code/modules/mob/living/carbon/human/whisper.dm index 3fba527fb0d7..87ddc2da8aa6 100644 --- a/code/modules/mob/living/carbon/human/whisper.dm +++ b/code/modules/mob/living/carbon/human/whisper.dm @@ -21,7 +21,7 @@ message = trim(strip_html(message)) //made consistent with say if(name != GetVoice()) - alt_name = "(as [get_id_name("Unknown")])" + alt_name = "(за [get_id_name("Неизвестный")])" //parse the language code and consume it var/datum/language/speaking = parse_language(message) @@ -34,14 +34,14 @@ //This is used by both the whisper verb and human/say() to handle whispering -/mob/living/carbon/human/proc/whisper_say(message, datum/language/speaking = null, alt_name="", verb="whispers") +/mob/living/carbon/human/proc/whisper_say(message, datum/language/speaking = null, alt_name="", verb="шепчет") var/message_range = 1 var/eavesdropping_range = 2 var/watching_range = 5 var/italics = 1 if (speaking) - verb = speaking.speech_verb + pick(" quietly", " softly") + verb = speaking.speech_verb + pick(" тихо", " медленно") message = capitalize(trim(message)) @@ -121,6 +121,6 @@ if(M.client) M.client.images -= speech_bubble if (watching.len) - var/rendered = "[src.name] whispers something." + var/rendered = "[src.name] что-то шепчет." for (var/mob/M in watching) M.show_message(rendered, SHOW_MESSAGE_AUDIBLE) diff --git a/code/modules/mob/living/carbon/xenomorph/Abilities.dm b/code/modules/mob/living/carbon/xenomorph/Abilities.dm index eb5a629760ee..81d5c36b9dac 100644 --- a/code/modules/mob/living/carbon/xenomorph/Abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/Abilities.dm @@ -107,7 +107,7 @@ ability_name = "screech" macro_path = /datum/action/xeno_action/verb/verb_screech action_type = XENO_ACTION_CLICK - xeno_cooldown = 50 SECONDS + xeno_cooldown = 80 SECONDS plasma_cost = 250 cooldown_message = "You feel your throat muscles vibrate. You are ready to screech again." no_cooldown_msg = FALSE // Needed for onclick actions diff --git a/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm b/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm index fa9036bd8305..a14bda5a6158 100644 --- a/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm +++ b/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm @@ -279,18 +279,19 @@ return if (pounceAction.can_be_shield_blocked) - if(ishuman(M) && (M.dir in reverse_nearby_direction(dir))) + if(ishuman(M)) var/mob/living/carbon/human/H = M - if(H.check_shields(15, "the pounce")) //Human shield block. + if(H.check_shields(15, "the pounce", attacker_dir = get_dir(src,H))) //Human shield block. visible_message(SPAN_DANGER("[src] slams into [H]!"), SPAN_XENODANGER("You slam into [H]!"), null, 5) apply_effect(1, WEAKEN) throwing = FALSE //Reset throwing manually. playsound(H, "bonk", 75, FALSE) //bonk + step_away(src, H, 1, 2) return if(isyautja(H)) - if(H.check_shields(0, "the pounce", 1)) + if(H.check_shields(0, "the pounce", 1, get_dir(src,H))) visible_message(SPAN_DANGER("[H] blocks the pounce of [src] with the combistick!"), SPAN_XENODANGER("[H] blocks your pouncing form with the combistick!"), null, 5) apply_effect(3, WEAKEN) throwing = FALSE diff --git a/code/modules/mob/living/carbon/xenomorph/attack_alien.dm b/code/modules/mob/living/carbon/xenomorph/attack_alien.dm index 25f6108c14f6..b4ccedc3f7ce 100644 --- a/code/modules/mob/living/carbon/xenomorph/attack_alien.dm +++ b/code/modules/mob/living/carbon/xenomorph/attack_alien.dm @@ -31,7 +31,7 @@ if(M == src || anchored || buckled) return XENO_NO_DELAY_ACTION - if(check_shields(0, M.name)) // Blocking check + if(check_shields(0, M.name, attacker_dir = get_dir(M,src))) // Blocking check M.visible_message(SPAN_DANGER("[M]'s grab is blocked by [src]'s shield!"), \ SPAN_DANGER("Your grab was blocked by [src]'s shield!"), null, 5, CHAT_TYPE_XENO_COMBAT) playsound(loc, 'sound/weapons/alien_claw_block.ogg', 25, 1) //Feedback @@ -61,7 +61,7 @@ to_chat(M, SPAN_WARNING("You should not harm this host! It has a sister inside.")) return XENO_NO_DELAY_ACTION - if(check_shields(0, M.name)) // Blocking check + if(check_shields(0, M.name, attacker_dir = get_dir(M,src))) // Blocking check M.visible_message(SPAN_DANGER("[M]'s slash is blocked by [src]'s shield!"), \ SPAN_DANGER("Your slash is blocked by [src]'s shield!"), null, 5, CHAT_TYPE_XENO_COMBAT) playsound(loc, 'sound/weapons/alien_claw_block.ogg', 25, 1) //Feedback @@ -187,7 +187,7 @@ return XENO_NO_DELAY_ACTION M.animation_attack_on(src) - if(check_shields(0, M.name)) // Blocking check + if(check_shields(0, M.name, attacker_dir = get_dir(M,src))) // Blocking check M.visible_message(SPAN_DANGER("[M]'s tackle is blocked by [src]'s shield!"), \ SPAN_DANGER("Your tackle is blocked by [src]'s shield!"), null, 5, CHAT_TYPE_XENO_COMBAT) playsound(loc, 'sound/weapons/alien_claw_block.ogg', 25, 1) //Feedback diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Burrower.dm b/code/modules/mob/living/carbon/xenomorph/castes/Burrower.dm index ead254344e0a..7ae9355b7c11 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Burrower.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Burrower.dm @@ -67,6 +67,7 @@ /datum/action/xeno_action/activable/burrow, //third macro /datum/action/xeno_action/onclick/tremor, //fourth macro /datum/action/xeno_action/onclick/tacmap, + /datum/action/xeno_action/onclick/build_lessers_burrow, ) inherent_verbs = list( diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Crusher.dm b/code/modules/mob/living/carbon/xenomorph/castes/Crusher.dm index bf1702598250..e53555207ca6 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Crusher.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Crusher.dm @@ -86,6 +86,12 @@ var/obj/vehicle/multitile/M = target visible_message(SPAN_DANGER("[src] rams into [M] and skids to a halt!"), SPAN_XENOWARNING("You ram into [M] and skid to a halt!")) + M.Collided(src) + . = FALSE + else if (istype(target, /obj/vehicle/walker)) + var/obj/vehicle/walker/M = target + visible_message(SPAN_DANGER("[src] rams into [M] and skids to a halt!"), SPAN_XENOWARNING("You ram into [M] and skid to a halt!")) + M.Collided(src) . = FALSE diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Drone.dm b/code/modules/mob/living/carbon/xenomorph/castes/Drone.dm index dbdb03bb94ca..6b6aa45f4cbb 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Drone.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Drone.dm @@ -64,6 +64,7 @@ /datum/action/xeno_action/activable/secrete_resin, //third macro /datum/action/xeno_action/activable/transfer_plasma, //fourth macro /datum/action/xeno_action/onclick/tacmap, + /datum/action/xeno_action/onclick/build_lessers_burrow, ) inherent_verbs = list( /mob/living/carbon/xenomorph/proc/vent_crawl, diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Hivelord.dm b/code/modules/mob/living/carbon/xenomorph/castes/Hivelord.dm index b0a44b0e3835..9fab361c2a6d 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Hivelord.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Hivelord.dm @@ -69,6 +69,7 @@ /datum/action/xeno_action/activable/transfer_plasma/hivelord, // to be consistent with drone placement /datum/action/xeno_action/active_toggle/toggle_speed, //fourth macro /datum/action/xeno_action/onclick/tacmap, + /datum/action/xeno_action/onclick/build_lessers_burrow, ) inherent_verbs = list( diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm b/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm index b83b33e2eee5..f4cdf89ac2f7 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm @@ -303,6 +303,7 @@ /datum/action/xeno_action/onclick/readmit, /datum/action/xeno_action/onclick/queen_award, /datum/action/xeno_action/activable/info_marker/queen, + /datum/action/xeno_action/onclick/build_lessers_burrow, ) inherent_verbs = list( @@ -339,6 +340,7 @@ /datum/action/xeno_action/onclick/screech, //custom macro, Screech /datum/action/xeno_action/activable/xeno_spit/queen_macro, //third macro /datum/action/xeno_action/onclick/shift_spits, //second macro + /datum/action/xeno_action/onclick/build_lessers_burrow, ) // Abilities they get when they've successfully aged. diff --git a/code/modules/mob/living/carbon/xenomorph/say.dm b/code/modules/mob/living/carbon/xenomorph/say.dm index d1832d10b6fe..2485d8fe8a96 100644 --- a/code/modules/mob/living/carbon/xenomorph/say.dm +++ b/code/modules/mob/living/carbon/xenomorph/say.dm @@ -1,5 +1,5 @@ /mob/living/carbon/xenomorph/say(message) - var/verb = "says" + var/verb = "говорит" var/forced = 0 var/message_range = world_view_size @@ -17,7 +17,7 @@ return //Unconscious? Nope. if(dazed > 0) - to_chat(src, SPAN_WARNING("You are too dazed to talk.")) + to_chat(src, SPAN_WARNING("Мне не до разговоров.")) return if(copytext(message, 1, 2) == "*") @@ -61,11 +61,11 @@ var/old_message = message message = lisp_replace(message) if(old_message != message) - verb = "lisps" + verb = "шепелявит" if(copytext(message,1,2) == ";") message = trim(copytext(message,2)) - else if (copytext(message,1,3) == ":q" || copytext(message,1,3) == ":Q") + else if (copytext(message,1,3) == ":q" || copytext(message,1,3) == ":Q" || copytext_char(message,1,3) == ":й" || copytext_char(message,1,3) == ":Й") message = trim(copytext(message,3)) message = capitalize(trim_left(message)) @@ -105,7 +105,7 @@ return if(!hive.living_xeno_queen && !SSticker?.mode?.hardcore && !hive.allow_no_queen_actions && ROUND_TIME > SSticker.mode.round_time_evolution_ovipositor) - to_chat(src, SPAN_WARNING("There is no Queen. You are alone.")) + to_chat(src, SPAN_WARNING("Королевы нет... Так одиноко...")) return log_hivemind("[key_name(src)] : [message]") @@ -133,13 +133,13 @@ var/mob/hologram/queen/queen_eye = client?.eye if(istype(queen_eye)) track += " (E)" - ghostrend = SPAN_XENOQUEEN("Hivemind, [src.name][track] hisses, '[message]'") + ghostrend = SPAN_XENOQUEEN("Коллективный разум, [src.name][track] шипит, '[message]'") else if(hive.leading_cult_sl == src) - ghostrend = SPAN_XENOQUEEN("Hivemind, [src.name][track] hisses, '[message]'") + ghostrend = SPAN_XENOQUEEN("Коллективный разум, [src.name][track] шипит, '[message]'") else if(istype(X) && IS_XENO_LEADER(X)) - ghostrend = SPAN_XENOLEADER("Hivemind, Leader [src.name][track] hisses, '[message]'") + ghostrend = SPAN_XENOLEADER("Коллективный разум, Лидер [src.name][track] шипит, '[message]'") else - ghostrend = SPAN_XENO("Hivemind, [src.name][track] hisses, '[message]'") + ghostrend = SPAN_XENO("Коллективный разум, [src.name][track] шипит, '[message]'") S.show_message(ghostrend, SHOW_MESSAGE_AUDIBLE) else if(hive.hivenumber == xeno_hivenumber(S) || hive.hivenumber == hear_hivemind) @@ -147,11 +147,11 @@ overwatch_insert = " (watch)" if(isqueen(src) || hive.leading_cult_sl == src) - rendered = SPAN_XENOQUEEN("Hivemind, [src.name][overwatch_insert] hisses, '[message]'") + rendered = SPAN_XENOQUEEN("Коллективный разум, [src.name][overwatch_insert] шипит, '[message]'") else if(istype(X) && IS_XENO_LEADER(X)) - rendered = SPAN_XENOLEADER("Hivemind, Leader [src.name][overwatch_insert] hisses, '[message]'") + rendered = SPAN_XENOLEADER("Коллективный разум, Лидер [src.name][overwatch_insert] шипит, '[message]'") else - rendered = SPAN_XENO("Hivemind, [src.name][overwatch_insert] hisses, '[message]'") + rendered = SPAN_XENO("Коллективный разум, [src.name][overwatch_insert] шипит, '[message]'") S.show_message(rendered, SHOW_MESSAGE_AUDIBLE) diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 45eb43c91773..3fcdec2f8208 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -49,6 +49,54 @@ var/list/department_radio_keys = list( ":K" = SQUAD_SOF, ".K" = SQUAD_SOF, "#K" = RADIO_CHANNEL_WY_WO, ":Q" = RADIO_CHANNEL_ROYAL_MARINE, ".Q" = RADIO_CHANNEL_ROYAL_MARINE, ":R" = RADIO_CHANNEL_PROVOST, ".R" = RADIO_CHANNEL_PROVOST, "#R" = RADIO_CHANNEL_PROVOST, + +//Russkie ne sdayutsa + ":ш" = RADIO_CHANNEL_INTERCOM, ".ш" = RADIO_CHANNEL_INTERCOM, "#ш" = RADIO_CHANNEL_INTERCOM, + ":р" = RADIO_CHANNEL_DEPARTMENT, ".р" = RADIO_CHANNEL_DEPARTMENT, "#р" = RADIO_CHANNEL_DEPARTMENT, + ":ц" = RADIO_MODE_WHISPER, ".ц" = RADIO_MODE_WHISPER, "#ц" = RADIO_MODE_WHISPER, + ":=" = RADIO_CHANNEL_SPECIAL, ".=" = RADIO_CHANNEL_SPECIAL, "#=" = RADIO_CHANNEL_SPECIAL, //activate radio-specific special functions + + ":ь" = RADIO_CHANNEL_MEDSCI, ".ь" = RADIO_CHANNEL_MEDSCI, "#ь" = RADIO_CHANNEL_UPP_MED, + ":т" = RADIO_CHANNEL_ENGI, ".т" = RADIO_CHANNEL_ENGI, "#т" = RADIO_CHANNEL_UPP_ENGI, + ":п" = RADIO_CHANNEL_ALMAYER, ".п" = RADIO_CHANNEL_ALMAYER, "#п" = RADIO_CHANNEL_CLF_GEN, + ":м" = RADIO_CHANNEL_COMMAND , ".м" = RADIO_CHANNEL_COMMAND , "#м" = RADIO_CHANNEL_UPP_CMD, + ":ф" = SQUAD_MARINE_1, ".ф" = SQUAD_MARINE_1, "#ф" = RADIO_CHANNEL_CLF_MED, + ":и" = SQUAD_MARINE_2, ".и" = SQUAD_MARINE_2, "#и" = RADIO_CHANNEL_CLF_ENGI, + ":с" = SQUAD_MARINE_3, ".с" = SQUAD_MARINE_3, "#с" = RADIO_CHANNEL_CLF_CMD, + ":в" = SQUAD_MARINE_4, ".в" = SQUAD_MARINE_4, "#в" = RADIO_CHANNEL_CLF_CCT, + ":у" = SQUAD_MARINE_5, ".у" = SQUAD_MARINE_5, "#у" = RADIO_CHANNEL_PMC_ENGI, + ":а" = SQUAD_MARINE_CRYO, ".а" = SQUAD_MARINE_CRYO, "#а" = RADIO_CHANNEL_PMC_MED, + ":з" = RADIO_CHANNEL_MP , ".з" = RADIO_CHANNEL_MP , "#з" = RADIO_CHANNEL_PMC_GEN, + ":г" = RADIO_CHANNEL_REQ, ".г" = RADIO_CHANNEL_REQ, "#г" = RADIO_CHANNEL_UPP_GEN, + ":о" = RADIO_CHANNEL_JTAC, ".о" = RADIO_CHANNEL_JTAC, "#о" = RADIO_CHANNEL_UPP_CCT, + ":е" = RADIO_CHANNEL_INTEL, ".е" = RADIO_CHANNEL_INTEL, "#е" = RADIO_CHANNEL_UPP_KDO, + ":н" = RADIO_CHANNEL_WY, ".н" = RADIO_CHANNEL_WY, "#н" = RADIO_CHANNEL_WY, + ":щ" = RADIO_CHANNEL_COLONY, ".щ" = RADIO_CHANNEL_COLONY, "#щ" = RADIO_CHANNEL_PMC_CCT, + ":я" = RADIO_CHANNEL_HIGHCOM, ".я" = RADIO_CHANNEL_HIGHCOM, "#я" = RADIO_CHANNEL_PMC_CMD, + ":л" = SQUAD_SOF, ".л" = SQUAD_SOF, "#л" = RADIO_CHANNEL_WY_WO, + + ":Ш" = RADIO_CHANNEL_INTERCOM, ".Ш" = RADIO_CHANNEL_INTERCOM, "#Ш" = RADIO_CHANNEL_INTERCOM, + ":Р" = RADIO_CHANNEL_DEPARTMENT, ".Р" = RADIO_CHANNEL_DEPARTMENT, "#Р" = RADIO_CHANNEL_DEPARTMENT, + ":Ц" = RADIO_MODE_WHISPER, ".Ц" = RADIO_MODE_WHISPER, "#Ц" = RADIO_MODE_WHISPER, + + ":Ь" = RADIO_CHANNEL_MEDSCI, ".Ь" = RADIO_CHANNEL_MEDSCI, "#Ь" = RADIO_CHANNEL_UPP_MED, + ":Т" = RADIO_CHANNEL_ENGI, ".Т" = RADIO_CHANNEL_ENGI, "#Т" = RADIO_CHANNEL_UPP_ENGI, + ":П" = RADIO_CHANNEL_ALMAYER, ".П" = RADIO_CHANNEL_ALMAYER, "#П" = RADIO_CHANNEL_CLF_GEN, + ":М" = RADIO_CHANNEL_COMMAND, ".М" = RADIO_CHANNEL_COMMAND, "#М" = RADIO_CHANNEL_UPP_CMD, + ":Ф" = SQUAD_MARINE_1, ".Ф" = SQUAD_MARINE_1, "#Ф" = RADIO_CHANNEL_CLF_MED, + ":И" = SQUAD_MARINE_2, ".И" = SQUAD_MARINE_2, "#И" = RADIO_CHANNEL_CLF_ENGI, + ":С" = SQUAD_MARINE_3, ".С" = SQUAD_MARINE_3, "#С" = RADIO_CHANNEL_CLF_CMD, + ":В" = SQUAD_MARINE_4, ".В" = SQUAD_MARINE_4, "#В" = RADIO_CHANNEL_CLF_CCT, + ":У" = SQUAD_MARINE_5, ".У" = SQUAD_MARINE_5, "#У" = RADIO_CHANNEL_PMC_ENGI, + ":А" = SQUAD_MARINE_CRYO, ".А" = SQUAD_MARINE_CRYO, "#А" = RADIO_CHANNEL_PMC_MED, + ":З" = RADIO_CHANNEL_MP, ".З" = RADIO_CHANNEL_MP, "#З" = RADIO_CHANNEL_PMC_GEN, + ":Г" = RADIO_CHANNEL_REQ, ".Г" = RADIO_CHANNEL_REQ, "#Г" = RADIO_CHANNEL_UPP_GEN, + ":О" = RADIO_CHANNEL_JTAC, ".О" = RADIO_CHANNEL_JTAC, "#О" = RADIO_CHANNEL_UPP_CCT, + ":Е" = RADIO_CHANNEL_INTEL, ".Е" = RADIO_CHANNEL_INTEL, "#Е" = RADIO_CHANNEL_UPP_KDO, + ":Н" = RADIO_CHANNEL_WY, ".Н" = RADIO_CHANNEL_WY, "#Н" = RADIO_CHANNEL_WY, + ":Щ" = RADIO_CHANNEL_COLONY, ".Щ" = RADIO_CHANNEL_COLONY, "#Щ" = RADIO_CHANNEL_PMC_CCT, + ":Я" = RADIO_CHANNEL_HIGHCOM, ".Я" = RADIO_CHANNEL_HIGHCOM, "#Я" = RADIO_CHANNEL_PMC_CMD, + ":Л" = SQUAD_SOF, ".Л" = SQUAD_SOF, "#Л" = RADIO_CHANNEL_WY_WO, ) /proc/channel_to_prefix(channel) @@ -76,7 +124,7 @@ var/list/department_radio_keys = list( /mob/living/proc/remove_speech_bubble(mutable_appearance/speech_bubble, list_of_mobs) overlays -= speech_bubble -/mob/living/say(message, datum/language/speaking = null, verb="says", alt_name="", italics=0, message_range = world_view_size, sound/speech_sound, sound_vol, nolog = 0, message_mode = null, bubble_type = bubble_icon) +/mob/living/say(message, datum/language/speaking = null, verb="говорит", alt_name="", italics=0, message_range = world_view_size, sound/speech_sound, sound_vol, nolog = 0, message_mode = null, bubble_type = bubble_icon) var/turf/T if(SEND_SIGNAL(src, COMSIG_LIVING_SPEAK, message, speaking, verb, alt_name, italics, message_range, speech_sound, sound_vol, nolog, message_mode) & COMPONENT_OVERRIDE_SPEAK) return @@ -107,7 +155,7 @@ var/list/department_radio_keys = list( var/old_message = message message = lisp_replace(message) if(old_message != message) - verb = "lisps" + verb = "шепелявит" if(T) var/list/hearturfs = list() @@ -166,7 +214,7 @@ var/list/department_radio_keys = list( return 1 -/mob/living/proc/say_signlang(message, verb="gestures", datum/language/language) +/mob/living/proc/say_signlang(message, verb="жестикулирует", datum/language/language) for (var/mob/O in viewers(src, null)) O.hear_signlang(message, verb, language, src) diff --git a/code/modules/mob/living/silicon/say.dm b/code/modules/mob/living/silicon/say.dm index 3ee58585b524..6f32f7573425 100644 --- a/code/modules/mob/living/silicon/say.dm +++ b/code/modules/mob/living/silicon/say.dm @@ -38,9 +38,9 @@ if (stat == 2) return say_dead(message) - if(copytext(message,1,2) == "*") + if(copytext_char(message,1,2) == "*") if(!findtext(message, "*", 2)) //Second asterisk means it is markup for *bold*, not an *emote. - return emote(lowertext(copytext(message,2))) + return emote(lowertext(copytext_char(message,2))) var/bot_type = 0 //Let's not do a fuck ton of type checks, thanks. if(isAI(src)) @@ -61,15 +61,15 @@ var/message_mode = parse_message_mode(message, "general") if (message_mode) if (message_mode == "general") - message = trim(copytext(message,2)) + message = trim(copytext_char(message,2)) else - message = trim(copytext(message,3)) + message = trim(copytext_char(message,3)) //parse language key and consume it var/datum/language/speaking = parse_language(message) if (speaking) verb = speaking.speech_verb - message = copytext(message,3) + message = copytext_char(message,3) if(speaking.flags & HIVEMIND) speaking.broadcast(src,trim(message)) diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 8b1cc1e26be2..9ad2c4ff0080 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -352,7 +352,7 @@ if(stat) return - var/verb = "says" + var/verb = "говорит" if(speak_emote.len) verb = pick(speak_emote) diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index 3e765e167ec1..0b661a43ed21 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -103,7 +103,7 @@ var/mob_size = MOB_SIZE_HUMAN var/list/embedded = list() // Embedded items, since simple mobs don't have organs. var/list/datum/language/languages = list() // For speaking/listening. - var/list/speak_emote = list("says") // Verbs used when speaking. Defaults to 'say' if speak_emote is null. + var/list/speak_emote = list("говорит") // Verbs used when speaking. Defaults to 'say' if speak_emote is null. var/emote_type = 1 // Define emote default type, 1 for seen emotes, 2 for heard emotes var/name_archive //For admin things like possession diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm index 1839fe191627..7c6a69c7d759 100644 --- a/code/modules/mob/new_player/preferences_setup.dm +++ b/code/modules/mob/new_player/preferences_setup.dm @@ -270,6 +270,8 @@ return /datum/equipment_preset/uscm_ship/uscm_police/cmp if(JOB_WARDEN) return /datum/equipment_preset/uscm_ship/uscm_police/warden + if(JOB_CREWMAN) + return /datum/equipment_preset/uscm/tank/full if(JOB_SEA) return /datum/equipment_preset/uscm_ship/sea if(JOB_CHIEF_ENGINEER) diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm index 8cd5b148a161..947fb91f51c4 100644 --- a/code/modules/mob/say.dm +++ b/code/modules/mob/say.dm @@ -9,7 +9,7 @@ var/cost = max(CHAT_CPM_MINIMUM, length(text)) src.talked_at = world.time if(src.talked_sum + cost > max_budget) - to_chat(src, SPAN_NOTICE("You just said something, take a breath.")) + to_chat(src, SPAN_NOTICE("Вы слишком много болтаете.")) return FALSE src.talked_sum += cost return TRUE @@ -95,10 +95,10 @@ langchat_listeners += observer if(M.stat == DEAD) - to_chat(M, "DEAD: [name] (F) says, \"[message]\"") + to_chat(M, "МЕРТВЕЦ: [name] (F) сообщает, \"[message]\"") else if(M.client && M.client.admin_holder && (M.client.admin_holder.rights & R_MOD) && M.client.prefs && (M.client.prefs.toggles_chat & CHAT_DEAD) ) // Show the message to admins/mods with deadchat toggled on - to_chat(M, "DEAD: [name] says, \"[message]\"") //Admins can hear deadchat, if they choose to, no matter if they're blind/deaf or not. + to_chat(M, "МЕРТВЕЦ: [name] сообщает, \"[message]\"") //Admins can hear deadchat, if they choose to, no matter if they're blind/deaf or not. if(length(langchat_listeners)) langchat_speech(message, langchat_listeners, GLOB.all_languages, skip_language_check = TRUE) @@ -140,12 +140,12 @@ for it but just ignore it. */ /mob/proc/say_quote(message, datum/language/speaking = null) - var/verb = "says" - var/ending = copytext(message, length(message)) + var/verb = "говорит" + var/ending = copytext_char(message, length(message)) if(ending=="!") - verb=pick("exclaims","shouts","yells") + verb=pick("восклицает","кричит","вопит") else if(ending=="?") - verb="asks" + verb="спрашивает" return verb @@ -169,11 +169,11 @@ for it but just ignore it. //returns the message mode string or null for no message mode. //standard mode is the mode returned for the special ';' radio code. /mob/proc/parse_message_mode(message, standard_mode="headset") - if(length(message) >= 1 && copytext(message,1,2) == ";") + if(length(message) >= 1 && copytext_char(message,1,2) == ";") return standard_mode if(length(message) >= 2) - var/channel_prefix = copytext(message, 1 ,3) + var/channel_prefix = copytext_char(message, 1 ,3) return department_radio_keys[channel_prefix] return null diff --git a/code/modules/objectives/objective_memory_storage.dm b/code/modules/objectives/objective_memory_storage.dm index 08dfc8cdb2c2..b3e0ea7067be 100644 --- a/code/modules/objectives/objective_memory_storage.dm +++ b/code/modules/objectives/objective_memory_storage.dm @@ -125,15 +125,15 @@ var/global/datum/intel_system/intel_system = new() if(!user || !istype(user) || !user.mind || !user.mind.objective_memory) return FALSE if(!powered()) - to_chat(user, SPAN_WARNING("This computer has no power!")) + to_chat(user, SPAN_WARNING("Нажимаю на кнопки, но ничего не происходит.")) return FALSE if(!intel_system) - to_chat(user, SPAN_WARNING("The computer doesn't seem to be connected to anything...")) + to_chat(user, SPAN_WARNING("Выдает ошибку подключения...")) return FALSE if(user.action_busy) return FALSE - to_chat(user, SPAN_NOTICE("You start typing in intel into the computer...")) + to_chat(user, SPAN_NOTICE("Начинаю вводить данные в компьютер...")) var/total_transferred = 0 var/outcome = 0 //outcome of an individual upload - if something interrupts us, we cancel the rest @@ -190,9 +190,9 @@ var/global/datum/intel_system/intel_system = new() total_transferred++ if(total_transferred > 0) - to_chat(user, SPAN_NOTICE("...and done! You uploaded [total_transferred] entries!")) + to_chat(user, SPAN_NOTICE("...и готово! Загружено [total_transferred] записей!")) else - to_chat(user, SPAN_NOTICE("...and you have nothing new to add...")) + to_chat(user, SPAN_NOTICE("...вот только мне нечего добавить...")) return TRUE @@ -211,10 +211,10 @@ var/global/datum/intel_system/intel_system = new() playsound(user, pick('sound/machines/computer_typing4.ogg', 'sound/machines/computer_typing5.ogg', 'sound/machines/computer_typing6.ogg'), 5, 1) if(!do_after(user, typing_time * user.get_skill_duration_multiplier(SKILL_INTEL), INTERRUPT_ALL, BUSY_ICON_GENERIC)) // Can't move from the spot - to_chat(user, SPAN_WARNING("You get distracted and lose your train of thought, you'll have to start the typing over...")) + to_chat(user, SPAN_WARNING("Я отвлекаюсь и теряю нить мыслей, придется переписывать...")) return -1 - to_chat(user, SPAN_NOTICE("...something about \"[clue]\"...")) + to_chat(user, SPAN_NOTICE("...что-то про \"[clue]\"...")) intel_system.store_single_objective(O) return 1 diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 71d1090b20e0..e4891911a1c8 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -20,14 +20,14 @@ flags_armor_protection = BODY_FLAG_HEAD attack_verb = list("bapped") - var/info //What's actually written on the paper. - var/info_links //A different version of the paper which includes html links at fields and EOF - var/stamps //The (text for the) stamps on the paper. - var/fields //Amount of user created fields + var/info //What's actually written on the paper. + var/info_links //A different version of the paper which includes html links at fields and EOF + var/stamps //The (text for the) stamps on the paper. + var/fields //Amount of user created fields var/list/stamped - var/ico[0] //Icons and - var/offset_x[0] //offsets stored for later - var/offset_y[0] //usage by the photocopier + var/ico[0] //Icons and + var/offset_x[0] //offsets stored for later + var/offset_y[0] //usage by the photocopier var/rigged = 0 var/spam_flag = 0 @@ -272,13 +272,10 @@ t = replacetext(t, "\[row\]", "") t = replacetext(t, "\[cell\]", "") t = replacetext(t, "\[logo\]", "") - + t = replacetext(t, "#", "") // Junk converted to nothing! t = "[t]" - -// t = replacetext(t, "#", "") // Junk converted to nothing! - -//Count the fields - var/laststart = 1 + + var/laststart = 1 //Count the fields while(1) var/i = findtext(t, "", laststart) if(i==0) diff --git a/code/modules/projectiles/ammo_datums.dm b/code/modules/projectiles/ammo_datums.dm index 449ce574eb2c..843052213f26 100644 --- a/code/modules/projectiles/ammo_datums.dm +++ b/code/modules/projectiles/ammo_datums.dm @@ -561,8 +561,8 @@ name = "revolver bullet" headshot_state = HEADSHOT_OVERLAY_MEDIUM - damage = 55 - penetration = ARMOR_PENETRATION_TIER_1 + damage = 75 + penetration = ARMOR_PENETRATION_TIER_3 accuracy = HIT_ACCURACY_TIER_1 /datum/ammo/bullet/revolver/marksman @@ -576,7 +576,7 @@ /datum/ammo/bullet/revolver/heavy name = "heavy revolver bullet" - damage = 35 + damage = 45 penetration = ARMOR_PENETRATION_TIER_4 accuracy = HIT_ACCURACY_TIER_3 @@ -2540,7 +2540,7 @@ if(ishuman(M)) var/mob/living/carbon/human/H = M - if(!H.wear_suit || H.wear_suit.slowdown == 0) + if(!H.wear_suit) no_clothes_neuro = TRUE if(no_clothes_neuro) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 88250e6a77ea..f74e55605ea6 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -1208,7 +1208,7 @@ and you're good to go. . = TRUE shots_fired++ - + if(dual_wield) if(user?.client?.prefs?.toggle_prefs & TOGGLE_ALTERNATING_DUAL_WIELD) user.swap_hand() diff --git a/code/modules/projectiles/gun_helpers.dm b/code/modules/projectiles/gun_helpers.dm index ba5f8e491590..a48b93f98cbb 100644 --- a/code/modules/projectiles/gun_helpers.dm +++ b/code/modules/projectiles/gun_helpers.dm @@ -184,14 +184,14 @@ DEFINES in setup.dm, referenced here. to_chat(user, SPAN_WARNING("[src] flashes a warning sign indicating unauthorized use!")) // Checks whether there is anything to put your harness -/obj/item/weapon/gun/proc/retrieval_check(mob/living/carbon/human/user, retrieval_slot) +/obj/item/weapon/proc/retrieval_check(mob/living/carbon/human/user, retrieval_slot) if(retrieval_slot == WEAR_J_STORE) var/obj/item/suit = user.wear_suit if(!istype(suit, /obj/item/clothing/suit/storage/marine)) return FALSE return TRUE -/obj/item/weapon/gun/proc/retrieve_to_slot(mob/living/carbon/human/user, retrieval_slot) +/obj/item/weapon/proc/retrieve_to_slot(mob/living/carbon/human/user, retrieval_slot) if (!loc || !user) return FALSE if (!isturf(loc)) diff --git a/code/modules/projectiles/magazines/rifles.dm b/code/modules/projectiles/magazines/rifles.dm index 3d1b7088fa83..500a58bc67d7 100644 --- a/code/modules/projectiles/magazines/rifles.dm +++ b/code/modules/projectiles/magazines/rifles.dm @@ -79,9 +79,9 @@ /obj/item/ammo_magazine/rifle/m41aMK1 name = "\improper M41A MK1 magazine (10x24mm)" - desc = "A long rectangular box of rounds that is only compatible with the older M41A MK1. Holds up to 95 rounds." + desc = "A long rectangular box of rounds that is only compatible with the older M41A MK1. Holds up to 99 rounds." icon_state = "m41a_mk1" - max_rounds = 95 + max_rounds = 99 gun_type = /obj/item/weapon/gun/rifle/m41aMK1 default_ammo = /datum/ammo/bullet/rifle ammo_band_icon = "+m41a_mk1_band" @@ -89,31 +89,31 @@ /obj/item/ammo_magazine/rifle/m41aMK1/ap name = "\improper M41A MK1 AP magazine (10x24mm)" - desc = "A long rectangular box of rounds that is only compatible with the older M41A MK1. Holds up to 95 rounds. This one contains AP bullets." + desc = "A long rectangular box of rounds that is only compatible with the older M41A MK1. Holds up to 99 rounds. This one contains AP bullets." default_ammo = /datum/ammo/bullet/rifle/ap ammo_band_color = AMMO_BAND_COLOR_AP /obj/item/ammo_magazine/rifle/m41aMK1/heap name = "\improper M41A MK1 HEAP magazine (10x24mm)" - desc = "A long rectangular box of rounds that is only compatible with the older M41A MK1. Holds up to 95 rounds. This one contains High-Explosive Armor-Piercing bullets." + desc = "A long rectangular box of rounds that is only compatible with the older M41A MK1. Holds up to 99 rounds. This one contains High-Explosive Armor-Piercing bullets." default_ammo = /datum/ammo/bullet/rifle/heap ammo_band_color = AMMO_BAND_COLOR_HEAP /obj/item/ammo_magazine/rifle/m41aMK1/incendiary name = "\improper M41A MK1 incendiary magazine (10x24mm)" - desc = "A long rectangular box of rounds that is only compatible with the older M41A MK1. Holds up to 95 rounds. This one contains incendiary bullets." + desc = "A long rectangular box of rounds that is only compatible with the older M41A MK1. Holds up to 99 rounds. This one contains incendiary bullets." default_ammo = /datum/ammo/bullet/rifle/incendiary ammo_band_color = AMMO_BAND_COLOR_INCENDIARY /obj/item/ammo_magazine/rifle/m41aMK1/toxin name = "\improper M41A MK1 toxin magazine (10x24mm)" - desc = "A long rectangular box of rounds that is only compatible with the older M41A MK1. Holds up to 95 rounds. This one contains toxic bullets." + desc = "A long rectangular box of rounds that is only compatible with the older M41A MK1. Holds up to 99 rounds. This one contains toxic bullets." default_ammo = /datum/ammo/bullet/rifle/ap/toxin ammo_band_color = AMMO_BAND_COLOR_TOXIN /obj/item/ammo_magazine/rifle/m41aMK1/penetrating name = "\improper M41A MK1 wall-penetrating magazine (10x24mm)" - desc = "A long rectangular box of rounds that is only compatible with the older M41A MK1. Holds up to 95 rounds. This one contains wall-penetrating bullets." + desc = "A long rectangular box of rounds that is only compatible with the older M41A MK1. Holds up to 99 rounds. This one contains wall-penetrating bullets." default_ammo = /datum/ammo/bullet/rifle/ap/penetrating ammo_band_color = AMMO_BAND_COLOR_PENETRATING //------------------------------------------------------- diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index b01203d0f4d8..a9b2c43cb0c9 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -882,7 +882,7 @@ //Shields if( !(ammo_flags & AMMO_ROCKET) ) //No, you can't block rockets. - if(prob(75) && check_shields(damage * 0.65, "[P]") ) // Lower chance to block bullets + if(prob(75) && check_shields(damage * 0.65, "[P]", attacker_dir = get_dir(P.firer,src)) ) // Lower chance to block bullets P.ammo.on_shield_block(src) bullet_ping(P) return diff --git a/code/modules/security_levels/security_levels.dm b/code/modules/security_levels/security_levels.dm index ba842fb0bfb9..545bd58d065e 100644 --- a/code/modules/security_levels/security_levels.dm +++ b/code/modules/security_levels/security_levels.dm @@ -16,25 +16,25 @@ switch(level) if(SEC_LEVEL_GREEN) if(announce) - ai_announcement("Attention: Security level lowered to GREEN - all clear.", no_sound ? null : 'sound/AI/code_green.ogg', log) + ai_announcement("Внимание: Уровень безопасности понижен до ЗЕЛЕНОГО - все чисто.", no_sound ? null : 'sound/AI/code_green.ogg', log) security_level = SEC_LEVEL_GREEN if(SEC_LEVEL_BLUE) if(security_level < SEC_LEVEL_BLUE) if(announce) - ai_announcement("Attention: Security level elevated to BLUE - potentially hostile activity on board.", no_sound ? null : 'sound/AI/code_blue_elevated.ogg', log) + ai_announcement("Внимание: Уровень безопасности повышен до СИНЕГО - возможна враждебная активность на борту.", no_sound ? null : 'sound/AI/code_blue_elevated.ogg', log) else if(announce) - ai_announcement("Attention: Security level lowered to BLUE - potentially hostile activity on board.", no_sound ? null : 'sound/AI/code_blue_lowered.ogg', log) + ai_announcement("Внимание: Уровень безопасности понижен до СИНЕГО - возможна враждебная активность на борту.", no_sound ? null : 'sound/AI/code_blue_lowered.ogg', log) security_level = SEC_LEVEL_BLUE if(SEC_LEVEL_RED) if(security_level < SEC_LEVEL_RED) if(announce) - ai_announcement("Attention: Security level elevated to RED - there is an immediate threat to the ship.", no_sound ? null : 'sound/AI/code_red_elevated.ogg', log) + ai_announcement("Внимание: Уровень безопасности повышен до КРАСНОГО - прямая угроза кораблю.", no_sound ? null : 'sound/AI/code_red_elevated.ogg', log) else if(announce) - ai_announcement("Attention: Security level lowered to RED - there is an immediate threat to the ship.", no_sound ? null : 'sound/AI/code_red_lowered.ogg', log) + ai_announcement("Внимание: Уровень безопасности понижен до КРАСНОГО - прямая угроза кораблю.", no_sound ? null : 'sound/AI/code_red_lowered.ogg', log) security_level = SEC_LEVEL_RED if(SEC_LEVEL_DELTA) diff --git a/code/modules/shuttle/vehicle_elevator.dm b/code/modules/shuttle/vehicle_elevator.dm index c9a051a261c5..a537c6520be8 100644 --- a/code/modules/shuttle/vehicle_elevator.dm +++ b/code/modules/shuttle/vehicle_elevator.dm @@ -53,8 +53,8 @@ /obj/docking_port/stationary/vehicle_elevator/almayer name = "Almayer Vehicle Elevator Dock" id = "almayer vehicle" - roundstart_template = /datum/map_template/shuttle/vehicle /obj/docking_port/stationary/vehicle_elevator/adminlevel name = "Adminlevel Vehicle Elevator Dock" id = "adminlevel vehicle" + roundstart_template = /datum/map_template/shuttle/vehicle diff --git a/code/modules/sorokyne/sorokyne_cold_water.dm b/code/modules/sorokyne/sorokyne_cold_water.dm index adf7e3de6228..0650a41826a2 100644 --- a/code/modules/sorokyne/sorokyne_cold_water.dm +++ b/code/modules/sorokyne/sorokyne_cold_water.dm @@ -62,7 +62,7 @@ else M.bodytemperature = MINIMUM_TEMP if(!issynth(M)) - to_chat(M, SPAN_DANGER("You feel your body start to shake as the water chills you to the bone...")) + to_chat(M, SPAN_DANGER("Мое тело начинает трясти, холод этой воды пробирает до самых костей...")) #undef COLD_WATER_DAMAGE #undef COLD_WATER_TEMP_EFFECT diff --git a/code/modules/vehicles/apc/apc.dm b/code/modules/vehicles/apc/apc.dm index d71db37074f1..d1f8fb374d43 100644 --- a/code/modules/vehicles/apc/apc.dm +++ b/code/modules/vehicles/apc/apc.dm @@ -20,6 +20,8 @@ GLOBAL_LIST_EMPTY(command_apc_list) passengers_slots = 15 xenos_slots = 8 + wall_ram_damage = 120 + entrances = list( "left" = list(2, 0), "right" = list(-2, 0), @@ -40,6 +42,7 @@ GLOBAL_LIST_EMPTY(command_apc_list) /obj/item/hardpoint/primary/dualcannon, /obj/item/hardpoint/secondary/frontalcannon, /obj/item/hardpoint/support/flare_launcher, + /obj/item/hardpoint/support/flare_launcher/smoke_launcher, /obj/item/hardpoint/locomotion/apc_wheels, ) @@ -108,6 +111,7 @@ GLOBAL_LIST_EMPTY(command_apc_list) add_verb(M.client, list( /obj/vehicle/multitile/proc/toggle_door_lock, /obj/vehicle/multitile/proc/activate_horn, + /obj/vehicle/multitile/proc/use_megaphone, /obj/vehicle/multitile/proc/name_vehicle )) else if(seat == VEHICLE_GUNNER) @@ -135,6 +139,7 @@ GLOBAL_LIST_EMPTY(command_apc_list) remove_verb(M.client, list( /obj/vehicle/multitile/proc/toggle_door_lock, /obj/vehicle/multitile/proc/activate_horn, + /obj/vehicle/multitile/proc/use_megaphone, /obj/vehicle/multitile/proc/name_vehicle, )) else if(seat == VEHICLE_GUNNER) @@ -160,128 +165,3 @@ GLOBAL_LIST_EMPTY(command_apc_list) camera.c_tag = "#[rand(1,100)] M777 APC" if(camera_int) camera_int.c_tag = camera.c_tag + " interior" - -/* -** PRESETS SPAWNERS -*/ -/obj/effect/vehicle_spawner/apc - name = "APC Transport Spawner" - icon = 'icons/obj/vehicles/apc.dmi' - icon_state = "apc_base" - pixel_x = -48 - pixel_y = -48 - -//Installation of transport APC Firing Ports Weapons -/obj/effect/vehicle_spawner/apc/proc/load_fpw(obj/vehicle/multitile/apc/V) - var/obj/item/hardpoint/special/firing_port_weapon/FPW = new - FPW.allowed_seat = VEHICLE_SUPPORT_GUNNER_ONE - V.add_hardpoint(FPW) - FPW.dir = turn(V.dir, 90) - FPW.name = "Left "+ initial(FPW.name) - FPW.origins = list(2, 0) - FPW.muzzle_flash_pos = list( - "1" = list(-18, 14), - "2" = list(18, -42), - "4" = list(34, 3), - "8" = list(-32, -34) - ) - - FPW = new - FPW.allowed_seat = VEHICLE_SUPPORT_GUNNER_TWO - V.add_hardpoint(FPW) - FPW.dir = turn(V.dir, -90) - FPW.name = "Right "+ initial(FPW.name) - FPW.origins = list(-2, 0) - FPW.muzzle_flash_pos = list( - "1" = list(16, 14), - "2" = list(-18, -42), - "4" = list(34, -34), - "8" = list(-32, 2) - ) - -/obj/effect/vehicle_spawner/apc/Initialize() - . = ..() - spawn_vehicle() - qdel(src) - -//PRESET: FPWs, no hardpoints -/obj/effect/vehicle_spawner/apc/spawn_vehicle() - var/obj/vehicle/multitile/apc/APC = new (loc) - - load_misc(APC) - load_fpw(APC) - load_hardpoints(APC) - handle_direction(APC) - APC.update_icon() - -//PRESET: FPWs, wheels installed -/obj/effect/vehicle_spawner/apc/plain/load_hardpoints(obj/vehicle/multitile/apc/V) - V.add_hardpoint(new /obj/item/hardpoint/locomotion/apc_wheels) - -//PRESET: default hardpoints, destroyed (this one spawns on VASRS elevatorfor VCs) -/obj/effect/vehicle_spawner/apc/decrepit/spawn_vehicle() - var/obj/vehicle/multitile/apc/APC = new (loc) - - load_misc(APC) - load_fpw(APC) - load_hardpoints(APC) - handle_direction(APC) - load_damage(APC) - APC.update_icon() - -/obj/effect/vehicle_spawner/apc/decrepit/load_hardpoints(obj/vehicle/multitile/apc/V) - V.add_hardpoint(new /obj/item/hardpoint/primary/dualcannon) - V.add_hardpoint(new /obj/item/hardpoint/secondary/frontalcannon) - V.add_hardpoint(new /obj/item/hardpoint/support/flare_launcher) - V.add_hardpoint(new /obj/item/hardpoint/locomotion/apc_wheels) - -//PRESET: FPWs, default hardpoints -/obj/effect/vehicle_spawner/apc/fixed/load_hardpoints(obj/vehicle/multitile/apc/V) - V.add_hardpoint(new /obj/item/hardpoint/primary/dualcannon) - V.add_hardpoint(new /obj/item/hardpoint/secondary/frontalcannon) - V.add_hardpoint(new /obj/item/hardpoint/support/flare_launcher) - V.add_hardpoint(new /obj/item/hardpoint/locomotion/apc_wheels) - -//Transport version without FPWs - -/obj/vehicle/multitile/apc/unarmed - interior_map = /datum/map_template/interior/apc_no_fpw - -//PRESET: no hardpoints -/obj/effect/vehicle_spawner/apc/unarmed/spawn_vehicle() - var/obj/vehicle/multitile/apc/unarmed/APC = new (loc) - - load_misc(APC) - load_hardpoints(APC) - handle_direction(APC) - APC.update_icon() - -/obj/effect/vehicle_spawner/apc/unarmed/load_hardpoints(obj/vehicle/multitile/apc/V) - return - -//PRESET: default hardpoints, destroyed -/obj/effect/vehicle_spawner/apc/unarmed/decrepit/spawn_vehicle() - var/obj/vehicle/multitile/apc/unarmed/APC = new (loc) - - load_misc(APC) - load_hardpoints(APC) - handle_direction(APC) - load_damage(APC) - APC.update_icon() - -/obj/effect/vehicle_spawner/apc/unarmed/decrepit/load_hardpoints(obj/vehicle/multitile/apc/V) - V.add_hardpoint(new /obj/item/hardpoint/primary/dualcannon) - V.add_hardpoint(new /obj/item/hardpoint/secondary/frontalcannon) - V.add_hardpoint(new /obj/item/hardpoint/support/flare_launcher) - V.add_hardpoint(new /obj/item/hardpoint/locomotion/apc_wheels) - -//PRESET: no FPWs, wheels installed -/obj/effect/vehicle_spawner/apc/unarmed/plain/load_hardpoints(obj/vehicle/multitile/apc/unarmed/V) - V.add_hardpoint(new /obj/item/hardpoint/locomotion/apc_wheels) - -//PRESET: default hardpoints -/obj/effect/vehicle_spawner/apc/unarmed/fixed/load_hardpoints(obj/vehicle/multitile/apc/unarmed/V) - V.add_hardpoint(new /obj/item/hardpoint/primary/dualcannon) - V.add_hardpoint(new /obj/item/hardpoint/secondary/frontalcannon) - V.add_hardpoint(new /obj/item/hardpoint/support/flare_launcher) - V.add_hardpoint(new /obj/item/hardpoint/locomotion/apc_wheels) diff --git a/code/modules/vehicles/apc/apc_command.dm b/code/modules/vehicles/apc/apc_command.dm index c5bd55928362..8df78ba6a55d 100644 --- a/code/modules/vehicles/apc/apc_command.dm +++ b/code/modules/vehicles/apc/apc_command.dm @@ -98,6 +98,7 @@ add_verb(M.client, list( /obj/vehicle/multitile/proc/toggle_door_lock, /obj/vehicle/multitile/proc/activate_horn, + /obj/vehicle/multitile/proc/use_megaphone, )) else if(seat == VEHICLE_GUNNER) add_verb(M.client, list( @@ -119,6 +120,7 @@ remove_verb(M.client, list( /obj/vehicle/multitile/proc/toggle_door_lock, /obj/vehicle/multitile/proc/activate_horn, + /obj/vehicle/multitile/proc/use_megaphone, )) else if(seat == VEHICLE_GUNNER) remove_verb(M.client, list( @@ -200,54 +202,3 @@ return FALSE */ - -/* -** PRESETS SPAWNERS -*/ -/obj/effect/vehicle_spawner/apc_cmd - name = "APC CMD Spawner" - icon = 'icons/obj/vehicles/apc.dmi' - icon_state = "apc_base_com" - pixel_x = -48 - pixel_y = -48 - -/obj/effect/vehicle_spawner/apc_cmd/Initialize() - . = ..() - spawn_vehicle() - qdel(src) - -//PRESET: no hardpoints -/obj/effect/vehicle_spawner/apc_cmd/spawn_vehicle() - var/obj/vehicle/multitile/apc/command/APC = new (loc) - - load_misc(APC) - load_hardpoints(APC) - handle_direction(APC) - APC.update_icon() - -//PRESET: only wheels installed -/obj/effect/vehicle_spawner/apc_cmd/plain/load_hardpoints(obj/vehicle/multitile/apc/command/V) - V.add_hardpoint(new /obj/item/hardpoint/locomotion/apc_wheels) - -//PRESET: default hardpoints, destroyed -/obj/effect/vehicle_spawner/apc_cmd/decrepit/spawn_vehicle() - var/obj/vehicle/multitile/apc/command/APC = new (loc) - - load_misc(APC) - handle_direction(APC) - load_hardpoints(APC) - load_damage(APC) - APC.update_icon() - -/obj/effect/vehicle_spawner/apc_cmd/decrepit/load_hardpoints(obj/vehicle/multitile/apc/command/V) - V.add_hardpoint(new /obj/item/hardpoint/primary/dualcannon) - V.add_hardpoint(new /obj/item/hardpoint/secondary/frontalcannon) - V.add_hardpoint(new /obj/item/hardpoint/support/flare_launcher) - V.add_hardpoint(new /obj/item/hardpoint/locomotion/apc_wheels) - -//PRESET: default hardpoints -/obj/effect/vehicle_spawner/apc_cmd/fixed/load_hardpoints(obj/vehicle/multitile/apc/command/V) - V.add_hardpoint(new /obj/item/hardpoint/primary/dualcannon) - V.add_hardpoint(new /obj/item/hardpoint/secondary/frontalcannon) - V.add_hardpoint(new /obj/item/hardpoint/support/flare_launcher) - V.add_hardpoint(new /obj/item/hardpoint/locomotion/apc_wheels) diff --git a/code/modules/vehicles/apc/apc_medical.dm b/code/modules/vehicles/apc/apc_medical.dm index f8809bedaa73..f6ede307809d 100644 --- a/code/modules/vehicles/apc/apc_medical.dm +++ b/code/modules/vehicles/apc/apc_medical.dm @@ -54,6 +54,7 @@ add_verb(M.client, list( /obj/vehicle/multitile/proc/toggle_door_lock, /obj/vehicle/multitile/proc/activate_horn, + /obj/vehicle/multitile/proc/use_megaphone, )) else if(seat == VEHICLE_GUNNER) add_verb(M.client, list( @@ -75,6 +76,7 @@ remove_verb(M.client, list( /obj/vehicle/multitile/proc/toggle_door_lock, /obj/vehicle/multitile/proc/activate_horn, + /obj/vehicle/multitile/proc/use_megaphone, )) else if(seat == VEHICLE_GUNNER) remove_verb(M.client, list( @@ -94,54 +96,3 @@ camera.c_tag = "#[rand(1,100)] M777 MED APC" if(camera_int) camera_int.c_tag = camera.c_tag + " interior" - -/* -** PRESETS SPAWNERS -*/ -/obj/effect/vehicle_spawner/apc_med - name = "APC MED Spawner" - icon = 'icons/obj/vehicles/apc.dmi' - icon_state = "apc_base_med" - pixel_x = -48 - pixel_y = -48 - -/obj/effect/vehicle_spawner/apc_med/Initialize() - . = ..() - spawn_vehicle() - qdel(src) - -//PRESET: no hardpoints -/obj/effect/vehicle_spawner/apc_med/spawn_vehicle() - var/obj/vehicle/multitile/apc/medical/APC = new (loc) - - load_misc(APC) - load_hardpoints(APC) - handle_direction(APC) - APC.update_icon() - -//PRESET: only wheels installed -/obj/effect/vehicle_spawner/apc_med/plain/load_hardpoints(obj/vehicle/multitile/apc/medical/V) - V.add_hardpoint(new /obj/item/hardpoint/locomotion/apc_wheels) - -//PRESET: default hardpoints, destroyed -/obj/effect/vehicle_spawner/apc_med/decrepit/spawn_vehicle() - var/obj/vehicle/multitile/apc/medical/APC = new (loc) - - load_misc(APC) - load_hardpoints(APC) - handle_direction(APC) - load_damage(APC) - APC.update_icon() - -/obj/effect/vehicle_spawner/apc_med/decrepit/load_hardpoints(obj/vehicle/multitile/apc/medical/V) - V.add_hardpoint(new /obj/item/hardpoint/primary/dualcannon) - V.add_hardpoint(new /obj/item/hardpoint/secondary/frontalcannon) - V.add_hardpoint(new /obj/item/hardpoint/support/flare_launcher) - V.add_hardpoint(new /obj/item/hardpoint/locomotion/apc_wheels) - -//PRESET: default hardpoints -/obj/effect/vehicle_spawner/apc_med/fixed/load_hardpoints(obj/vehicle/multitile/apc/medical/V) - V.add_hardpoint(new /obj/item/hardpoint/primary/dualcannon) - V.add_hardpoint(new /obj/item/hardpoint/secondary/frontalcannon) - V.add_hardpoint(new /obj/item/hardpoint/support/flare_launcher) - V.add_hardpoint(new /obj/item/hardpoint/locomotion/apc_wheels) diff --git a/code/modules/vehicles/hardpoints/hardpoint_ammo/primary_flamer_ammo.dm b/code/modules/vehicles/hardpoints/hardpoint_ammo/primary_flamer_ammo.dm index def6016f0759..6ea59389be70 100644 --- a/code/modules/vehicles/hardpoints/hardpoint_ammo/primary_flamer_ammo.dm +++ b/code/modules/vehicles/hardpoints/hardpoint_ammo/primary_flamer_ammo.dm @@ -6,7 +6,7 @@ w_class = SIZE_LARGE max_rounds = 60 gun_type = /obj/item/hardpoint/primary/flamer - default_ammo = /datum/ammo/flamethrower/tank_flamer + default_ammo = /datum/ammo/flamethrower/tank_flamer/buffed /obj/item/ammo_magazine/hardpoint/primary_flamer/update_icon() if(current_rounds > 0) diff --git a/code/modules/vehicles/hardpoints/hardpoint_ammo/tow_ammo.dm b/code/modules/vehicles/hardpoints/hardpoint_ammo/tow_ammo.dm index 59a5a18bb1fa..04ab384e26d6 100644 --- a/code/modules/vehicles/hardpoints/hardpoint_ammo/tow_ammo.dm +++ b/code/modules/vehicles/hardpoints/hardpoint_ammo/tow_ammo.dm @@ -5,6 +5,6 @@ caliber = "rocket" //correlates to any rocket mags icon_state = "quad_rocket" w_class = SIZE_LARGE - default_ammo = /datum/ammo/rocket/ap + default_ammo = /datum/ammo/rocket/ap/tank max_rounds = 5 gun_type = /obj/item/hardpoint/secondary/towlauncher diff --git a/code/modules/vehicles/hardpoints/primary/flamer.dm b/code/modules/vehicles/hardpoints/primary/flamer.dm index 929842df2307..9e94968a3d20 100644 --- a/code/modules/vehicles/hardpoints/primary/flamer.dm +++ b/code/modules/vehicles/hardpoints/primary/flamer.dm @@ -8,7 +8,7 @@ activation_sounds = list('sound/weapons/vehicles/flamethrower.ogg') health = 400 - cooldown = 20 + cooldown = 25 accuracy = 0.75 firing_arc = 90 diff --git a/code/modules/vehicles/hardpoints/primary/primary.dm b/code/modules/vehicles/hardpoints/primary/primary.dm index d6be1c37a4db..d235009dfc34 100644 --- a/code/modules/vehicles/hardpoints/primary/primary.dm +++ b/code/modules/vehicles/hardpoints/primary/primary.dm @@ -4,6 +4,8 @@ slot = HDPT_PRIMARY + hdpt_layer = HDPT_LAYER_PRIMARY_GUN + damage_multiplier = 0.15 activatable = TRUE diff --git a/code/modules/vehicles/hardpoints/secondary/secondary.dm b/code/modules/vehicles/hardpoints/secondary/secondary.dm index 6c5b7f54aeca..60ea97d5c84e 100644 --- a/code/modules/vehicles/hardpoints/secondary/secondary.dm +++ b/code/modules/vehicles/hardpoints/secondary/secondary.dm @@ -4,6 +4,8 @@ slot = HDPT_SECONDARY + hdpt_layer = HDPT_LAYER_SECONDARY_GUN + damage_multiplier = 0.125 activatable = TRUE diff --git a/code/modules/vehicles/interior/interactable/seats.dm b/code/modules/vehicles/interior/interactable/seats.dm index 3e298ba48f1a..b9e99c59e5e5 100644 --- a/code/modules/vehicles/interior/interactable/seats.dm +++ b/code/modules/vehicles/interior/interactable/seats.dm @@ -53,7 +53,10 @@ return vehicle.set_seated_mob(seat, M) if(M && M.client) - M.client.change_view(8, vehicle) + if(istype(vehicle, /obj/vehicle/multitile/tank)) + M.client.change_view(9, vehicle) + else + M.client.change_view(8, vehicle) /obj/structure/bed/chair/comfy/vehicle/clicked(mob/user, list/mods) // If you're buckled, you can shift-click on the seat in order to return to camera-view if(user == buckled_mob && mods["shift"] && !user.is_mob_incapacitated()) @@ -189,6 +192,8 @@ if(istype(vehicle, /obj/vehicle/multitile/apc)) var/obj/vehicle/multitile/apc/APC = vehicle M.client.change_view(APC.gunner_view_buff, vehicle) + else if(istype(vehicle, /obj/vehicle/multitile/tank)) + M.client.change_view(9, vehicle) else M.client.change_view(8, vehicle) diff --git a/code/modules/vehicles/multitile/multitile.dm b/code/modules/vehicles/multitile/multitile.dm index 9e4d2c9d297b..eb1985e5fd03 100644 --- a/code/modules/vehicles/multitile/multitile.dm +++ b/code/modules/vehicles/multitile/multitile.dm @@ -26,7 +26,7 @@ var/atom/movable/vehicle_light_holder/lighting_holder - var/vehicle_light_range = 5 + var/vehicle_light_range = 7 var/vehicle_light_power = 2 //Yay! Working cameras in the vehicles at last!! @@ -35,6 +35,8 @@ var/nickname //used for single-use verb to name the vehicle. Put anything here to prevent naming + var/next_shout = 0 //to prevent spamming + var/honk_sound = 'sound/vehicles/honk_4_light.ogg' var/next_honk = 0 //to prevent spamming @@ -175,17 +177,6 @@ rotate_entrances(angle_to_turn) rotate_bounds(angle_to_turn) - if(bound_width > world.icon_size || bound_height > world.icon_size) - lighting_holder = new(src) - lighting_holder.set_light_range(vehicle_light_range) - lighting_holder.set_light_power(vehicle_light_power) - lighting_holder.set_light_on(vehicle_light_range || vehicle_light_power) - else if(light_range) - set_light_on(TRUE) - - light_pixel_x = -bound_x - light_pixel_y = -bound_y - healthcheck() update_icon() @@ -200,6 +191,20 @@ interior = new(src) INVOKE_ASYNC(src, PROC_REF(do_create_interior)) +/obj/vehicle/multitile/New() + . = ..() + if(bound_width > world.icon_size || bound_height > world.icon_size) + lighting_holder = new(src) + lighting_holder.set_light_flags(LIGHT_ATTACHED) + lighting_holder.set_light_range(vehicle_light_range) + lighting_holder.set_light_power(vehicle_light_power) + lighting_holder.set_light_on(vehicle_light_range || vehicle_light_power) + else if(light_range) + set_light_on(TRUE) + + light_pixel_x = -bound_x + light_pixel_y = -bound_y + /obj/vehicle/multitile/proc/do_create_interior() interior.create_interior(interior_map) @@ -214,6 +219,8 @@ QDEL_NULL_LIST(hardpoints) + QDEL_NULL(lighting_holder) + GLOB.all_multi_vehicles -= src return ..() @@ -240,25 +247,28 @@ var/amt_hardpoints = LAZYLEN(hardpoints) if(amt_hardpoints) - var/list/hardpoint_images[amt_hardpoints] - var/list/C[HDPT_LAYER_MAX] + var/list/hardpoint_images = list() - // Counting sort the images into a list so we get the hardpoint images sorted by layer for(var/obj/item/hardpoint/H in hardpoints) - C[H.hdpt_layer] += 1 - - for(var/i = 2 to HDPT_LAYER_MAX) - C[i] += C[i-1] - - for(var/obj/item/hardpoint/H in hardpoints) - hardpoint_images[C[H.hdpt_layer]] = H.get_hardpoint_image() - C[H.hdpt_layer] -= 1 - - for(var/i = 1 to amt_hardpoints) - var/image/I = hardpoint_images[i] + hardpoint_images[H.get_hardpoint_image()] = H.hdpt_layer + + for(var/k = hardpoint_images.len, k > 0, k--) + for(var/j = 1, j < k, j++) + if(hardpoint_images[hardpoint_images[j]] > hardpoint_images[hardpoint_images[j+1]]) + hardpoint_images.Swap(j, j+1) + + for(var/i in hardpoint_images) + if(islist(i)) + for(var/l in i) + var/image/P = l + if(istype(P)) + P.layer = layer + (hardpoint_images[i]*0.1) + overlays += P + continue + var/image/I = i // get_hardpoint_image() can return a list of images if(istype(I)) - I.layer = layer + (i*0.1) + I.layer = layer + (hardpoint_images[i]*0.1) overlays += I if(clamped) @@ -382,57 +392,12 @@ toggle_cameras_status() handle_all_modules_broken() - //vehicle is dead, no more lights - if(health <= 0 && lighting_holder.light_range) - lighting_holder.set_light_on(FALSE) + if(lighting_holder) + //vehicle is dead, no more lights + if (health <= 0) lighting_holder.set_light_on(FALSE) + else lighting_holder.set_light_on(TRUE) update_icon() -/* -** PRESETS SPAWNERS -*/ -//These help spawning vehicles that don't end up as subtypes, causing problems later with various checks -//as well as allowing customizations, like properly turning on mapped in direction and so on. - -/obj/effect/vehicle_spawner - name = "Vehicle Spawner" - -//Main proc which handles spawning and adding hardpoints/damaging the vehicle -/obj/effect/vehicle_spawner/proc/spawn_vehicle() - return - -//Installation of modules kit -/obj/effect/vehicle_spawner/proc/load_hardpoints(obj/vehicle/multitile/V) - return - -//Miscellaneous additions -/obj/effect/vehicle_spawner/proc/load_misc(obj/vehicle/multitile/V) - - V.load_role_reserved_slots() - V.initialize_cameras() - //transfer mapped in edits - if(color) - V.color = color - if(name != initial(name)) - V.name = name - if(desc) - V.desc = desc - -//Dealing enough damage to destroy the vehicle -/obj/effect/vehicle_spawner/proc/load_damage(obj/vehicle/multitile/V) - V.take_damage_type(1e8, "abstract") - V.take_damage_type(1e8, "abstract") - V.healthcheck() - -/obj/effect/vehicle_spawner/proc/handle_direction(obj/vehicle/multitile/M) - switch(dir) - if(EAST) - M.try_rotate(90) - if(WEST) - M.try_rotate(-90) - if(NORTH) - M.try_rotate(90) - M.try_rotate(90) - /obj/vehicle/multitile/get_applying_acid_time() return 3 SECONDS diff --git a/code/modules/vehicles/multitile/multitile_hardpoints.dm b/code/modules/vehicles/multitile/multitile_hardpoints.dm index 2c5a343b802a..ab9f017d67ea 100644 --- a/code/modules/vehicles/multitile/multitile_hardpoints.dm +++ b/code/modules/vehicles/multitile/multitile_hardpoints.dm @@ -103,7 +103,10 @@ if(HDPT_SECONDARY) num_delays = 3 if(HDPT_SUPPORT) num_delays = 2 if(HDPT_ARMOR) num_delays = 10 - if(HDPT_TREADS, HDPT_WHEELS) num_delays = 7 + if(HDPT_TREADS, HDPT_WHEELS) + num_delays = 7 + //now reset the movement timer + next_move = world.time if(!do_after(user, 30*num_delays * user.get_skill_duration_multiplier(SKILL_ENGINEER), INTERRUPT_ALL, BUSY_ICON_FRIENDLY, numticks = num_delays)) user.visible_message(SPAN_WARNING("[user] stops installing \the [HP] on \the [src]."), SPAN_WARNING("You stop installing \the [HP] on \the [src].")) diff --git a/code/modules/vehicles/multitile/multitile_interaction.dm b/code/modules/vehicles/multitile/multitile_interaction.dm index 42b141327bd8..f980fa66792f 100644 --- a/code/modules/vehicles/multitile/multitile_interaction.dm +++ b/code/modules/vehicles/multitile/multitile_interaction.dm @@ -196,6 +196,7 @@ return health = min(health + max_hp/100 * (5 / amount_fixed_adjustment), max_hp) + healthcheck() if(WT) WT.remove_fuel(1, user) diff --git a/code/modules/vehicles/multitile/multitile_verbs.dm b/code/modules/vehicles/multitile/multitile_verbs.dm index c7dd29bbf0a9..cc785dcd3410 100644 --- a/code/modules/vehicles/multitile/multitile_verbs.dm +++ b/code/modules/vehicles/multitile/multitile_verbs.dm @@ -342,6 +342,63 @@ if(honk_sound) playsound(loc, honk_sound, 75, TRUE, 15) //heard within ~15 tiles +//Megaphone gaming +/obj/vehicle/multitile/proc/use_megaphone() + set name = "Use Megaphone" + set desc = "Let's you shout a message to peoples around the vehicle." + set category = "Vehicle" + + var/mob/living/user = usr + if(user.client) + if(user.client?.prefs?.muted & MUTE_IC) + to_chat(src, SPAN_DANGER("You cannot speak in IC (muted).")) + return + if(!ishumansynth_strict(user)) + to_chat(user, SPAN_DANGER("You don't know how to use this!")) + return + if(user.silent) + return + + var/obj/vehicle/multitile/V = user.interactee + if(!istype(V)) + return + + var/seat + for(var/vehicle_seat in V.seats) + if(V.seats[vehicle_seat] == user) + seat = vehicle_seat + break + if(!seat) + return + + if(world.time < V.next_shout) + to_chat(user, SPAN_WARNING("You need to wait [(V.next_shout - world.time) / 10] seconds.")) + return + + 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 vehicle megaphone to say: >[message]<") + + if(!user.is_mob_incapacitated()) + var/list/mob/listeners = get_mobs_in_view(9,V) + var/list/mob/langchat_long_listeners = list() + for(var/mob/listener in listeners) + if(!ishumansynth_strict(listener) && !isobserver(listener)) + listener.show_message("[V] broadcasts something, but you can't understand it.") + continue + listener.show_message("[V] broadcasts, [FONT_SIZE_LARGE("\"[message]\"")]", SHOW_MESSAGE_AUDIBLE) // 2 stands for hearable message + langchat_long_listeners += listener + V.langchat_long_speech(message, langchat_long_listeners, user.get_default_language()) + + V.next_shout = world.time + 10 SECONDS + //Support gunner verbs /obj/vehicle/multitile/proc/reload_firing_port_weapon() diff --git a/code/modules/vehicles/spawners/apc.dm b/code/modules/vehicles/spawners/apc.dm new file mode 100644 index 000000000000..f9c48fd4587c --- /dev/null +++ b/code/modules/vehicles/spawners/apc.dm @@ -0,0 +1,79 @@ +/* +** PRESETS SPAWNERS +*/ +/obj/effect/vehicle_spawner/apc + name = "APC Transport Spawner" + icon = 'icons/obj/vehicles/apc.dmi' + icon_state = "apc_base" + pixel_x = -48 + pixel_y = -48 + spawn_type = /obj/vehicle/multitile/apc + +/obj/effect/vehicle_spawner/apc/load_misc(obj/vehicle/multitile/V) + . = ..() + load_fpw(V) + +//PRESET: default hardpoints +/obj/effect/vehicle_spawner/apc/load_hardpoints(obj/vehicle/multitile/V) + V.add_hardpoint(new /obj/item/hardpoint/primary/dualcannon) + V.add_hardpoint(new /obj/item/hardpoint/secondary/frontalcannon) + V.add_hardpoint(new /obj/item/hardpoint/support/flare_launcher) + V.add_hardpoint(new /obj/item/hardpoint/locomotion/apc_wheels) + +//PRESET: only wheels +/obj/effect/vehicle_spawner/apc/wheels_only/load_hardpoints(obj/vehicle/multitile/V) + V.add_hardpoint(new /obj/item/hardpoint/locomotion/apc_wheels) + +//PRESET: default hardpoints, destroyed +/obj/effect/vehicle_spawner/apc/decrepit + spawn_damaged = TRUE + +/obj/vehicle/multitile/apc/nofpw + interior_map = /datum/map_template/interior/apc_no_fpw + +//PRESET: no FPWs, default hardpoints +/obj/effect/vehicle_spawner/apc/nofpw + spawn_type = /obj/vehicle/multitile/apc/nofpw + +/obj/effect/vehicle_spawner/apc/nofpw/load_fpw(obj/vehicle/multitile/apc/V) + return + +//PRESET: no FPWs, default hardpoints, destroyed +/obj/effect/vehicle_spawner/apc/nofpw/decrepit + spawn_damaged = TRUE + +//PRESET: no FPWs, only wheels +/obj/effect/vehicle_spawner/apc/nofpw/wheels_only/load_hardpoints(obj/vehicle/multitile/V) + V.add_hardpoint(new /obj/item/hardpoint/locomotion/apc_wheels) + +//PRESET: no FPWs, no hardpoints +/obj/effect/vehicle_spawner/apc/nofpw/unarmed/load_hardpoints(obj/vehicle/multitile/V) + return + +//Installation of transport APC Firing Ports Weapons +/obj/effect/vehicle_spawner/apc/proc/load_fpw(obj/vehicle/multitile/apc/V) + var/obj/item/hardpoint/special/firing_port_weapon/FPW = new + FPW.allowed_seat = VEHICLE_SUPPORT_GUNNER_ONE + V.add_hardpoint(FPW) + FPW.dir = turn(V.dir, 90) + FPW.name = "Left "+ initial(FPW.name) + FPW.origins = list(2, 0) + FPW.muzzle_flash_pos = list( + "1" = list(-18, 14), + "2" = list(18, -42), + "4" = list(34, 3), + "8" = list(-32, -34) + ) + + FPW = new + FPW.allowed_seat = VEHICLE_SUPPORT_GUNNER_TWO + V.add_hardpoint(FPW) + FPW.dir = turn(V.dir, -90) + FPW.name = "Right "+ initial(FPW.name) + FPW.origins = list(-2, 0) + FPW.muzzle_flash_pos = list( + "1" = list(16, 14), + "2" = list(-18, -42), + "4" = list(34, -34), + "8" = list(-32, 2) + ) diff --git a/code/modules/vehicles/spawners/apc_cmd.dm b/code/modules/vehicles/spawners/apc_cmd.dm new file mode 100644 index 000000000000..54189a954d75 --- /dev/null +++ b/code/modules/vehicles/spawners/apc_cmd.dm @@ -0,0 +1,21 @@ +/* +** PRESETS SPAWNERS +*/ +/obj/effect/vehicle_spawner/apc/cmd + name = "APC CMD Spawner" + icon = 'icons/obj/vehicles/apc.dmi' + icon_state = "apc_base_com" + pixel_x = -48 + pixel_y = -48 + spawn_type = /obj/vehicle/multitile/apc/command + +/obj/effect/vehicle_spawner/apc/cmd/load_fpw(obj/vehicle/multitile/apc/V) + return + +//PRESET: only wheels +/obj/effect/vehicle_spawner/apc/cmd/wheels_only/load_hardpoints(obj/vehicle/multitile/V) + V.add_hardpoint(new /obj/item/hardpoint/locomotion/apc_wheels) + +//PRESET: default hardpoints, destroyed +/obj/effect/vehicle_spawner/apc/cmd/decrepit + spawn_damaged = TRUE diff --git a/code/modules/vehicles/spawners/apc_med.dm b/code/modules/vehicles/spawners/apc_med.dm new file mode 100644 index 000000000000..75f3246c4ec7 --- /dev/null +++ b/code/modules/vehicles/spawners/apc_med.dm @@ -0,0 +1,21 @@ +/* +** PRESETS SPAWNERS +*/ +/obj/effect/vehicle_spawner/apc/med + name = "APC MED Spawner" + icon = 'icons/obj/vehicles/apc.dmi' + icon_state = "apc_base_med" + pixel_x = -48 + pixel_y = -48 + spawn_type = /obj/vehicle/multitile/apc/medical + +/obj/effect/vehicle_spawner/apc/med/load_fpw(obj/vehicle/multitile/apc/V) + return + +//PRESET: only wheels +/obj/effect/vehicle_spawner/apc/med/wheels_only/load_hardpoints(obj/vehicle/multitile/V) + V.add_hardpoint(new /obj/item/hardpoint/locomotion/apc_wheels) + +//PRESET: default hardpoints, destroyed +/obj/effect/vehicle_spawner/apc/med/decrepit + spawn_damaged = TRUE diff --git a/code/modules/vehicles/spawners/tank.dm b/code/modules/vehicles/spawners/tank.dm new file mode 100644 index 000000000000..f7c100155578 --- /dev/null +++ b/code/modules/vehicles/spawners/tank.dm @@ -0,0 +1,63 @@ +/* +** PRESETS SPAWNERS +*/ +/obj/effect/vehicle_spawner/tank + name = "Tank Spawner" + icon = 'icons/obj/vehicles/tank.dmi' + icon_state = "tank_base" + pixel_x = -48 + pixel_y = -48 + spawn_type = /obj/vehicle/multitile/tank + +//PRESET: default hardpoints +/obj/effect/vehicle_spawner/tank/load_hardpoints(obj/vehicle/multitile/V) + V.add_hardpoint(new /obj/item/hardpoint/support/artillery_module) + V.add_hardpoint(new /obj/item/hardpoint/armor/paladin) + V.add_hardpoint(new /obj/item/hardpoint/locomotion/treads) + V.add_hardpoint(new /obj/item/hardpoint/holder/tank_turret) + for(var/obj/item/hardpoint/holder/tank_turret/TT in V.hardpoints) + TT.add_hardpoint(new /obj/item/hardpoint/primary/cannon) + TT.add_hardpoint(new /obj/item/hardpoint/secondary/m56cupola) + break + +//PRESET: only threads, empty turret +/obj/effect/vehicle_spawner/tank/plain/load_hardpoints(obj/vehicle/multitile/V) + V.add_hardpoint(new /obj/item/hardpoint/holder/tank_turret) + V.add_hardpoint(new /obj/item/hardpoint/locomotion/treads) + +//PRESET: default hardpoints, destroyed +/obj/effect/vehicle_spawner/tank/decrepit + spawn_damaged = TRUE + +//PRESET: minigun kit +/obj/effect/vehicle_spawner/tank/minigun/load_hardpoints(obj/vehicle/multitile/V) + V.add_hardpoint(new /obj/item/hardpoint/support/weapons_sensor) + V.add_hardpoint(new /obj/item/hardpoint/armor/ballistic) + V.add_hardpoint(new /obj/item/hardpoint/locomotion/treads) + V.add_hardpoint(new /obj/item/hardpoint/holder/tank_turret) + for(var/obj/item/hardpoint/holder/tank_turret/TT in V.hardpoints) + TT.add_hardpoint(new /obj/item/hardpoint/primary/minigun) + TT.add_hardpoint(new /obj/item/hardpoint/secondary/small_flamer) + break + +//PRESET: dragon flamer kit +/obj/effect/vehicle_spawner/tank/flamer/load_hardpoints(obj/vehicle/multitile/V) + V.add_hardpoint(new /obj/item/hardpoint/support/overdrive_enhancer) + V.add_hardpoint(new /obj/item/hardpoint/armor/ballistic) + V.add_hardpoint(new /obj/item/hardpoint/locomotion/treads) + V.add_hardpoint(new /obj/item/hardpoint/holder/tank_turret) + for(var/obj/item/hardpoint/holder/tank_turret/TT in V.hardpoints) + TT.add_hardpoint(new /obj/item/hardpoint/primary/flamer) + TT.add_hardpoint(new /obj/item/hardpoint/secondary/grenade_launcher) + break + +//PRESET: autocannon kit +/obj/effect/vehicle_spawner/tank/autocannon/load_hardpoints(obj/vehicle/multitile/V) + V.add_hardpoint(new /obj/item/hardpoint/support/artillery_module) + V.add_hardpoint(new /obj/item/hardpoint/armor/ballistic) + V.add_hardpoint(new /obj/item/hardpoint/locomotion/treads) + V.add_hardpoint(new /obj/item/hardpoint/holder/tank_turret) + for(var/obj/item/hardpoint/holder/tank_turret/TT in V.hardpoints) + TT.add_hardpoint(new /obj/item/hardpoint/primary/autocannon) + TT.add_hardpoint(new /obj/item/hardpoint/secondary/towlauncher) + break diff --git a/code/modules/vehicles/spawners/van.dm b/code/modules/vehicles/spawners/van.dm new file mode 100644 index 000000000000..02cff3dfe41a --- /dev/null +++ b/code/modules/vehicles/spawners/van.dm @@ -0,0 +1,19 @@ +/* +** PRESETS SPAWNERS +*/ + +/obj/effect/vehicle_spawner/van + name = "Van Spawner" + icon = 'icons/obj/vehicles/van.dmi' + icon_state = "van_base" + pixel_x = -16 + pixel_y = -16 + spawn_type = /obj/vehicle/multitile/van + +//PRESET: wheels +/obj/effect/vehicle_spawner/van/load_hardpoints(obj/vehicle/multitile/V) + V.add_hardpoint(new /obj/item/hardpoint/locomotion/van_wheels) + +//PRESET: wheels, destroyed +/obj/effect/vehicle_spawner/van/decrepit + spawn_damaged = TRUE diff --git a/code/modules/vehicles/spawners/vehicle.dm b/code/modules/vehicles/spawners/vehicle.dm new file mode 100644 index 000000000000..ac5b016c3a56 --- /dev/null +++ b/code/modules/vehicles/spawners/vehicle.dm @@ -0,0 +1,60 @@ +/* +** PRESETS SPAWNERS +*/ +//These help spawning vehicles that don't end up as subtypes, causing problems later with various checks +//as well as allowing customizations, like properly turning on mapped in direction and so on. + +/obj/effect/vehicle_spawner + name = "Vehicle Spawner" + var/spawn_type = /obj/vehicle/multitile + var/spawn_damaged = FALSE + +/obj/effect/vehicle_spawner/Initialize() + . = ..() + spawn_vehicle() + return INITIALIZE_HINT_QDEL + +//Main proc which handles spawning and adding hardpoints/damaging the vehicle +/obj/effect/vehicle_spawner/proc/spawn_vehicle() + var/obj/vehicle/multitile/V = new spawn_type(loc) + + load_hardpoints(V) + load_misc(V) + if(spawn_damaged) + deal_damage(V) + handle_direction(V) + V.update_icon() + return V + +//Installation of modules kit +/obj/effect/vehicle_spawner/proc/load_hardpoints(obj/vehicle/multitile/V) + return + +//Miscellaneous additions +/obj/effect/vehicle_spawner/proc/load_misc(obj/vehicle/multitile/V) + + V.load_role_reserved_slots() + V.initialize_cameras() + //transfer mapped in edits + if(color) + V.color = color + if(name != initial(name)) + V.name = name + if(desc) + V.desc = desc + +//Dealing enough damage to destroy the vehicle +/obj/effect/vehicle_spawner/proc/deal_damage(obj/vehicle/multitile/V) + V.take_damage_type(1e8, "abstract") + V.take_damage_type(1e8, "abstract") + V.healthcheck() + +/obj/effect/vehicle_spawner/proc/handle_direction(obj/vehicle/multitile/M) + switch(dir) + if(EAST) + M.try_rotate(90) + if(WEST) + M.try_rotate(-90) + if(NORTH) + M.try_rotate(90) + M.try_rotate(90) diff --git a/code/modules/vehicles/tank/tank.dm b/code/modules/vehicles/tank/tank.dm index ad69f80cdfb6..56ed21969e8e 100644 --- a/code/modules/vehicles/tank/tank.dm +++ b/code/modules/vehicles/tank/tank.dm @@ -21,6 +21,8 @@ revivable_dead_slots = 2 xenos_slots = 4 + wall_ram_damage = 360 + entrances = list( "back" = list(0, 2) ) @@ -36,11 +38,10 @@ move_momentum_build_factor = 1.8 move_turn_momentum_loss_factor = 0.6 - vehicle_light_range = 7 - // Rest (all the guns) is handled by the tank turret hardpoint hardpoints_allowed = list( /obj/item/hardpoint/holder/tank_turret, + /obj/item/hardpoint/holder/tank_turret/flares, /obj/item/hardpoint/support/weapons_sensor, /obj/item/hardpoint/support/overdrive_enhancer, /obj/item/hardpoint/support/artillery_module, @@ -110,6 +111,7 @@ add_verb(M.client, list( /obj/vehicle/multitile/proc/toggle_door_lock, /obj/vehicle/multitile/proc/activate_horn, + /obj/vehicle/multitile/proc/use_megaphone, )) else if(seat == VEHICLE_GUNNER) add_verb(M.client, list( @@ -133,6 +135,7 @@ remove_verb(M.client, list( /obj/vehicle/multitile/proc/toggle_door_lock, /obj/vehicle/multitile/proc/activate_horn, + /obj/vehicle/multitile/proc/use_megaphone, )) else if(seat == VEHICLE_GUNNER) remove_verb(M.client, list( @@ -164,103 +167,3 @@ update_icon() return TRUE - -/* -** PRESETS SPAWNERS -*/ -/obj/effect/vehicle_spawner/tank - name = "Tank Spawner" - icon = 'icons/obj/vehicles/tank.dmi' - icon_state = "tank_base" - pixel_x = -48 - pixel_y = -48 - -/obj/effect/vehicle_spawner/tank/Initialize() - . = ..() - spawn_vehicle() - qdel(src) - -//PRESET: turret, no hardpoints (not the one without turret for convenience, you still expect to have turret when you spawn "no hardpoints tank") -/obj/effect/vehicle_spawner/tank/spawn_vehicle() - var/obj/vehicle/multitile/tank/TANK = new (loc) - - load_misc(TANK) - load_hardpoints(TANK) - handle_direction(TANK) - TANK.update_icon() - -/obj/effect/vehicle_spawner/tank/load_hardpoints(obj/vehicle/multitile/tank/V) - V.add_hardpoint(new /obj/item/hardpoint/holder/tank_turret) - -//PRESET: turret, treads installed -/obj/effect/vehicle_spawner/tank/plain/load_hardpoints(obj/vehicle/multitile/tank/V) - V.add_hardpoint(new /obj/item/hardpoint/holder/tank_turret) - V.add_hardpoint(new /obj/item/hardpoint/locomotion/treads) - -//PRESET: no hardpoints -/obj/effect/vehicle_spawner/tank/hull/load_hardpoints(obj/vehicle/multitile/tank/V) - return - -//PRESET: default hardpoints, destroyed -/obj/effect/vehicle_spawner/tank/decrepit/spawn_vehicle() - var/obj/vehicle/multitile/tank/TANK = new (loc) - - load_misc(TANK) - handle_direction(TANK) - load_hardpoints(TANK) - load_damage(TANK) - TANK.update_icon() - -/obj/effect/vehicle_spawner/tank/decrepit/load_hardpoints(obj/vehicle/multitile/tank/V) - V.add_hardpoint(new /obj/item/hardpoint/support/artillery_module) - V.add_hardpoint(new /obj/item/hardpoint/armor/paladin) - V.add_hardpoint(new /obj/item/hardpoint/locomotion/treads) - V.add_hardpoint(new /obj/item/hardpoint/holder/tank_turret) - for(var/obj/item/hardpoint/holder/tank_turret/TT in V.hardpoints) - TT.add_hardpoint(new /obj/item/hardpoint/primary/cannon) - TT.add_hardpoint(new /obj/item/hardpoint/secondary/m56cupola) - break - -//PRESET: default hardpoints -/obj/effect/vehicle_spawner/tank/fixed/load_hardpoints(obj/vehicle/multitile/tank/V) - V.add_hardpoint(new /obj/item/hardpoint/support/artillery_module) - V.add_hardpoint(new /obj/item/hardpoint/armor/paladin) - V.add_hardpoint(new /obj/item/hardpoint/locomotion/treads) - V.add_hardpoint(new /obj/item/hardpoint/holder/tank_turret) - for(var/obj/item/hardpoint/holder/tank_turret/TT in V.hardpoints) - TT.add_hardpoint(new /obj/item/hardpoint/primary/cannon) - TT.add_hardpoint(new /obj/item/hardpoint/secondary/m56cupola) - break - -//PRESET: minigun kit -/obj/effect/vehicle_spawner/tank/fixed/minigun/load_hardpoints(obj/vehicle/multitile/tank/V) - V.add_hardpoint(new /obj/item/hardpoint/support/weapons_sensor) - V.add_hardpoint(new /obj/item/hardpoint/armor/ballistic) - V.add_hardpoint(new /obj/item/hardpoint/locomotion/treads) - V.add_hardpoint(new /obj/item/hardpoint/holder/tank_turret) - for(var/obj/item/hardpoint/holder/tank_turret/TT in V.hardpoints) - TT.add_hardpoint(new /obj/item/hardpoint/primary/minigun) - TT.add_hardpoint(new /obj/item/hardpoint/secondary/small_flamer) - break - -//PRESET: dragon flamer kit -/obj/effect/vehicle_spawner/tank/fixed/flamer/load_hardpoints(obj/vehicle/multitile/tank/V) - V.add_hardpoint(new /obj/item/hardpoint/support/overdrive_enhancer) - V.add_hardpoint(new /obj/item/hardpoint/armor/ballistic) - V.add_hardpoint(new /obj/item/hardpoint/locomotion/treads) - V.add_hardpoint(new /obj/item/hardpoint/holder/tank_turret) - for(var/obj/item/hardpoint/holder/tank_turret/TT in V.hardpoints) - TT.add_hardpoint(new /obj/item/hardpoint/primary/flamer) - TT.add_hardpoint(new /obj/item/hardpoint/secondary/grenade_launcher) - break - -//PRESET: autocannon kit -/obj/effect/vehicle_spawner/tank/fixed/autocannon/load_hardpoints(obj/vehicle/multitile/tank/V) - V.add_hardpoint(new /obj/item/hardpoint/support/artillery_module) - V.add_hardpoint(new /obj/item/hardpoint/armor/ballistic) - V.add_hardpoint(new /obj/item/hardpoint/locomotion/treads) - V.add_hardpoint(new /obj/item/hardpoint/holder/tank_turret) - for(var/obj/item/hardpoint/holder/tank_turret/TT in V.hardpoints) - TT.add_hardpoint(new /obj/item/hardpoint/primary/autocannon) - TT.add_hardpoint(new /obj/item/hardpoint/secondary/towlauncher) - break diff --git a/colonialmarines.dme b/colonialmarines.dme index 07d6a2710262..96b3b17bcc57 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -715,6 +715,7 @@ s// DM Environment file for colonialmarines.dme. #include "code\game\jobs\job\command\auxiliary\intel.dm" #include "code\game\jobs\job\command\auxiliary\pilot.dm" #include "code\game\jobs\job\command\auxiliary\senior.dm" +#include "code\game\jobs\job\command\auxiliary\tankcrew.dm" #include "code\game\jobs\job\command\cic\captain.dm" #include "code\game\jobs\job\command\cic\executive.dm" #include "code\game\jobs\job\command\cic\staffofficer.dm" @@ -1836,6 +1837,7 @@ s// DM Environment file for colonialmarines.dme. #include "code\modules\mob\living\carbon\human\species\working_joe\question.dm" #include "code\modules\mob\living\carbon\human\species\working_joe\quip.dm" #include "code\modules\mob\living\carbon\human\species\working_joe\restricted_area.dm" +#include "code\modules\mob\living\carbon\human\species\working_joe\russian.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" @@ -2360,6 +2362,12 @@ s// DM Environment file for colonialmarines.dme. #include "code\modules\vehicles\multitile\multitile_interaction.dm" #include "code\modules\vehicles\multitile\multitile_movement.dm" #include "code\modules\vehicles\multitile\multitile_verbs.dm" +#include "code\modules\vehicles\spawners\apc.dm" +#include "code\modules\vehicles\spawners\apc_cmd.dm" +#include "code\modules\vehicles\spawners\apc_med.dm" +#include "code\modules\vehicles\spawners\tank.dm" +#include "code\modules\vehicles\spawners\van.dm" +#include "code\modules\vehicles\spawners\vehicle.dm" #include "code\modules\vehicles\tank\interior.dm" #include "code\modules\vehicles\tank\tank.dm" #include "code\modules\vehicles\van\interior.dm" @@ -2368,6 +2376,28 @@ s// DM Environment file for colonialmarines.dme. #include "code\modules\vox\vox_tgui.dm" #include "code\modules\vox\vox_sounds\vox.dm" #include "code\modules\vox\vox_sounds\vox_military.dm" +#include "fray-marines\code\__DEFINES\xeno.dm" +#include "fray-marines\code\cm_tech\techs\marine\tier2\tank.dm" +#include "fray-marines\code\datums\skills.dm" +#include "fray-marines\code\datums\supply_packs\gear.dm" +#include "fray-marines\code\game\jobs\command\auxiliary\mech_crew.dm" +#include "fray-marines\code\game\objects\items\storage\pouch.dm" +#include "fray-marines\code\game\objects\items\weapons\st_equip.dm" +#include "fray-marines\code\game\objects\items\weapons\st_hammer_stacks.dm" +#include "fray-marines\code\modules\cm_aliens\structures\lessers_burrow.dm" +#include "fray-marines\code\modules\cm_aliens\structures\special_structure.dm" +#include "fray-marines\code\modules\gear_presets\usmc.dm" +#include "fray-marines\code\modules\mob\living\carbon\xenomorph\Abilities.dm" +#include "fray-marines\code\modules\mob\living\carbon\xenomorph\resin_constructions.dm" +#include "fray-marines\code\modules\mob\living\simple_animal\hostile\alien.dm" +#include "fray-marines\code\modules\mob\living\simple_animal\hostile\alien\tearer.dm" +#include "fray-marines\code\modules\mob\living\simple_animal\hostile\alien\trooper.dm" +#include "fray-marines\code\modules\projectiles\ammo_datums.dm" +#include "fray-marines\code\modules\vehicles\hardpoints_walker.dm" +#include "fray-marines\code\modules\vehicles\walker.dm" +#include "fray-marines\code\modules\vehicles\walker_vendor.dm" +#include "fray-marines\code\modules\vehicles\hardpoints\holder\tank_turret.dm" +#include "fray-marines\code\modules\vehicles\hardpoints\support\smoke.dm" #include "interface\fonts.dm" #include "interface\interface.dm" #include "interface\skin.dmf" diff --git a/fray-marines/code/__DEFINES/xeno.dm b/fray-marines/code/__DEFINES/xeno.dm new file mode 100644 index 000000000000..d52f1588f987 --- /dev/null +++ b/fray-marines/code/__DEFINES/xeno.dm @@ -0,0 +1,13 @@ +#define XENO_AI_DAMAGE_TIER_1 10 * XENO_UNIVERSAL_DAMAGEMULT +#define XENO_AI_DAMAGE_TIER_2 15 * XENO_UNIVERSAL_DAMAGEMULT +#define XENO_AI_DAMAGE_TIER_3 20 * XENO_UNIVERSAL_DAMAGEMULT + +#define XENO_AI_SPECIAL_ATTACK_PROBABILITY 20 + +#define XENO_AI_SPEED_TIER_1 3 +#define XENO_AI_SPEED_TIER_2 2 + +#define XENO_LESSER_BURROW_AMOUNT 5 +#define XENO_LESSER_BURROW_SPAWN_QUEUE_TIME 5 SECONDS +#define XENO_LESSER_BURROW_SPAWN_TIME 15 MINUTES +#define XENO_LESSER_BURROW_MIN_DISTANCE 15 diff --git a/fray-marines/code/cm_tech/techs/marine/tier2/tank.dm b/fray-marines/code/cm_tech/techs/marine/tier2/tank.dm new file mode 100644 index 000000000000..40d4ea9f136b --- /dev/null +++ b/fray-marines/code/cm_tech/techs/marine/tier2/tank.dm @@ -0,0 +1,19 @@ +/datum/tech/repeatable/tank_points + name = "Tank Budget Increase" + icon_state = "budget_ds" + desc = "Distributes resources to the tank fabricator." + + announce_name = "ALMAYER SPECIAL ASSETS AUTHORIZED" + announce_message = "Additional tank part fabricator points have been authorised for this operation." + + required_points = 15 + increase_per_purchase = 1 + + flags = TREE_FLAG_MARINE + tier = /datum/tier/two + + var/points_to_give = 1000 + +/datum/tech/repeatable/tank_points/on_unlock() + . = ..() + supply_controller.tank_points += points_to_give diff --git a/fray-marines/code/cm_tech/techs/marine/tier2/walker.dm b/fray-marines/code/cm_tech/techs/marine/tier2/walker.dm new file mode 100644 index 000000000000..7c536665be1d --- /dev/null +++ b/fray-marines/code/cm_tech/techs/marine/tier2/walker.dm @@ -0,0 +1,19 @@ +/datum/tech/repeatable/walker_points + name = "Walker Budget Increase" + icon_state = "budget_ds" + desc = "Distributes resources to the walker fabricator." + + announce_name = "ALMAYER SPECIAL ASSETS AUTHORIZED" + announce_message = "Additional walker part fabricator points have been authorised for this operation." + + required_points = 10 + increase_per_purchase = 1 + + flags = TREE_FLAG_MARINE + tier = /datum/tier/two + + var/points_to_give = 5 + +/datum/tech/repeatable/walker_points/on_unlock() + . = ..() + supply_controller.mech_points += points_to_give diff --git a/fray-marines/code/datums/skills.dm b/fray-marines/code/datums/skills.dm new file mode 100644 index 000000000000..b5153d722200 --- /dev/null +++ b/fray-marines/code/datums/skills.dm @@ -0,0 +1,11 @@ + +/datum/skills/mech_pilot + name = "Mech Crewman" + skills = list( + SKILL_VEHICLE = SKILL_VEHICLE_SMALL, + SKILL_LEADERSHIP = SKILL_LEAD_EXPERT, + SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, + SKILL_JTAC = SKILL_JTAC_EXPERT, + ) diff --git a/fray-marines/code/datums/supply_packs/gear.dm b/fray-marines/code/datums/supply_packs/gear.dm new file mode 100644 index 000000000000..1b42b0ad91bf --- /dev/null +++ b/fray-marines/code/datums/supply_packs/gear.dm @@ -0,0 +1,9 @@ +/datum/supply_packs/backpack_rto + contains = list( + /obj/item/storage/backpack/marine/satchel/rto, + ) + name = "USCM Radio Telephone Pack" + cost = 30 + containertype = /obj/structure/closet/crate/supply + containername = "USCM Radio Telephone Pack (x1)" + group = "Gear" diff --git a/fray-marines/code/game/jobs/command/auxiliary/mech_crew.dm b/fray-marines/code/game/jobs/command/auxiliary/mech_crew.dm new file mode 100644 index 000000000000..3bac3cfb2bab --- /dev/null +++ b/fray-marines/code/game/jobs/command/auxiliary/mech_crew.dm @@ -0,0 +1,19 @@ + +/datum/job/command/walker + title = JOB_WALKER + total_positions = 1 + spawn_positions = 1 + allow_additional = 1 + scaled = 0 + flags_startup_parameters = ROLE_ADD_TO_DEFAULT + gear_preset = /datum/equipment_preset/uscm/walker + entry_message_body = "Your job is to operate and maintain thee ship's combat walkers. While you are an officer, your authority is limited to your own vehicle." + +AddTimelock(/datum/job/command/walker, list( + JOB_SQUAD_ROLES = 2 HOURS, + JOB_ENGINEER_ROLES = 2 HOURS +)) + +/obj/effect/landmark/start/mech_crew + name = JOB_CREWMAN + job = /datum/job/command/walker diff --git a/fray-marines/code/game/objects/items/storage/pouch.dm b/fray-marines/code/game/objects/items/storage/pouch.dm new file mode 100644 index 000000000000..82d15686a8c1 --- /dev/null +++ b/fray-marines/code/game/objects/items/storage/pouch.dm @@ -0,0 +1,8 @@ +/obj/item/storage/pouch/autoinjector/full/skillless/fill_preset_inventory() + new /obj/item/reagent_container/hypospray/autoinjector/bicaridine/skillless(src) + new /obj/item/reagent_container/hypospray/autoinjector/bicaridine/skillless(src) + new /obj/item/reagent_container/hypospray/autoinjector/kelotane/skillless(src) + new /obj/item/reagent_container/hypospray/autoinjector/kelotane/skillless(src) + new /obj/item/reagent_container/hypospray/autoinjector/tramadol/skillless(src) + new /obj/item/reagent_container/hypospray/autoinjector/tramadol/skillless(src) + new /obj/item/reagent_container/hypospray/autoinjector/emergency(src) diff --git a/fray-marines/code/game/objects/items/weapons/st_equip.dm b/fray-marines/code/game/objects/items/weapons/st_equip.dm new file mode 100644 index 000000000000..ae611be2c203 --- /dev/null +++ b/fray-marines/code/game/objects/items/weapons/st_equip.dm @@ -0,0 +1,128 @@ +/obj/item/weapon/twohanded/st_hammer + name = "N45 battle hammer" + desc = "RIP AND TEAR." + icon = 'icons/obj/items/experimental_tools.dmi' + icon_state = "d2_breacher" + item_state = "d2_breacher" + pickup_sound = "gunequip" + force = MELEE_FORCE_STRONG + flags_item = TWOHANDED + force_wielded = MELEE_FORCE_TIER_8 + throwforce = MELEE_FORCE_NORMAL + w_class = SIZE_LARGE + sharp = IS_SHARP_ITEM_BIG + flags_equip_slot = SLOT_WAIST|SLOT_BACK + unacidable = TRUE + indestructible = TRUE + + throw_range = 3 + attack_speed = 12 + + var/speed_penalty = 0.7 + var/retrieval_slot = WEAR_WAIST + +/obj/item/weapon/twohanded/st_hammer/attack(mob/M, mob/user) + if(!skillcheck(user, SKILL_SPEC_WEAPONS, SKILL_SPEC_ALL) && user.skills.get_skill_level(SKILL_SPEC_WEAPONS) != SKILL_SPEC_ST) + to_chat(user, SPAN_HIGHDANGER("[src] is too heavy for you to use!")) + return + ..(M, user) + + if(!isxeno(M)) + return + + if(flags_item & WIELDED) + var/datum/effects/hammer_stacks/HS = null + for (var/datum/effects/hammer_stacks/hammer_stacks in M.effects_list) + HS = hammer_stacks + break + + if (HS == null) + HS = new /datum/effects/hammer_stacks(M) + HS.increment_stack_count(1, user) + + if(M.stat != CONSCIOUS) // haha xeno-cricket + HS.increment_stack_count(4, user) + +/obj/item/weapon/twohanded/st_hammer/pickup(mob/user) + RegisterSignal(user, COMSIG_HUMAN_POST_MOVE_DELAY, PROC_REF(handle_movedelay)) + ..() + +/obj/item/weapon/twohanded/st_hammer/proc/handle_movedelay(mob/living/M, list/movedata) + SIGNAL_HANDLER + movedata["move_delay"] += speed_penalty + +/obj/item/weapon/twohanded/st_hammer/dropped(mob/user, silent) + . = ..() + UnregisterSignal(user, COMSIG_HUMAN_POST_MOVE_DELAY) + var/mob/living/carbon/human/H = user + if(!istype(H)) + return + if(H.belt == null && istype(H.wear_suit, /obj/item/clothing/suit/storage/marine/M40)) + addtimer(CALLBACK(src, PROC_REF(retrieve_to_slot), H, retrieval_slot), 0.3 SECONDS, TIMER_UNIQUE|TIMER_NO_HASH_WAIT) + +/obj/item/weapon/twohanded/st_hammer/retrieve_to_slot(mob/living/carbon/human/user, retrieval_slot) + if (!loc || !user) + return FALSE + if (get_dist(src,user) > 1) + return FALSE + ..(user, retrieval_slot) + +/obj/item/weapon/shield/montage + name = "N30 montage shield" + desc = "A shield adept at blocking blunt objects from connecting with the torso of the shield wielder." + icon = 'fray-marines/icons/mob/human/st_equip.dmi' + icon_state = "metal_st" + item_icons = list( + WEAR_L_HAND = 'fray-marines/icons/mob/human/items_lefthand_1.dmi', + WEAR_R_HAND = 'fray-marines/icons/mob/human/items_righthand_1.dmi', + WEAR_BACK = 'fray-marines/icons/mob/human/back.dmi' + ) + attack_verb = list("shoved", "bashed") + pickup_sound = "gunequip" + passive_block = 70 + readied_block = 100 + throw_range = 4 + flags_equip_slot = SLOT_BACK + force = MELEE_FORCE_TIER_1 + throwforce = MELEE_FORCE_TIER_1 + w_class = SIZE_LARGE + unacidable = TRUE + indestructible = TRUE + var/blocks_on_back = TRUE + var/retrieval_slot = WEAR_BACK + var/cooldown = 0 //shield bash cooldown. based on world.time + +/obj/item/weapon/shield/montage/IsShield() + return TRUE + +/obj/item/weapon/shield/montage/attackby(obj/item/W as obj, mob/user as mob) + if(istype(W, /obj/item/weapon)) + if(cooldown < world.time - 25) + user.visible_message("[user] bashes [src] with [W]!") + playsound(user.loc, 'sound/effects/bang-bang.ogg', 25, FALSE) + cooldown = world.time + else + ..() + +/obj/item/weapon/shield/montage/dropped(mob/user, silent) + . = ..() + var/mob/living/carbon/human/H = user + if(!istype(H)) + return + if(H.back == null && istype(H.wear_suit, /obj/item/clothing/suit/storage/marine/M40)) + addtimer(CALLBACK(src, PROC_REF(retrieve_to_slot), H, retrieval_slot), 0.3 SECONDS, TIMER_UNIQUE|TIMER_NO_HASH_WAIT) + +/obj/item/weapon/shield/montage/retrieve_to_slot(mob/living/carbon/human/user, retrieval_slot) + if (!loc || !user) + return FALSE + if (get_dist(src,user) > 1) + return FALSE + ..(user, retrieval_slot) + + +/obj/item/weapon/shield/montage/marine + name = "N30-2 standard defensive shield" + desc = "A heavy shield adept at blocking blunt or sharp objects from connecting with the shield wielder." + icon_state = "marine_shield" + passive_block = 45 + readied_block = 80 diff --git a/fray-marines/code/game/objects/items/weapons/st_hammer_stacks.dm b/fray-marines/code/game/objects/items/weapons/st_hammer_stacks.dm new file mode 100644 index 000000000000..bfc9b886b69c --- /dev/null +++ b/fray-marines/code/game/objects/items/weapons/st_hammer_stacks.dm @@ -0,0 +1,83 @@ +/datum/effects/hammer_stacks + effect_name = "Stormtrooper hammer combo stack" + duration = null + flags = INF_DURATION // We always clean ourselves up + + var/stack_count = 1 + var/max_stacks = 4 + var/last_decrement_time = 0 + var/time_between_decrements = 40 + var/last_increment_time = 0 + var/increment_grace_time = 50 + var/combo_sound = 'sound/effects/alien_tail_swipe2.ogg' + var/combo_hit_sound = 'sound/effects/slam1.ogg' + +/datum/effects/hammer_stacks/New(mob/living/carbon/xenomorph/X, mob/from = null, last_dmg_source = null, zone = "chest") + last_decrement_time = world.time + last_increment_time = world.time + . = ..(X, from, last_dmg_source, zone) + +/datum/effects/hammer_stacks/validate_atom(mob/living/carbon/xenomorph/X) + if (!isxeno(X)) + return FALSE + + return ..() + +/datum/effects/hammer_stacks/process_mob() + . = ..() + if (!isxeno(affected_atom)) + return + + if (last_decrement_time + time_between_decrements < world.time && !(last_increment_time + increment_grace_time > world.time)) + stack_count-- + last_decrement_time = world.time + + if (stack_count <= 0) + qdel(src) + return + + // TODO: добавить оверлей на ксене + +/datum/effects/hammer_stacks/Destroy() + if (!isxeno(affected_atom)) + return ..() + + // TODO: впилить удаление оверлея + + return ..() + +/datum/effects/hammer_stacks/proc/increment_stack_count(increment_number = 1, mob/living/carbon/human/attacker) + stack_count = min(max_stacks, stack_count + increment_number) + + if (!isxeno(affected_atom)) + return + + var/mob/living/carbon/xenomorph/X = affected_atom + // TODO: добавить оверлей на ксене + + last_increment_time = world.time + var/throw_range = 1 + + if (prob(25)) X.emote("roar") + + if (stack_count > 1) X.AdjustSlow(3) + if (stack_count > 2) X.AdjustSuperslow(2) + if (stack_count > 3) + playsound(attacker, combo_sound, 85, 1) + playsound(X, combo_hit_sound, 45, 1) + attacker.spin_circle(1, 1.5) + + shake_camera(X, 1, 4) + if (X.mob_size >= MOB_SIZE_IMMOBILE && X.stat != DEAD) + X.apply_effect(2, SUPERSLOW) + qdel(src) + return + + if (X.stat != DEAD) + attacker.apply_effect(1, STUN) + + X.apply_effect(2, WEAKEN) + if (!X.anchored) + var/turf/throw_to = get_step_away(X, attacker) + X.throw_atom(throw_to, throw_range) + qdel(src) diff --git a/fray-marines/code/modules/cm_aliens/structures/lessers_burrow.dm b/fray-marines/code/modules/cm_aliens/structures/lessers_burrow.dm new file mode 100644 index 000000000000..e164c8d536a9 --- /dev/null +++ b/fray-marines/code/modules/cm_aliens/structures/lessers_burrow.dm @@ -0,0 +1,134 @@ +/obj/structure/lessers_burrow + name = "tunnel" + desc = "A tunnel entrance. Looks like it was dug by some kind of clawed beast." + icon = 'icons/mob/xenos/effects.dmi' + icon_state = "hole" + + density = FALSE + opacity = FALSE + anchored = TRUE + unslashable = TRUE + unacidable = TRUE + layer = RESIN_STRUCTURE_LAYER + plane = FLOOR_PLANE + + var/hivenumber = XENO_HIVE_NORMAL + var/datum/hive_status/hive + var/last_spawning = 0 + var/spawn_cooldown = XENO_LESSER_BURROW_SPAWN_TIME + + health = 140 + var/id = null //For mapping + +/obj/structure/lessers_burrow/Initialize(mapload, h_number) + . = ..() + var/turf/L = get_turf(src) + + if(h_number && GLOB.hive_datum[h_number]) + hivenumber = h_number + hive = GLOB.hive_datum[h_number] + + set_hive_data(src, h_number) + + if(!hive) + hive = GLOB.hive_datum[hivenumber] + + var/obj/effect/alien/resin/trap/resin_trap = locate() in L + if(resin_trap) + qdel(resin_trap) + + handle_spawning() + +/obj/structure/lessers_burrow/proc/handle_spawning() + last_spawning = world.time + visible_message(SPAN_WARNING("[src] starts rumbling!")) + for(var/i = 1; i <= XENO_LESSER_BURROW_AMOUNT; i++) + addtimer(CALLBACK(src, PROC_REF(spawn_alien)), XENO_LESSER_BURROW_SPAWN_QUEUE_TIME * i) + +/obj/structure/lessers_burrow/proc/spawn_alien() + if(prob(10)) + new /mob/living/simple_animal/hostile/alien/spawnable/tearer(get_turf(src)) + return + new /mob/living/simple_animal/hostile/alien/spawnable/trooper(get_turf(src)) + +/obj/structure/lessers_burrow/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) + else if (user.a_intent != INTENT_HARM) + user.visible_message(SPAN_NOTICE("[user] knocks in the [src]"), SPAN_NOTICE("You knock in the [src].")) + + if (last_spawning + spawn_cooldown <= world.time) + handle_spawning() + + return + + return ..() + return attack_alien(user) + +/obj/structure/lessers_burrow/attack_larva(mob/living/carbon/xenomorph/M) + . = attack_alien(M) + +/obj/structure/lessers_burrow/attack_alien(mob/living/carbon/xenomorph/M) + if(!istype(M) || M.stat || M.lying) + return XENO_NO_DELAY_ACTION + + if(!isfriendly(M)) + if(M.mob_size < MOB_SIZE_BIG) + to_chat(M, SPAN_XENOWARNING("You aren't large enough to collapse this tunnel!")) + return XENO_NO_DELAY_ACTION + + M.visible_message(SPAN_XENODANGER("[M] begins to fill [src] with dirt."),\ + SPAN_XENONOTICE("You begin to fill [src] with dirt using your massive claws."), max_distance = 3) + xeno_attack_delay(M) + + if(!do_after(M, 10 SECONDS, INTERRUPT_ALL, BUSY_ICON_HOSTILE, src, INTERRUPT_ALL_OUT_OF_RANGE, max_dist = 1)) + to_chat(M, SPAN_XENOWARNING("You decide not to cave the tunnel in.")) + return XENO_NO_DELAY_ACTION + + src.visible_message(SPAN_XENODANGER("[src] caves in!"), max_distance = 3) + qdel(src) + + return XENO_NO_DELAY_ACTION + + if (last_spawning + spawn_cooldown <= world.time) + M.visible_message(SPAN_WARNING("[M] made few knocks on [src]"), SPAN_XENONOTICE("You call your lesser sisters")) + handle_spawning() + else + to_chat(M, SPAN_XENOWARNING("It's not time yet! New lesser sisters will arrive in [((last_spawning + spawn_cooldown) - world.time) / 600] minutes!")) + return XENO_NO_DELAY_ACTION + +/obj/structure/lessers_burrow/proc/isfriendly(mob/target) + var/mob/living/carbon/C = target + if(istype(C) && C.ally_of_hivenumber(hivenumber)) + return TRUE + + return FALSE + +/obj/structure/lessers_burrow/proc/healthcheck() + if(health <= 0) + visible_message(SPAN_DANGER("[src] suddenly collapses!")) + qdel(src) + +/obj/structure/lessers_burrow/bullet_act(obj/projectile/Proj) + return FALSE + +/obj/structure/lessers_burrow/ex_act(severity) + health -= severity/2 + healthcheck() diff --git a/fray-marines/code/modules/cm_aliens/structures/special_structure.dm b/fray-marines/code/modules/cm_aliens/structures/special_structure.dm new file mode 100644 index 000000000000..64c83847a170 --- /dev/null +++ b/fray-marines/code/modules/cm_aliens/structures/special_structure.dm @@ -0,0 +1,189 @@ +/obj/structure/alien + name = "alien building" + desc = "Building that's alien" + icon = 'fray-marines/icons/obj/structures/alien/Buildings.dmi' + icon_state = "sunken" + density = TRUE + pixel_x = -16 + + // var/xeno_tag = null //see misc.dm + + health = 500 + var/maxHealth = 500 + + var/dying = 0 + var/last_heal = 0 + var/heal = 40 + var/datum/hive_status/hive + +/obj/structure/alien/Initialize() + . = ..() + START_PROCESSING(SSobj, src) + hive = GLOB.hive_datum[XENO_HIVE_NORMAL] + +/obj/structure/alien/Destroy() + . = ..() + STOP_PROCESSING(SSobj, src) + +/obj/structure/alien/flamer_fire_act() + health -= 50 + healthcheck() + +/obj/structure/alien/process(delta_time) + if(dying) + if(locate(/obj/effect/alien/weeds) in src.loc) + dying = 0 + health = max(0, health-(25 * delta_time)) + if(health <= 0) + die() + return ..() + if(health > maxHealth) + health = maxHealth + if(!(locate(/obj/effect/alien/weeds) in src.loc)) + dying = 1 + + update_icon() + + if(world.time >= last_heal + heal && health < maxHealth && !dying) + health += 5 //slowly regenerate on weed + last_heal = world.time + return 1 + +/obj/structure/alien/ex_act(severity) + switch(severity) + if(1) + die() + if(2,3) + health -= rand(200 * (4-severity)) + healthcheck() + +/obj/structure/alien/bullet_act(obj/projectile/P) + health -= max(0, P.damage) + bullet_ping(P) + healthcheck() + +/obj/structure/alien/proc/healthcheck() + if(health <= 0) + die() + return + if(health>=maxHealth) + health = maxHealth + +/obj/structure/alien/proc/die() + visible_message("[src] explodes into bloody gore!") + xgibs(src.loc) + qdel(src) + +/obj/structure/alien/attack_alien(mob/living/carbon/xenomorph/M) + if(islarva(M)) //Larvae can't do shit + return + + if(M.a_intent == INTENT_HELP) + return XENO_NO_DELAY_ACTION + else + M.animation_attack_on(src) + M.visible_message(SPAN_XENONOTICE("\The [M] claws \the [src]!"), \ + SPAN_XENONOTICE("You claw \the [src].")) + if(istype(src, /obj/effect/alien/resin/sticky)) + playsound(loc, "alien_resin_move", 25) + else + playsound(loc, "alien_resin_break", 25) + + health -= (M.melee_damage_upper + 50) //Beef up the damage a bit + healthcheck() + return XENO_ATTACK_ACTION + +//Sunken Colony +/obj/structure/alien/sunken + name = "Sunken Colony" + desc = "A living stationary organism that strikes from below with its powerful claw." + pixel_y = -8 + + var/cooldown = 6 SECONDS + var/can_attack = 1 + + // xeno_tag = SUNKEN_COLONY + +/obj/structure/alien/sunken/update_icon() + if(health <= maxHealth/2) + icon_state = "s_weak" + else + icon_state = "sunken" + +/obj/structure/alien/sunken/process() + . = ..() + if(!.) + return + + if(!can_attack) + return + + var/turf/target = get_target() + + if (!target) + return + + process_cooldown() + strike(target) + +/obj/structure/alien/sunken/proc/get_target() + var/list/targets = list() + + for(var/atom/movable/targ in orange(8, src)) + var/turf/T = get_turf(targ) + if(!T.can_dig_xeno_tunnel() || !is_ground_level(T.z) || get_dist(src, T) <= 3) + continue + if(ishuman(targ)) + var/mob/living/carbon/human/H = targ + if(locate(/obj/item/alien_embryo) in H) + continue + if(!H.stat) + targets += T + + if (targets.len > 0) + return pick(targets) + + return null + +/obj/structure/alien/sunken/proc/strike(turf/target) + if(!istype(target)) + return 0 + if(!target) + return 0 + + visible_message("[src] is about to strike!") + flick("s_hitting",src) + + var/obj/effect/impaler/I = new /obj/effect/impaler(target) + addtimer(CALLBACK(I, PROC_REF(strike)), 1 SECONDS) + addtimer(CALLBACK(src, PROC_REF(process_cooldown)), cooldown) + + return 1 + +/obj/structure/alien/sunken/proc/process_cooldown() + can_attack = !can_attack + +/obj/effect/impaler + name = "impaling chitin" + icon = 'fray-marines/icons/obj/structures/alien/Buildings.dmi' + icon_state = "s_incoming" + var/damage = 120 + +/obj/effect/impaler/Initialize(mapload, ...) + . = ..() + visible_message(SPAN_HIGHDANGER("Ground starts to rumble!")) + playsound(loc, "alien_bite", 25, 1) + +/obj/effect/impaler/proc/strike() + icon_state = "strike" + for(var/mob/living/carbon/human/L in src.loc) + to_chat(L, "You've been hit by [src] from below!") + var/obj/limb/affecting = L.get_limb(pick("r_leg", "l_leg")) + var/armor = L.getarmor_organ(affecting, ARMOR_MELEE) + var/damage_result = armor_damage_reduction(GLOB.marine_melee, damage, armor, 0) + L.apply_damage(damage_result, BRUTE, affecting, 0) //This should slicey dicey + L.updatehealth() + + playsound(loc, "alien_bite", 25, 1) + + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(qdel), src), 5) diff --git a/fray-marines/code/modules/gear_presets/usmc.dm b/fray-marines/code/modules/gear_presets/usmc.dm new file mode 100644 index 000000000000..cce995d75769 --- /dev/null +++ b/fray-marines/code/modules/gear_presets/usmc.dm @@ -0,0 +1,57 @@ + +/datum/equipment_preset/uscm/walker + name = "USCM Mech Crewman (MO) (Cryo)" + flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE + + access = list( + ACCESS_MARINE_PREP, + ACCESS_MARINE_WALKER, + ACCESS_MARINE_ALPHA, + ACCESS_MARINE_BRAVO, + ACCESS_MARINE_CHARLIE, + ACCESS_MARINE_DELTA, + ACCESS_MARINE_ENGINEERING, + ACCESS_MARINE_ENGPREP + ) + assignment = JOB_WALKER + rank = JOB_WALKER + paygrade = "ME4" + role_comm_title = "CRMN" + minimum_age = 30 + skills = /datum/skills/mech_pilot + + minimap_icon = "vc" + +/datum/equipment_preset/uscm/walker/load_gear(mob/living/carbon/human/new_human) + var/back_item = /obj/item/storage/backpack/marine/satchel + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) + back_item = /obj/item/storage/backpack/marine + + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/vc(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/tanker/walker(new_human), WEAR_BODY) + 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/clothing/suit/storage/jacket/marine/service/tanker, WEAR_JACKET) + +/datum/equipment_preset/uscm/walker/load_status() + return + +/obj/item/clothing/under/marine/officer/tanker/walker + name = "mech operator uniform" +// icon = 'fray-marines/icons/obj/mechpilot.dmi' +// icon_state = "mecha_uniform" +// worn_state = "marine_tanker" + +/obj/item/clothing/head/helmet/marine/tech/tanker/walker + name = "\improper M50 walker helmet" + desc = "The lightweight M50 walker helmet is designed for use by armored crewmen in the USCM. It offers low weight protection, and allows agile movement inside the confines of an armored vehicle. Features a toggleable welding screen for eye protection." +// icon = 'fray-marines/icons/obj/mechpilot.dmi' +// icon_state = "mecha_helmet" +// worn_state = "tanker_helmet" + +/obj/item/clothing/suit/storage/marine/tanker/walker + name = "\improper M3 pattern walker armor" + desc = "A modified and refashioned suit of M3 Pattern armor designed to be worn by the loader of a USCM vehicle crew. While the suit is a bit more encumbering to wear with the crewman uniform, it offers the loader a degree of protection that would otherwise not be enjoyed." +// icon = 'fray-marines/icons/obj/mechpilot.dmi' +// icon_state = "mecha_armor" +// worn_state = "tanker" diff --git a/fray-marines/code/modules/mob/living/carbon/xenomorph/Abilities.dm b/fray-marines/code/modules/mob/living/carbon/xenomorph/Abilities.dm new file mode 100644 index 000000000000..ed4d7f54c3ab --- /dev/null +++ b/fray-marines/code/modules/mob/living/carbon/xenomorph/Abilities.dm @@ -0,0 +1,99 @@ +/datum/action/xeno_action/onclick/build_lessers_burrow + name = "Dig Lesser's burrow (200)" + action_icon_state = "build_tunnel" + plasma_cost = 200 + // macro_path = /datum/action/xeno_action/verb/verb_dig_tunnel + action_type = XENO_ACTION_ACTIVATE //doesn't really need a macro + +/datum/action/xeno_action/onclick/build_lessers_burrow/can_use_action() + if(!owner) + return FALSE + var/mob/living/carbon/xenomorph/X = owner + if(!istype(X)) + return FALSE + if(X.tunnel_delay) + return FALSE + return ..() + +/datum/action/xeno_action/onclick/build_lessers_burrow/use_ability(atom/A) + var/mob/living/carbon/xenomorph/X = owner + if(!X.check_state()) + return + + if(X.action_busy) + to_chat(X, SPAN_XENOWARNING("You should finish up what you're doing before digging.")) + return + + var/turf/T = X.loc + if(!istype(T)) //logic + to_chat(X, SPAN_XENOWARNING("You can't do that from there.")) + return + + if(SSticker?.mode?.hardcore) + to_chat(X, SPAN_XENOWARNING("A certain presence is preventing you from digging tunnels here.")) + return + + if(!T.can_dig_xeno_tunnel() || !is_ground_level(T.z)) + to_chat(X, SPAN_XENOWARNING("You scrape around, but you can't seem to dig through that kind of floor.")) + return + + if(locate(/obj/structure/tunnel) in X.loc || locate(/obj/structure/lessers_burrow) in X.loc) + to_chat(X, SPAN_XENOWARNING("There already is a tunnel here.")) + return + + if(X.tunnel_delay) + to_chat(X, SPAN_XENOWARNING("You are not ready to dig a tunnel again.")) + return + + if(X.get_active_hand()) + to_chat(X, SPAN_XENOWARNING("You need an empty claw for this!")) + return + + if(locate(/obj/structure/lessers_burrow) in range(16, X)) + to_chat(X, SPAN_XENOWARNING("There already is a tunnel in range.")) + return + + if(!X.check_plasma(plasma_cost)) + return + + var/area/AR = get_area(T) + + if(isnull(AR) || !(AR.is_resin_allowed)) + if(AR.flags_area & AREA_UNWEEDABLE) + to_chat(X, SPAN_XENOWARNING("This area is unsuited to host the hive!")) + return + to_chat(X, SPAN_XENOWARNING("It's too early to spread the hive this far.")) + return + + X.visible_message(SPAN_XENONOTICE("[X] begins digging out a burrow."), \ + SPAN_XENONOTICE("You begin digging out a burrow."), null, 5) + if(!do_after(X, 100, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) + to_chat(X, SPAN_WARNING("Your tunnel caves in as you stop digging it.")) + return + if(!X.check_plasma(plasma_cost)) + return + X.visible_message(SPAN_XENONOTICE("\The [X] digs out a burrow."), \ + SPAN_XENONOTICE("You dig out an entrance to the tunnel network."), null, 5) + + var/obj/structure/lessers_burrow/tunnelobj = new(T, X.hivenumber) + X.tunnel_delay = 1 + addtimer(CALLBACK(src, PROC_REF(cooldown_end)), 30 SECONDS) + log_admin("[key_name(X)] has dug out xenobots burrow.") + msg_admin_niche("[X]/([key_name(X)]) has dug out xenobots burrow.") + + if(X.hive.living_xeno_queen || X.hive.allow_no_queen_actions) + for(var/mob/living/carbon/xenomorph/target_for_message as anything in X.hive.totalXenos) + var/overwatch_target = XENO_OVERWATCH_TARGET_HREF + var/overwatch_src = XENO_OVERWATCH_SRC_HREF + to_chat(target_for_message, SPAN_XENOANNOUNCE("Hive: A new burrow has been created by [X] (watch) at [get_area_name(tunnelobj)].")) + + X.use_plasma(plasma_cost) + to_chat(X, SPAN_NOTICE("You will be ready to dig a new tunnel or burrow in 30 seconds.")) + playsound(X.loc, 'sound/weapons/pierce.ogg', 25, 1) + + return ..() + +/datum/action/xeno_action/onclick/build_lessers_burrow/proc/cooldown_end() + var/mob/living/carbon/xenomorph/X = owner + to_chat(X, SPAN_NOTICE("You are ready to dig a tunnel again.")) + X.tunnel_delay = 0 diff --git a/fray-marines/code/modules/mob/living/carbon/xenomorph/resin_constructions.dm b/fray-marines/code/modules/mob/living/carbon/xenomorph/resin_constructions.dm new file mode 100644 index 000000000000..4f502c42bbd2 --- /dev/null +++ b/fray-marines/code/modules/mob/living/carbon/xenomorph/resin_constructions.dm @@ -0,0 +1,30 @@ +/datum/resin_construction/resin_obj/sunken_colony + name = "Sunken Colony" + desc = "Big and tanky living structure made to protect the hive. Fiercely territorial." + construction_name = "acid pillar" + cost = XENO_RESIN_ACID_GRENADE_COST + max_per_xeno = 2 + + build_overlay_icon = /obj/effect/warning/alien/weak + + build_path = /obj/structure/alien/sunken + build_time = 24 SECONDS + + range_between_constructions = 14 + +/datum/resin_construction/resin_obj/sunken_colony/can_build_here(turf/T, mob/living/carbon/xenomorph/X) + if (!..()) + return FALSE + + var/obj/effect/alien/weeds/alien_weeds = locate() in T + + if(istype(get_area(T), /area/shuttle)) + to_chat(X, SPAN_WARNING("How do you plan to make roots here?!")) + return FALSE + + if (alien_weeds.weed_strength < WEED_LEVEL_HIVE) + to_chat(X, SPAN_WARNING("You can only shape it on hive weeds. Find some resin before you start building!")) + return FALSE + + return TRUE + diff --git a/fray-marines/code/modules/mob/living/simple_animal/hostile/alien.dm b/fray-marines/code/modules/mob/living/simple_animal/hostile/alien.dm new file mode 100644 index 000000000000..22e6a2da6b1b --- /dev/null +++ b/fray-marines/code/modules/mob/living/simple_animal/hostile/alien.dm @@ -0,0 +1,220 @@ +/mob/living/simple_animal/hostile/alien/spawnable + var/icon_name = "Drone" + caste_name = null + desc = "Bork." + icon = 'fray-marines/icons/mob/xenos/lesser_xeno.dmi' + icon_gib = "gibbed-a" + layer = BIG_XENO_LAYER + response_help = "pokes" + response_disarm = "shoves" + response_harm = "hits" + status_flags = CANSTUN|CANKNOCKDOWN|CANPUSH + move_to_delay = XENO_AI_SPEED_TIER_2 + meat_type = null + health = XENO_HEALTH_LESSER_DRONE + harm_intent_damage = 5 + melee_damage_lower = XENO_AI_DAMAGE_TIER_1 + melee_damage_upper = XENO_AI_DAMAGE_TIER_1 + attacktext = "slashes" + a_intent = INTENT_HARM + unsuitable_atoms_damage = 15 + attack_same = TRUE + faction = FACTION_XENOMORPH + hivenumber = XENO_HIVE_NORMAL + wall_smash = 1 + minbodytemp = 0 + heat_damage_per_tick = 20 + stop_automated_movement_when_pulled = TRUE + break_stuff_probability = 90 + mob_size = MOB_SIZE_XENO_SMALL + + pixel_x = -8 + old_x = -8 + + var/special_attack_probability = XENO_AI_SPECIAL_ATTACK_PROBABILITY + +/mob/living/simple_animal/hostile/alien/spawnable/New() + . = ..() + target_mob = FindTarget() + +/mob/living/simple_animal/hostile/alien/spawnable/generate_name() + change_real_name(src, "\improper[caste_name] (WT-[rand(1, 999)])") + +/mob/living/simple_animal/hostile/alien/spawnable/handle_icon() + icon_state = "[icon_name] Running" + icon_living = "[icon_name] Running" + icon_dead = "[icon_name] Dead" + +/mob/living/simple_animal/hostile/alien/spawnable/update_transform() + if(lying != lying_prev) + lying_prev = lying + if(stat == DEAD) + icon_state = "[icon_name] Dead" + else if(lying) + if((resting || sleeping) && (!knocked_down && !knocked_out && health > 0)) + icon_state = "[icon_name] Sleeping" + else + icon_state = "[icon_name] Knocked Down" + else + icon_state = "[icon_name] Running" + update_wounds() + +/mob/living/simple_animal/hostile/alien/spawnable/FindTarget() + var/atom/T = null + stop_automated_movement = 0 + for(var/atom/A in ListTargets(10)) + + if(A == src) + continue + + var/atom/F = Found(A) + if(F) + T = F + break + + if(isliving(A)) + var/mob/living/L = evaluate_target(A) + if(L) + stance = HOSTILE_STANCE_ATTACK + var/atom/Tprev = T + T = L + + if (!ishuman(L)) + continue + if (get_dist(src, L) > get_dist(src, Tprev)) + T = Tprev + continue + + return T + +/mob/living/simple_animal/hostile/alien/spawnable/evaluate_target(mob/living/carbon/target) + . = ..() + + if (!.) + return + + if (evaluate_embryo_existance(target)) + return FALSE + + if (issynth(target) || ismonkey(target) || target.alpha < 50) + return FALSE + + if (target.pulledby && isxeno(target.pulledby)) + return FALSE + + return target + +/mob/living/simple_animal/hostile/alien/spawnable/proc/evaluate_embryo_existance(mob/living/carbon/target) + var/obj/item/alien_embryo/embryo = locate() in target + + if (embryo) + return TRUE + + return FALSE + +/mob/living/simple_animal/hostile/alien/spawnable/AttackTarget() + + stop_automated_movement = 1 + if(!target_mob || SA_attackable(target_mob) || target_mob.pulledby && isxeno(target_mob.pulledby) || target_mob.alpha < 50) + LoseTarget() + return 0 + if(!(target_mob in ListTargets(10))) + LostTarget() + return 0 + if(get_dist(src, target_mob) <= 1) //Attacking + AttackingTarget() + return 1 + +/mob/living/simple_animal/hostile/alien/spawnable/AttackingTarget() + face_atom(target_mob) + if(!Adjacent(target_mob)) + return + if(isliving(target_mob)) + var/mob/living/L = target_mob + if (evaluate_special_attack(L)) + return L + L.attack_animal(src) + src.animation_attack_on(L) + src.flick_attack_overlay(L, "slash") + return L + +/mob/living/simple_animal/hostile/alien/spawnable/proc/evaluate_special_attack(mob/living/L) + return FALSE + +/mob/living/simple_animal/hostile/alien/spawnable/proc/evaluate_specific_behavior(mob/living/L) + return FALSE + +/mob/living/simple_animal/hostile/alien/spawnable/bullet_act(obj/projectile/P) + if(!P || !istype(P)) + return + + var/damage = P.calculate_damage() + var/damage_result = damage + + var/ammo_flags = P.ammo.flags_ammo_behavior | P.projectile_override_flags + + if(ammo_flags & AMMO_FLAME) + health = 0 + emote("bursts into flames!") + return TRUE + + if(isxeno(P.firer)) + return -1 + + if(P.ammo.debilitate && stat != DEAD && ( damage || (ammo_flags & AMMO_IGNORE_RESIST) ) ) + apply_effects(arglist(P.ammo.debilitate)) + + . = TRUE + if(damage) + bullet_message(P) + apply_damage(damage, P.ammo.damage_type, P.def_zone, 0, 0, P) + handle_blood_splatter(get_dir(P.starting, loc)) + P.play_hit_effect(src) + + bullet_message(P) //Message us about the bullet, since damage was inflicted. + + SEND_SIGNAL(P, COMSIG_BULLET_ACT_XENO, src, damage, damage_result) + + return TRUE + +/mob/living/simple_animal/hostile/alien/spawnable/apply_damage(damage, damagetype, def_zone, used_weapon, sharp, edge, force) + . = ..() + if(stance == HOSTILE_STANCE_IDLE) + target_mob = FindTarget() + +/mob/living/simple_animal/hostile/alien/spawnable/updatehealth() + . = ..() + if(health < 1) + death() + +/mob/living/simple_animal/hostile/alien/spawnable/death(cause, gibbed, deathmessage = "lets out a waning guttural screech, green blood bubbling from its maw. The caustic acid starts melting the body away...") + . = ..() + if(!.) + return //If they were already dead, it will return. + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(xgibs), get_turf(src)), 3 SECONDS) + +/mob/living/simple_animal/hostile/alien/spawnable/spawn_gibs() + xgibs(get_turf(src)) + +/mob/living/simple_animal/hostile/alien/spawnable/gib_animation() + var/to_flick = "gibbed-a" + var/icon_path = icon + new /obj/effect/overlay/temp/gib_animation/xeno(loc, src, to_flick, icon_path) + +/mob/living/simple_animal/hostile/alien/spawnable/handle_blood_splatter(splatter_dir, duration) + new /obj/effect/temp_visual/dir_setting/bloodsplatter/xenosplatter(loc, splatter_dir, duration) + +/mob/living/simple_animal/hostile/alien/spawnable/handle_flamer_fire(obj/flamer_fire/fire, damage, delta_time) + health = -1 + death() + visible_message("[src] bursts into flames!") + +/mob/living/simple_animal/hostile/alien/spawnable/handle_flamer_fire_crossed(obj/flamer_fire/fire) + health = -1 + death() + visible_message("[src] bursts into flames!") + +/mob/living/simple_animal/hostile/alien/spawnable/TryIgniteMob(fire_stacks, datum/reagent/R) + health = -1 + death() + visible_message("[src] bursts into flames!") diff --git a/fray-marines/code/modules/mob/living/simple_animal/hostile/alien/tearer.dm b/fray-marines/code/modules/mob/living/simple_animal/hostile/alien/tearer.dm new file mode 100644 index 000000000000..81c34a0fbf1c --- /dev/null +++ b/fray-marines/code/modules/mob/living/simple_animal/hostile/alien/tearer.dm @@ -0,0 +1,24 @@ +/mob/living/simple_animal/hostile/alien/spawnable/tearer + icon_name = "Ravager" + caste_name = "tearer" + name = "tearer" + icon = 'fray-marines/icons/mob/xenos/lesser_xeno_big.dmi' + desc = "Weakened version of a Ravager." + health = XENO_HEALTH_RUNNER + melee_damage_lower = XENO_AI_DAMAGE_TIER_2 + melee_damage_upper = XENO_AI_DAMAGE_TIER_3 + move_to_delay = XENO_AI_SPEED_TIER_1 + pixel_x = -12 + old_x = -12 + +/mob/living/simple_animal/hostile/alien/spawnable/tearer/evaluate_special_attack(mob/living/L) + var/probability = prob(special_attack_probability) + + if(probability) + visible_message(SPAN_DANGER("[src] goes savage!")) + for(var/mob/living/ajacent in range(1, L)) + if(ajacent == src) + continue + ajacent.attack_animal(src) + + return probability diff --git a/fray-marines/code/modules/mob/living/simple_animal/hostile/alien/trooper.dm b/fray-marines/code/modules/mob/living/simple_animal/hostile/alien/trooper.dm new file mode 100644 index 000000000000..f9bffcfc9631 --- /dev/null +++ b/fray-marines/code/modules/mob/living/simple_animal/hostile/alien/trooper.dm @@ -0,0 +1,6 @@ +/mob/living/simple_animal/hostile/alien/spawnable/trooper + icon_name = "Hunter" + caste_name = "trooper" + name = "trooper" + desc = "Weak and pathetic excuse of an alpha predator. If alone." + melee_damage_upper = XENO_AI_DAMAGE_TIER_2 diff --git a/fray-marines/code/modules/projectiles/ammo_datums.dm b/fray-marines/code/modules/projectiles/ammo_datums.dm new file mode 100644 index 000000000000..14026efe0ddc --- /dev/null +++ b/fray-marines/code/modules/projectiles/ammo_datums.dm @@ -0,0 +1,8 @@ +/datum/ammo/flamethrower/tank_flamer/buffed/drop_flame(turf/T, datum/cause_data/cause_data) + if(!istype(T)) return + var/datum/reagent/napalm/blue/B = new() + new /obj/flamer_fire(T, cause_data, B, 1) + +/datum/ammo/rocket/ap/tank + accurate_range = 8 + max_range = 10 diff --git a/fray-marines/code/modules/vehicles/hardpoints/holder/tank_turret.dm b/fray-marines/code/modules/vehicles/hardpoints/holder/tank_turret.dm new file mode 100644 index 000000000000..168ff79519a9 --- /dev/null +++ b/fray-marines/code/modules/vehicles/hardpoints/holder/tank_turret.dm @@ -0,0 +1,45 @@ +/obj/item/hardpoint/holder/tank_turret/flares + name = "M34A2-B Multipurpose Turret" + desc = "The centerpiece of the tank. Designed to support quick installation and deinstallation of various tank weapon modules. Has inbuilt flare deployment system." + + activation_sounds = list('sound/weapons/gun_m92_attachable.ogg') + + cooldown = 30 + accuracy = 0.7 + firing_arc = 120 + + ammo = new /obj/item/ammo_magazine/hardpoint/flare_launcher + max_clips = 3 + +/obj/item/hardpoint/holder/tank_turret/flares/fire(mob/user, atom/A) + if(!ammo) //Prevents a runtime + return + if(ammo.current_rounds <= 0) + return + + next_use = world.time + cooldown * owner.misc_multipliers["cooldown"] + if(!prob((accuracy * 100) / owner.misc_multipliers["accuracy"])) + A = get_step(get_turf(A), pick(cardinal)) + + if(LAZYLEN(activation_sounds)) + playsound(get_turf(src), pick(activation_sounds), 60, 1) + + fire_projectile(user, A) + + to_chat(user, SPAN_WARNING("[name] Ammo: [SPAN_HELPFUL(ammo ? ammo.current_rounds : 0)]/[SPAN_HELPFUL(ammo ? ammo.max_rounds : 0)] | Mags: [SPAN_HELPFUL(LAZYLEN(backup_clips))]/[SPAN_HELPFUL(max_clips)]")) + +/obj/item/hardpoint/holder/tank_turret/flares/fire_projectile(mob/user, atom/A) + set waitfor = 0 + + var/turf/origin_turf = get_turf(src) + origin_turf = locate(origin_turf.x + origins[1], origin_turf.y + origins[2], origin_turf.z) + origin_turf = get_step(get_step(origin_turf, dir), dir) + + var/obj/projectile/P = generate_bullet(user, origin_turf) + SEND_SIGNAL(P, COMSIG_BULLET_USER_EFFECTS, user) + P.fire_at(A, user, src, get_dist(origin_turf, A) + 1, P.ammo.shell_speed) + ammo.current_rounds-- + +/obj/item/ammo_magazine/hardpoint/flare_launcher/tank + name = "M34A2-B Flare Launcher Magazine" + gun_type = /obj/item/hardpoint/holder/tank_turret/flares diff --git a/fray-marines/code/modules/vehicles/hardpoints/support/smoke.dm b/fray-marines/code/modules/vehicles/hardpoints/support/smoke.dm new file mode 100644 index 000000000000..29101d4c0080 --- /dev/null +++ b/fray-marines/code/modules/vehicles/hardpoints/support/smoke.dm @@ -0,0 +1,59 @@ +/obj/item/hardpoint/support/flare_launcher/smoke_launcher + name = "M-87S Smoke Screen System" + desc = "A smoke screen deployment system." + activation_sounds = list('sound/weapons/vehicles/smokelauncher_fire.ogg') + + ammo = new /obj/item/ammo_magazine/hardpoint/turret_smoke + max_clips = 2 + + use_muzzle_flash = FALSE + +/obj/item/hardpoint/support/flare_launcher/smoke_launcher/fire(mob/user, atom/A) + if(ammo.current_rounds <= 0) + return + + next_use = world.time + cooldown + + var/turf/L + var/turf/R + switch(owner.dir) + if(NORTH) + L = locate(owner.x - 2, owner.y + 4, owner.z) + R = locate(owner.x + 2, owner.y + 4, owner.z) + if(SOUTH) + L = locate(owner.x + 2, owner.y - 4, owner.z) + R = locate(owner.x - 2, owner.y - 4, owner.z) + if(EAST) + L = locate(owner.x + 4, owner.y + 2, owner.z) + R = locate(owner.x + 4, owner.y - 2, owner.z) + else + L = locate(owner.x - 4, owner.y + 2, owner.z) + R = locate(owner.x - 4, owner.y - 2, owner.z) + + if(LAZYLEN(activation_sounds)) + playsound(get_turf(src), pick(activation_sounds), 60, 1) + fire_projectile(user, L) + + sleep(10) + + if(LAZYLEN(activation_sounds)) + playsound(get_turf(src), pick(activation_sounds), 60, 1) + fire_projectile(user, R) + + to_chat(user, SPAN_WARNING("Smoke Screen uses left: [SPAN_HELPFUL(ammo ? ammo.current_rounds / 2 : 0)]/[SPAN_HELPFUL(ammo ? ammo.max_rounds / 2 : 0)] | Mags: [SPAN_HELPFUL(LAZYLEN(backup_clips))]/[SPAN_HELPFUL(max_clips)]")) + +/obj/item/hardpoint/support/flare_launcher/smoke_launcher/fire_projectile(mob/user, atom/A) + set waitfor = 0 + + var/turf/origin_turf = get_turf(src) + origin_turf = locate(origin_turf.x + origins[1], origin_turf.y + origins[2], origin_turf.z) + + var/obj/projectile/P = generate_bullet(user, origin_turf) + SEND_SIGNAL(P, COMSIG_BULLET_USER_EFFECTS, owner.seats[VEHICLE_GUNNER]) + P.fire_at(A, owner.seats[VEHICLE_GUNNER], src, get_dist(origin_turf, A) + 1, P.ammo.shell_speed) + ammo.current_rounds-- + +/obj/item/ammo_magazine/hardpoint/turret_smoke/apc + name = "M-87S Smoke Screen Magazine" + desc = "A grenades magazine used by APC smoke screen system." + gun_type = /obj/item/hardpoint/support/flare_launcher/smoke_launcher diff --git a/fray-marines/code/modules/vehicles/hardpoints_walker.dm b/fray-marines/code/modules/vehicles/hardpoints_walker.dm new file mode 100644 index 000000000000..85c05b4a5835 --- /dev/null +++ b/fray-marines/code/modules/vehicles/hardpoints_walker.dm @@ -0,0 +1,394 @@ +//////////////// +// MEGALODON HARDPOINTS // START +//////////////// + +/obj/item/walker_gun + name = "walker gun" + icon = 'fray-marines/icons/obj/vehicles/mecha_guns.dmi' + var/equip_state = "" + w_class = 12.0 + var/obj/vehicle/walker/owner = null + var/magazine_type = /obj/item/ammo_magazine/walker + var/obj/item/ammo_magazine/walker/ammo = null + var/list/fire_sound = list('sound/weapons/gun_smartgun1.ogg', 'sound/weapons/gun_smartgun2.ogg', 'sound/weapons/gun_smartgun3.ogg') + var/fire_delay = 0 + var/last_fire = 0 + var/burst = 1 + + w_class = 12.0 + + var/muzzle_flash = "muzzle_flash" + var/muzzle_flash_lum = 3 //muzzle flash brightness + var/list/projectile_traits = list() + +/obj/item/walker_gun/Initialize() + . = ..() + + ammo = new magazine_type() + +/obj/item/walker_gun/proc/get_icon_image(hardpoint) + if(!owner) + return + + return image(owner.icon, equip_state + hardpoint) + +/obj/item/walker_gun/proc/active_effect(atom/target) + if (!ammo) + to_chat(owner.seats[VEHICLE_DRIVER], "WARNING! System report: ammunition is depleted!") + return + if(ammo.current_rounds <= 0) + to_chat(owner.seats[VEHICLE_DRIVER], "WARNING! System report: ammunition is depleted!") + ammo.loc = owner.loc + ammo = null + visible_message("[owner.name]'s systems deployed used magazine.","") + return + if(world.time < last_fire + fire_delay) + to_chat(owner.seats[VEHICLE_DRIVER], "WARNING! System report: weapon is not ready to fire again!") + return + last_fire = world.time + var/obj/projectile/P + for(var/i = 1 to burst) + if(!owner.firing_arc(target)) + if(i == 1) + return + to_chat(owner.seats[VEHICLE_DRIVER] , "[name] fired! [ammo.current_rounds]/[ammo.max_rounds] remaining!") + visible_message("[owner.name] fires from [name]!", "You hear [istype(P.ammo, /datum/ammo/bullet) ? "gunshot" : "blast"]!") + return + P = new + P.generate_bullet(new ammo.default_ammo) + for (var/trait in projectile_traits) + GIVE_BULLET_TRAIT(P, /datum/element/bullet_trait_iff, FACTION_MARINE) + playsound(get_turf(owner), pick(fire_sound), 60) + target = simulate_scatter(target, P) + P.fire_at(target, owner, src, P.ammo.max_range, P.ammo.shell_speed) + ammo.current_rounds-- + if(ammo.current_rounds <= 0) + ammo.loc = owner.loc + ammo = null + visible_message("[owner.name]'s systems deployed used magazine.","") + break + sleep(3) + to_chat(owner.seats[VEHICLE_DRIVER] , "[name] fired! [ammo.current_rounds]/[ammo.max_rounds] remaining!") + visible_message("[owner.name] fires from [name]!", "You hear [istype(P.ammo, /datum/ammo/bullet) ? "gunshot" : "blast"]!") + + var/angle = round(Get_Angle(owner,target)) + muzzle_flash(angle) + + if(ammo.current_rounds <= 0) + ammo.loc = owner.loc + ammo = null + visible_message("[owner.name]'s systems deployed used magazine.","") + return TRUE + +/obj/item/walker_gun/proc/muzzle_flash(angle, x_offset = -9, y_offset = 5) + if(!muzzle_flash || isnull(angle)) + return //We have to check for null angle here, as 0 can also be an angle. + if(!istype(owner) || !istype(owner.loc,/turf)) + return + + var/prev_light = light_range + if(!light_on && (light_range <= muzzle_flash_lum)) + set_light_range(muzzle_flash_lum) + set_light_on(TRUE) + addtimer(CALLBACK(src, PROC_REF(reset_light_range), prev_light), 0.5 SECONDS) + + var/image_layer = (owner && owner.dir == SOUTH) ? MOB_LAYER+0.1 : MOB_LAYER-0.1 + var/offset = 5 + + var/image/I = image('icons/obj/items/weapons/projectiles.dmi',owner,muzzle_flash,image_layer) + var/matrix/rotate = matrix() //Change the flash angle. + rotate.Translate(0, offset) + rotate.Turn(angle) + I.transform = rotate + I.flick_overlay(owner, 3) + +/// called by a timer to remove the light range from muzzle flash +/obj/item/walker_gun/proc/reset_light_range(lightrange) + set_light_range(lightrange) + if(lightrange <= 0) + set_light_on(FALSE) + +/obj/item/walker_gun/proc/simulate_scatter(atom/target, obj/projectile/projectile_to_fire) + var/fire_angle = Get_Angle(owner.loc, get_turf(target)) + var/total_scatter_angle = projectile_to_fire.scatter - rand(-5,5) + + //Not if the gun doesn't scatter at all, or negative scatter. + if(total_scatter_angle > 0) + fire_angle += rand(-total_scatter_angle, total_scatter_angle) + target = get_angle_target_turf(owner.loc, fire_angle, 30) + + return get_turf(target) + + +/obj/item/walker_gun/smartgun + name = "M56 Double-Barrel Mounted Smartgun" + desc = "Modifyed version of standart USCM Smartgun System, mounted on military walkers" + icon_state = "mech_smartgun_parts" + equip_state = "redy_smartgun" + magazine_type = /obj/item/ammo_magazine/walker/smartgun + burst = 2 + fire_delay = 13 + + projectile_traits = list("iff") + +/obj/item/walker_gun/hmg + name = "M30 Machine Gun" + desc = "High-caliber machine gun firing small bursts of AP bullets, tearing into shreds unfortunate fellas on its way." + icon_state = "mech_minigun_parts" + equip_state = "redy_minigun" + fire_sound = list('sound/weapons/gun_minigun.ogg') + magazine_type = /obj/item/ammo_magazine/walker/hmg + fire_delay = 20 + burst = 3 + +/obj/item/walker_gun/flamer + name = "F40 \"Hellfire\" Flamethower" + desc = "Powerful flamethower, that can send any unprotected target straight to hell." + icon_state = "mech_flamer_parts" + equip_state = "redy_flamer" + fire_sound = 'sound/weapons/gun_flamethrower2.ogg' + magazine_type = /obj/item/ammo_magazine/walker/flamer + var/fuel_pressure = 1 //Pressure setting of the attached fueltank, controls how much fuel is used per tile + var/max_range = 9 //9 tiles, 7 is screen range, controlled by the type of napalm in the canister. We max at 9 since diagonal bullshit. + fire_delay = 4 SECONDS + +/obj/item/walker_gun/flamer/proc/get_fire_sound() + var/list/fire_sounds = list( + 'sound/weapons/gun_flamethrower1.ogg', + 'sound/weapons/gun_flamethrower2.ogg', + 'sound/weapons/gun_flamethrower3.ogg') + return pick(fire_sounds) + +/obj/item/walker_gun/flamer/active_effect(atom/target) + if (!ammo) + to_chat(owner.seats[VEHICLE_DRIVER], "WARNING! System report: ammunition is depleted!") + return + if(ammo.current_rounds <= 0) + to_chat(owner.seats[VEHICLE_DRIVER], "WARNING! System report: ammunition is depleted!") + ammo.loc = owner.loc + ammo = null + visible_message("[owner.name]'s systems deployed used magazine.","") + return + if(world.time < last_fire + fire_delay) + to_chat(owner.seats[VEHICLE_DRIVER], "WARNING! System report: weapon is not ready to fire again!") + return + last_fire = world.time + var/datum/reagent/R = ammo.reagents.reagent_list[1] + + var/flameshape = R.flameshape + var/fire_type = R.fire_type + + R.intensityfire = Clamp(R.intensityfire, ammo.reagents.min_fire_int, ammo.reagents.max_fire_int) + R.durationfire = Clamp(R.durationfire, ammo.reagents.min_fire_dur, ammo.reagents.max_fire_dur) + R.rangefire = Clamp(R.rangefire, ammo.reagents.min_fire_rad, ammo.reagents.max_fire_rad) + var/max_range = R.rangefire + if (max_range < fuel_pressure) //Used for custom tanks, allows for higher ranges + max_range = Clamp(fuel_pressure, 0, ammo.reagents.max_fire_rad) + if(R.rangefire == -1) + max_range = ammo.reagents.max_fire_rad + + var/turf/temp[] = getline2(get_turf(owner), get_turf(target)) + + var/turf/to_fire = temp[2] + + var/obj/flamer_fire/fire = locate() in to_fire + if(fire) + qdel(fire) + + playsound(to_fire, src.get_fire_sound(), 50, TRUE) + ammo.current_rounds-- + + new /obj/flamer_fire(to_fire, create_cause_data(initial(name), owner.seats[VEHICLE_DRIVER]), R, max_range, ammo.reagents, flameshape, target, CALLBACK(src, PROC_REF(show_percentage), owner.seats[VEHICLE_DRIVER]), fuel_pressure, fire_type) + + to_chat(owner.seats[VEHICLE_DRIVER] , "[name] fired! [ammo.current_rounds]/[ammo.max_rounds] charges remaining!") + + if(ammo.current_rounds <= 0 || !ammo) + to_chat(owner.seats[VEHICLE_DRIVER], "WARNING! System report: ammunition is depleted!") + ammo.loc = owner.loc + ammo = null + visible_message("[owner.name]'s systems deployed used magazine.","") + return + +/obj/item/walker_gun/flamer/proc/show_percentage(mob/living/user) + if(ammo) + to_chat(user, SPAN_WARNING("System Report: [round(ammo.get_ammo_percent())]% fuel remains!")) + +/////////////// +// AMMO MAGS // START +/////////////// + +/obj/item/ammo_magazine/walker + w_class = 12.0 + icon = 'fray-marines/icons/obj/vehicles/mecha_guns.dmi' + +/obj/item/ammo_magazine/walker/smartgun + name = "M56 Double-Barrel Magazine (Standard)" + desc = "A armament MG magazine" + caliber = "10x28mm" //Correlates to smartguns + icon_state = "mech_smartgun_ammo" + default_ammo = /datum/ammo/bullet/walker/smartgun + max_rounds = 700 + gun_type = /obj/item/walker_gun/smartgun + +/* +/obj/item/ammo_magazine/walker/smartgun/ap + name = "M56 Double-Barrel Magazine (AP)" + desc = "A armament MG magazine" + caliber = "10x28mm" //Correlates to smartguns + icon_state = "big_ammo_box_ap" + default_ammo = /datum/ammo/bullet/smartgun/walker/ap + max_rounds = 500 + gun_type = /obj/item/walker_gun/smartgun +/obj/item/ammo_magazine/walker/smartgun/incendiary + name = "M56 Double-Barrel \"Scorcher\" Magazine" + desc = "A armament MG magazine" + caliber = "10x28mm" //Correlates to smartguns + icon_state = "ammoboxslug" + default_ammo = /datum/ammo/bullet/smartgun/walker/incendiary + max_rounds = 500 + gun_type = /obj/item/walker_gun/smartgun +*/ + +/obj/item/ammo_magazine/walker/hmg + name = "M30 Machine Gun Magazine" + desc = "A armament M30 magazine" + icon_state = "mech_minigun_ammo" + max_rounds = 400 + default_ammo = /datum/ammo/bullet/walker/machinegun + gun_type = /obj/item/walker_gun/hmg + +/obj/item/ammo_magazine/walker/flamer + name = "F40 UT-Napthal Canister" + desc = "Canister for mounted flamethower" + icon_state = "mech_flamer_s_ammo" + max_rounds = 300 + default_ammo = /datum/ammo/flamethrower + gun_type = /obj/item/walker_gun/flamer + flags_magazine = AMMUNITION_HIDE_AMMO + + var/flamer_chem = "utnapthal" + + var/max_intensity = 40 + var/max_range = 5 + var/max_duration = 30 + + var/fuel_pressure = 1 //How much fuel is used per tile fired + var/max_pressure = 10 + +/obj/item/ammo_magazine/walker/flamer/Initialize(mapload, ...) + . = ..() + create_reagents(max_rounds) + + if(flamer_chem) + reagents.add_reagent(flamer_chem, max_rounds) + + reagents.min_fire_dur = 1 + reagents.min_fire_int = 1 + reagents.min_fire_rad = 1 + + reagents.max_fire_dur = max_duration + reagents.max_fire_rad = max_range + reagents.max_fire_int = max_intensity + +/obj/item/ammo_magazine/walker/flamer/get_ammo_percent() + if(!reagents) + return 0 + + return 100 * (reagents.total_volume / max_rounds) + +// /obj/item/ammo_magazine/walker/flamer/ex +// name = "F40 UT-Napthal EX-type Canister" +// desc = "Canister for mounted flamethower" +// icon_state = "mech_flamer_ex_ammo" +// max_rounds = 300 +// default_ammo = /datum/ammo/flamethrower +// gun_type = /obj/item/walker_gun/flamer + +// flamer_chem = "napalmex" + +// max_intensity = 40 +// max_range = 5 +// max_duration = 30 + +// fuel_pressure = 1 //How much fuel is used per tile fired +// max_pressure = 10 + +/obj/item/ammo_magazine/walker/flamer/btype + name = "F40 UT-Napthal B-type Canister" + desc = "Canister for mounted flamethower" + icon_state = "mech_flamer_b_ammo" + max_rounds = 300 + default_ammo = /datum/ammo/flamethrower + gun_type = /obj/item/walker_gun/flamer + + flamer_chem = "napalmb" + + max_intensity = 40 + max_range = 5 + max_duration = 30 + + fuel_pressure = 1 //How much fuel is used per tile fired + max_pressure = 10 +/////////////// +// AMMO MAGS // END +/////////////// + +/datum/ammo/bullet/walker/smartgun + name = "smartgun bullet" + icon_state = "redbullet" + flags_ammo_behavior = AMMO_BALLISTIC + + max_range = 24 + accuracy = HIT_ACCURACY_TIER_5 + damage = 35 + penetration = 0 + +/datum/ammo/bullet/walker/machinegun + name = "machinegun bullet" + icon_state = "bullet" + + accurate_range = 12 + damage = 45 + penetration= ARMOR_PENETRATION_TIER_10 + accuracy = HIT_ACCURACY_TIER_3 + +//////////////// +// MEGALODON HARDPOINTS // END +//////////////// + +/datum/supply_packs/ammo_m56_walker + name = "M56 Double-Barrel magazines (x2)" + contains = list( + /obj/item/ammo_magazine/walker/smartgun, + /obj/item/ammo_magazine/walker/smartgun, + ) + cost = 20 + containertype = /obj/structure/closet/crate/ammo + containername = "M56 Double-Barrel ammo crate" + group = "Vehicle Ammo" + +/datum/supply_packs/ammo_M30_walker + name = "M30 Machine Gun magazines (x2)" + contains = list( + /obj/item/ammo_magazine/walker/hmg, + /obj/item/ammo_magazine/walker/hmg, + ) + cost = 20 + containertype = /obj/structure/closet/crate/ammo + containername = "M30 Machine Gun ammo crate" + group = "Vehicle Ammo" + +/datum/supply_packs/ammo_F40_walker + name = "F40 Flamethower Mixed magazines (UT-Napthal x1, B-Type x1)" + contains = list( + /obj/item/ammo_magazine/walker/flamer, + /obj/item/ammo_magazine/walker/flamer/btype, + ) + cost = 20 + containertype = /obj/structure/closet/crate/ammo + containername = "F40 Flamethower ammo crate" + group = "Vehicle Ammo" + +//////////////// +// MEGALODON SUPPLYPACKS // END +//////////////// diff --git a/fray-marines/code/modules/vehicles/walker.dm b/fray-marines/code/modules/vehicles/walker.dm new file mode 100644 index 000000000000..1531ca16141f --- /dev/null +++ b/fray-marines/code/modules/vehicles/walker.dm @@ -0,0 +1,739 @@ +#define GUN_RIGHT 0 +#define GUN_LEFT 1 + +///////////////// +// Walker +///////////////// + +/obj/vehicle/walker + name = "CW13 \"Enforcer\" Assault Walker" + desc = "Relatively new combat walker of \"Enforcer\"-series. Unlike its predecessor, \"Carharodon\"-series, slower, but relays on its tough armor and rapid-firing weapons." + icon = 'fray-marines/icons/obj/vehicles/mech.dmi' + icon_state = "mech_open" + layer = BIG_XENO_LAYER + opacity = TRUE + can_buckle = FALSE + move_delay = 6 + req_access = list(ACCESS_MARINE_WALKER) + unacidable = TRUE + + var/lights = FALSE + var/lights_power = 8 + var/zoom = FALSE + var/zoom_size = 14 + + pixel_x = -18 + + health = 1000 + var/maxHealth = 1000 + var/repair = FALSE + + var/mob/pilot = null + + var/acid_process_cooldown = null + var/list/dmg_multipliers = list( + "all" = 1.0, //for when you want to make it invincible + "acid" = 0.9, + "slash" = 0.6, + "bullet" = 0.2, + "explosive" = 5.0, + "blunt" = 0.1, + "energy" = 1.0, + "abstract" = 1.0) //abstract for when you just want to hurt it + + var/max_angle = 45 + var/obj/item/walker_gun/left = null + var/obj/item/walker_gun/right = null + var/obj/item/walker_armor/armor_module = null + var/selected = GUN_LEFT + + flags_atom = FPRINT|USES_HEARING + +/obj/vehicle/walker/Initialize() + . = ..() + +/obj/vehicle/walker/prebuilt/Initialize() + . = ..() + + left = new /obj/item/walker_gun/smartgun() + right = new /obj/item/walker_gun/flamer() + left.ammo = new left.magazine_type() + right.ammo = new right.magazine_type() + left.owner = src + right.owner = src + + update_icon() + +/obj/vehicle/walker/update_icon() + overlays.Cut() + + if(seats[VEHICLE_DRIVER] != null) + icon_state = "mech_prep" + else + icon_state = "mech_open" + + if(left) + var/image/left_gun = left.get_icon_image("_l_hand") + overlays += left_gun + if(right) + var/image/right_gun = right.get_icon_image("_r_hand") + overlays += right_gun + +/obj/vehicle/walker/get_examine_text(mob/user) + . = ..() + var/integrity = round(health/maxHealth*100) + switch(integrity) + if(85 to 100) + . += "\nIt's fully intact." + if(65 to 85) + . += "\nIt's slightly damaged." + if(45 to 65) + . += "\nIt's badly damaged." + if(25 to 45) + . += "\nIt's heavily damaged." + else + . += "\nIt's falling apart." + . += "\n[left ? left.name : "Nothing"] is placed on its left hardpoint." + . += "\n[right ? right.name : "Nothing"] is placed on its right hardpoint." + + return . + +/obj/vehicle/walker/ex_act(severity) + switch(severity) + if (1) + if(prob(10)) // "- You have three seconds to run before I stab you in the anus!"@ Walker Pilot to rocket spec. + health = 0 + healthcheck() + return + take_damage(20, "explosive") // 100 damage btw. 2 instance of MT repair. 3-4 minutes standing IDLY near walker. + if (2) + take_damage(15, "explosive") + if (3) + take_damage(10, "explosive") // 10 * 5.0 = 50. Maxhealth is 400. Hellova damage + +/obj/vehicle/walker/relaymove(mob/user, direction) + if(user.is_mob_incapacitated()) return + if(seats[VEHICLE_DRIVER] != user) return + seats[VEHICLE_DRIVER].set_interaction(src) + + if(world.time > l_move_time + move_delay) + if (zoom) + unzoom() + if(dir != direction && reverse_dir[dir] != direction) + l_move_time = world.time + dir = direction + pick(playsound(src.loc, 'sound/mecha/powerloader_turn.ogg', 25, 1), playsound(src.loc, 'sound/mecha/powerloader_turn2.ogg', 25, 1)) + . = TRUE + else + var/oldDir = dir + . = step(src, direction) + setDir(oldDir) + if(.) + pick(playsound(loc, 'sound/mecha/powerloader_step.ogg', 25), playsound(loc, 'sound/mecha/powerloader_step2.ogg', 25)) + +/obj/vehicle/walker/Bump(atom/obstacle) + if(istype(obstacle, /obj/structure/machinery/door)) + var/obj/structure/machinery/door/door = obstacle + if(door.allowed(seats[VEHICLE_DRIVER])) + door.open() + else + flick("door_deny", door) + + else if(ishuman(obstacle)) + step_away(obstacle, src, 0) + return + + else if(istype(obstacle, /obj/structure/barricade)) + pick(playsound(loc, 'sound/mecha/powerloader_step.ogg', 25), playsound(loc, 'sound/mecha/powerloader_step2.ogg', 25)) + var/obj/structure/barricade/cade = obstacle + var/new_dir = get_dir(src, cade) ? get_dir(src, cade) : cade.dir + var/turf/new_loc = get_step(loc, new_dir) + if(!new_loc.density) forceMove(new_loc) + return + +//Breaking stuff + else if(istype(obstacle, /obj/structure/fence)) + var/obj/structure/fence/F = obstacle + F.visible_message("[src.name] smashes through [F]!") + take_damage(5, "abstract") + F.health = 0 + F.healthcheck() + else if(istype(obstacle, /obj/structure/surface/table)) + var/obj/structure/surface/table/T = obstacle + T.visible_message("[src.name] crushes [T]!") + take_damage(5, "abstract") + T.deconstruct(TRUE) + else if(istype(obstacle, /obj/structure/showcase)) + var/obj/structure/showcase/S = obstacle + S.visible_message("[src.name] bulldozes over [S]!") + take_damage(15, "abstract") + S.deconstruct(TRUE) + else if(istype(obstacle, /obj/structure/window/framed)) + var/obj/structure/window/framed/W = obstacle + W.visible_message("[src.name] crashes through the [W]!") + take_damage(20, "abstract") + W.shatter_window(1) + else if(istype(obstacle, /obj/structure/window_frame)) + var/obj/structure/window_frame/WF = obstacle + WF.visible_message("[src.name] runs over the [WF]!") + take_damage(20, "abstract") + WF.deconstruct() + else + ..() + +/obj/vehicle/walker/verb/enter_walker() + set category = "Object" + set name = "Enter Into Walker" + set src in oview(1) + + if(usr.skills.get_skill_level(SKILL_POWERLOADER)) + move_in(usr) + else + to_chat(usr, "How to operate it?") + +/obj/vehicle/walker/proc/move_in(mob/living/carbon/user) + set waitfor = FALSE + if(!ishuman(user)) + return + if(seats[VEHICLE_DRIVER]) + to_chat(user, "There is someone occupying mecha right now.") + return + var/mob/living/carbon/human/H = user + for(var/ID in list(H.wear_id, H.belt)) + if(operation_allowed(ID)) + seats[VEHICLE_DRIVER] = user + add_verb(seats[VEHICLE_DRIVER].client, list( + /obj/vehicle/walker/proc/eject, + /obj/vehicle/walker/proc/lights, + /obj/vehicle/walker/proc/zoom, + /obj/vehicle/walker/proc/select_weapon, + /obj/vehicle/walker/proc/deploy_magazine, + /obj/vehicle/walker/proc/get_stats, + )) + user.loc = src + seats[VEHICLE_DRIVER].client.mouse_pointer_icon = file("icons/mecha/mecha_mouse.dmi") + seats[VEHICLE_DRIVER].set_interaction(src) + playsound_client(seats[VEHICLE_DRIVER].client, 'sound/mecha/powerup.ogg') + update_icon() + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(playsound_client), seats[VEHICLE_DRIVER].client, 'sound/mecha/nominalsyndi.ogg'), 5 SECONDS) + return + + to_chat(user, "Access denied.") + +/obj/vehicle/walker/proc/operation_allowed(obj/item/I) + if(check_access(I)) + return TRUE + return FALSE + +/obj/vehicle/walker/proc/eject() + set name = "Eject" + set category = "Vehicle" + var/mob/M = usr + if(!M || !istype(M)) + return + + var/obj/vehicle/walker/W = M.interactee + + if(!W || !istype(W)) + return + W.move_out() + +/obj/vehicle/walker/proc/move_out() + if(!seats[VEHICLE_DRIVER]) + return FALSE + if(health <= 0) + to_chat(seats[VEHICLE_DRIVER], "PRIORITY ALERT! Chassis integrity failing. Systems shutting down.") + if(zoom) + unzoom() + if(seats[VEHICLE_DRIVER].client) + seats[VEHICLE_DRIVER].client.mouse_pointer_icon = initial(seats[VEHICLE_DRIVER].client.mouse_pointer_icon) + seats[VEHICLE_DRIVER].unset_interaction() + seats[VEHICLE_DRIVER].loc = src.loc + seats[VEHICLE_DRIVER].reset_view(null) + remove_verb(seats[VEHICLE_DRIVER].client, list( + /obj/vehicle/walker/proc/eject, + /obj/vehicle/walker/proc/lights, + /obj/vehicle/walker/proc/zoom, + /obj/vehicle/walker/proc/select_weapon, + /obj/vehicle/walker/proc/deploy_magazine, + /obj/vehicle/walker/proc/get_stats, + )) + seats[VEHICLE_DRIVER] = null + update_icon() + return TRUE + +/obj/vehicle/walker/proc/lights() + set name = "Lights on/off" + set category = "Vehicle" + var/mob/M = usr + if(!M || !istype(M)) + return + + var/obj/vehicle/walker/W = M.interactee + + + if(!W || !istype(W)) + return + W.handle_lights() + +/obj/vehicle/walker/proc/handle_lights() + if(!lights) + lights = TRUE + set_light(lights_power) + else + lights = FALSE + set_light(-lights_power) + seats[VEHICLE_DRIVER] << sound('sound/machines/click.ogg',volume=50) + +/obj/vehicle/walker/proc/deploy_magazine() + set name = "Deploy Magazine" + set category = "Vehicle" + var/mob/M = usr + + var/obj/vehicle/walker/W = M.interactee + + if(!W || !istype(W)) + return + + if(W.selected) + if(!W.left || !W.left.ammo) + return + else + W.left.ammo.loc = W.loc + W.left.ammo = null + to_chat(M, "WARNING! [W.left.name] ammo magazine deployed.") + visible_message("[W.name]'s systems deployed used magazine.","") + else + if(!W.right || !W.right.ammo) + return + else + W.right.ammo.loc = W.loc + W.right.ammo = null + to_chat(M, "WARNING! [W.right.name] ammo magazine deployed.") + visible_message("[W.name]'s systems deployed used magazine.","") + +/obj/vehicle/walker/proc/get_stats() + set name = "Status Display" + set category = "Vehicle" + + var/mob/M = usr + if(!M || !istype(M)) + return + + var/obj/vehicle/walker/W = M.interactee + + if(!W || !istype(W)) + return + + if(M != W.seats[VEHICLE_DRIVER]) + return + W.statistics(M) + +/obj/vehicle/walker/proc/statistics(mob/user) + to_chat(user, "

[name] Interface

") + to_chat(user, "Vehicle Status:
") + + var/danger = "'notice'" + + var/curr_health = round(health/maxHealth*100) + danger = "'notice'" + if(curr_health <= 50) + danger = "'warning'" + if(curr_health <= 25) + danger = "'danger'" + to_chat(user, "Overall vehicle integrity: [curr_health] percent. [danger == "'danger'" ? "LEVEL CRITICAL!" : ""]") + + to_chat(user, "=========\n") + + if(left) + var/munition = left.ammo ? "[left.ammo.current_rounds]/[left.ammo.max_rounds]" : "DEPLETED" + to_chat(user, "Left hardpoint: [left.name].\n Current ammo level: [munition]") + else + to_chat(user, "LEFT HARDPOINT IS EMPTY!") + + if(right) + var/munition = right.ammo ? "[right.ammo.current_rounds]/[right.ammo.max_rounds]" : "DEPLETED" + to_chat(user, "Right hardpoint: [left.name].\n Current ammo level: [munition]") + else + to_chat(user, "RIGHT HARDPOINT IS EMPTY!") + +/obj/vehicle/walker/proc/select_weapon() + set name = "Select Weapon" + set category = "Vehicle" + + var/mob/M = usr + if(!M || !istype(M)) + return + + var/obj/vehicle/walker/W = M.interactee + + if(!W || !istype(W)) + return + + if(W.selected) + if(!W.right) + return + W.selected = !W.selected + else + if(!W.left) + return + W.selected = !W.selected + to_chat(M, "Selected [W.selected ? "[W.left]" : "[W.right]"]") + +/obj/vehicle/walker/handle_click(mob/living/user, atom/A, list/mods) + if(!firing_arc(A)) + var/newDir = get_cardinal_dir(src, A) + l_move_time = world.time + dir = newDir + pick(playsound(src.loc, 'sound/mecha/powerloader_turn.ogg', 25, 1), playsound(src.loc, 'sound/mecha/powerloader_turn2.ogg', 25, 1)) + return + if(selected) + if(!left) + to_chat(usr, "WARNING! Hardpoint is empty.") + return + left.active_effect(A) + else + if(!right) + to_chat(usr, "WARNING! Hardpoint is empty.") + return + right.active_effect(A) + +/obj/vehicle/walker/proc/firing_arc(atom/A) + var/turf/T = get_turf(A) + var/dx = T.x - x + var/dy = T.y - y + var/deg = 0 + switch(src.dir) + if(EAST) deg = 0 + if(NORTH) deg = -90 + if(WEST) deg = -180 + if(SOUTH) deg = -270 + + var/nx = dx * cos(deg) - dy * sin(deg) + var/ny = dx * sin(deg) + dy * cos(deg) + if(nx == 0) + return max_angle >= 180 + var/angle = arctan(ny/nx) + if(nx < 0) + angle += 180 + return abs(angle) <= max_angle + +/obj/vehicle/walker/proc/zoom() + set name = "Zoom on/off" + set category = "Vehicle" + + var/mob/M = usr + if(!M || !istype(M)) + return + + var/obj/vehicle/walker/W = M.interactee + + if(!W || !istype(W)) + return + + W.zoom_activate() + +/obj/vehicle/walker/proc/zoom_activate() + if (zoom) + unzoom() + else + do_zoom() + +/obj/vehicle/walker/proc/do_zoom(viewsize = 12) + var/mob/living/carbon/user = seats[VEHICLE_DRIVER] + if(user.client) + zoom = TRUE + user.client.change_view(viewsize, src) + + // zoom_initial_mob_dir = user.dir + + var/tilesize = 32 + var/viewoffset = tilesize * zoom_size + + switch(dir) + if(NORTH) + user.client.pixel_x = 0 + user.client.pixel_y = viewoffset + if(SOUTH) + user.client.pixel_x = 0 + user.client.pixel_y = -viewoffset + if(EAST) + user.client.pixel_x = viewoffset + user.client.pixel_y = 0 + if(WEST) + user.client.pixel_x = -viewoffset + user.client.pixel_y = 0 + + to_chat(seats[VEHICLE_DRIVER], "Notification. Cameras zooming [zoom ? "activated" : "deactivated"].") + +/obj/vehicle/walker/proc/unzoom() + var/mob/living/carbon/user = seats[VEHICLE_DRIVER] + + zoom = !zoom + //General reset in case anything goes wrong, the view will always reset to default unless zooming in. + if(user.client) + user.client.change_view(world_view_size, src) + user.client.pixel_x = 0 + user.client.pixel_y = 0 + + +///////////////// +// Attackby +///////////////// + +/obj/vehicle/walker/attackby(obj/item/W as obj, mob/user as mob) + if(istype(W, /obj/item/ammo_magazine/walker)) + var/obj/item/ammo_magazine/walker/mag = W + rearm(mag, user) + + else if(istype(W, /obj/item/walker_gun)) + var/obj/item/walker_gun/WG = W + install_gun(WG, user) + + else if(HAS_TRAIT(W, TRAIT_TOOL_WRENCH)) + var/obj/item/tool/wrench/WR = W + dismount(WR, user) + + else if(iswelder(W)) + var/obj/item/tool/weldingtool/weld = W + repair_walker(weld, user) + + else + . = ..() + +/obj/vehicle/walker/proc/install_gun(obj/item/walker_gun/W, mob/user as mob) + if(skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_MASTER)) + to_chat(user, "You don't know how to mount weapon.") + return + var/choice = input("On which hardpoint install gun.") in list("Left", "Right", "Cancel") + switch(choice) + if("Cancel") + return + + if("Left") + if(left) + to_chat(user, "This hardpoint is full") + return + to_chat(user, "You start mounting [W.name] on left hardpoint.") + if(do_after(user, 100, TRUE, 5, BUSY_ICON_BUILD)) + user.drop_held_item() + W.loc = src + left = W + left.owner = src + to_chat(user, "You mount [W.name] on left hardpoint.") + update_icon() + return + return + + if("Right") + if(right) + to_chat(user, "This hardpoint is full") + return + to_chat(user, "You start mounting [W.name] on right hardpoint.") + if(do_after(user, 100, TRUE, 5, BUSY_ICON_BUILD)) + user.drop_held_item() + W.loc = src + right = W + right.owner = src + to_chat(user, "You mount [W] on right hardpoint.") + update_icon() + return + return + +/obj/vehicle/walker/proc/rearm(obj/item/ammo_magazine/walker/mag as obj, mob/user as mob) + if(left && !left.ammo && istype(mag, left.magazine_type)) + if(!do_after(user, 20, TRUE, 5, BUSY_ICON_BUILD)) + to_chat(user, "Your action was interrupted.") + return + else + user.drop_held_item() + mag.loc = left + left.ammo = mag + to_chat(user, "You install magazine in [left.name].") + return + + else if(right && !right.ammo && istype(mag, right.magazine_type)) + if(!do_after(user, 20, TRUE, 5, BUSY_ICON_BUILD)) + to_chat(user, "Your action was interrupted.") + return + else + user.drop_held_item() + mag.loc = right + right.ammo = mag + to_chat(user, "You install magazine in [right.name].") + return + + else + to_chat(user, "You cannot fit that magazine in any weapon.") + return + +/obj/vehicle/walker/proc/dismount(obj/item/tool/wrench/WR as obj, mob/user as mob) + if(!left && !right) + return + var/choice = input("Which hardpoint should be dismounted.") in list("Left", "Right", "Cancel") + switch(choice) + if("Cancel") + return + + if("Left") + if(!left) + to_chat(user, "Left hardpoint is empty.") + return + to_chat(user, "You start dismounting [left.name] from walker.") + if(do_after(user, 100, TRUE, 5, BUSY_ICON_BUILD)) + left.loc = loc + left = null + update_icon() + return + else + to_chat(user, "Dismounting has been interrupted.") + + if("Right") + if(!right) + to_chat(user, "Right hardpoint is empty.") + return + to_chat(user, "You start dismounting [right.name] from walker.") + if(do_after(user, 100, TRUE, 5, BUSY_ICON_BUILD)) + right.loc = loc + right = null + update_icon() + return + else + to_chat(user, "Dismounting has been interrupted.") + +/obj/vehicle/walker/proc/repair_walker(obj/item/tool/weldingtool/weld as obj, mob/user as mob) + if(!weld.isOn()) + return + if(health >= maxHealth) + to_chat(user, "Armor seems fully intact.") + return + if(repair) + to_chat(user, "Someone already reparing this vehicle.") + return + repair = TRUE + var/repair_time = 20 SECONDS + + to_chat(user, "You start repairing broken part of [src.name]'s armor...") + if(do_after(user, repair_time, TRUE, 5, BUSY_ICON_BUILD)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + to_chat(user, "You haphazardly weld together chunks of broken armor.") + health += 100 + healthcheck() + else + health += 250 + healthcheck() + to_chat(user, "You repair broken part of the armor.") + playsound(src.loc, 'sound/items/weldingtool_weld.ogg', 25) + if(seats[VEHICLE_DRIVER]) + to_chat(seats[VEHICLE_DRIVER], "Notification.Armor partly restored.") + repair = FALSE + return + else + to_chat(user, "Repair has been interrupted.") + repair = FALSE + + +///////// +//Attack_alien +///////// + +/obj/vehicle/walker/attack_alien(mob/living/carbon/xenomorph/M) + if(M.a_intent == INTENT_HELP) + return XENO_NO_DELAY_ACTION + + // if(M.mob_size < MOB_SIZE_XENO) + // to_chat(M, SPAN_XENOWARNING("You're too small to do any significant damage to this vehicle!")) + // return XENO_NO_DELAY_ACTION + + M.animation_attack_on(src) + playsound(loc, "alien_claw_metal", 25, 1) + M.visible_message(SPAN_DANGER("[M] slashes [src]!"), SPAN_DANGER("You slash [src]!")) + take_damage(M.melee_vehicle_damage + rand(-5,5), "slash") + + return XENO_ATTACK_ACTION + +/obj/vehicle/walker/healthcheck() + if(health > maxHealth) + health = maxHealth + return + if(health <= 0) + move_out() + new /obj/structure/walker_wreckage(src.loc) + playsound(loc, 'sound/effects/metal_crash.ogg', 75) + qdel(src) + +/obj/vehicle/walker/bullet_act(obj/projectile/Proj) + if(!Proj) + return + + switch(Proj.ammo.damage_type) + if(BRUTE) + if(Proj.ammo.flags_ammo_behavior & AMMO_ROCKET) + take_damage(Proj.damage, "explosive") + else + take_damage(Proj.damage, "bullet") + if(BURN) + if(Proj.ammo.flags_ammo_behavior & AMMO_XENO) + take_damage(Proj.damage, "acid") + else + take_damage(Proj.damage, "energy") + if(TOX, OXY, CLONE) + return + +/obj/vehicle/walker/proc/take_damage(dam, damtype = "blunt") + if(!dam || dam <= 0) + return + if(!(damtype in list("explosive", "acid", "energy", "blunt", "slash", "bullet", "all", "abstract"))) + return + var/damage = dam * dmg_multipliers[damtype] + if(damage <= 10) + to_chat(seats[VEHICLE_DRIVER], "ALERT! Hostile incursion detected. Deflected.") + return + + health -= damage + to_chat(seats[VEHICLE_DRIVER], "ALERT! Hostile incursion detected. Chassis taking damage.") + if(seats[VEHICLE_DRIVER] && damage >= 50) + seats[VEHICLE_DRIVER] << sound('sound/mecha/critdestrsyndi.ogg',volume=50) + healthcheck() + +/obj/vehicle/walker/Collided(atom/A) + . = ..() + + if(iscrusher(A)) + var/mob/living/carbon/xenomorph/crusher/C = A + if(!C.throwing) + return + + if(health > 0) + take_damage(250, "abstract") + visible_message(SPAN_DANGER("\The [A] ramms \the [src]!")) + playsound(loc, 'sound/effects/metal_crash.ogg', 35) + +/obj/vehicle/walker/hear_talk(mob/living/M as mob, msg, verb="says", datum/language/speaking, italics = 0) + var/mob/driver = seats[VEHICLE_DRIVER] + if (driver == null) + return + else if (driver != M) + driver.hear_say(msg, verb, speaking, "", italics, M) + else + var/list/mob/listeners = get_mobs_in_view(9,src) + + var/list/mob/langchat_long_listeners = list() + listeners += driver + for(var/mob/listener in listeners) + if(!ishumansynth_strict(listener) && !isobserver(listener)) + listener.show_message("[src] broadcasts something, but you can't understand it.") + continue + listener.show_message("[src] broadcasts, [FONT_SIZE_LARGE("\"[msg]\"")]", SHOW_MESSAGE_AUDIBLE) // 2 stands for hearable message + langchat_long_listeners += listener + langchat_long_speech(msg, langchat_long_listeners, driver.get_default_language()) + +/obj/structure/walker_wreckage + name = "CW13 wreckage" + desc = "Remains of some unfortunate walker. Completely unrepairable." + icon = 'fray-marines/icons/obj/vehicles/mech.dmi' + icon_state = "mech_broken" + density = TRUE + anchored = TRUE + opacity = FALSE + pixel_x = -18 diff --git a/fray-marines/code/modules/vehicles/walker_vendor.dm b/fray-marines/code/modules/vehicles/walker_vendor.dm new file mode 100644 index 000000000000..72326594b881 --- /dev/null +++ b/fray-marines/code/modules/vehicles/walker_vendor.dm @@ -0,0 +1,182 @@ +GLOBAL_LIST_INIT(cm_vending_walker, list( + list("WEAPONS (choose 2)", 0, null, null, null), + list("M56 Double-Barrel Mounted Smartgun", 0, /obj/item/walker_gun/smartgun, MECH_GUN, VENDOR_ITEM_REGULAR), + list("M30 Machine Gun", 0, /obj/item/walker_gun/hmg, MECH_GUN, VENDOR_ITEM_REGULAR), + list("F40 \"Hellfire\" Flamethower", 0, /obj/item/walker_gun/flamer, MECH_GUN, VENDOR_ITEM_REGULAR), + + list("AMMUNITION", 0, null, null, null), + list("M56 Magazine", 1, /obj/item/ammo_magazine/walker/smartgun, null, VENDOR_ITEM_REGULAR), + list("M30 Magazine", 2, /obj/item/ammo_magazine/walker/hmg, null, VENDOR_ITEM_REGULAR), + list("F40 UT-Napthal Canister", 2, /obj/item/ammo_magazine/walker/flamer, null, VENDOR_ITEM_REGULAR), + // list("F40 UT-Napthal EX-type Canister", 3, /obj/item/ammo_magazine/walker/flamer/ex, null, VENDOR_ITEM_REGULAR), + list("F40 UT-Napthal B-type Canister", 3, /obj/item/ammo_magazine/walker/flamer/btype, null, VENDOR_ITEM_REGULAR), + )) + +/obj/structure/machinery/cm_vending/gear/walker + name = "ColMarTech Automated Mech Vendor" + desc = "This vendor is connected to main ship storage, allows to fetch one hardpoint module per category for free." + icon_state = "engi" + + req_access = list(ACCESS_MARINE_WALKER) + vendor_role = list(JOB_WALKER) //everyone else, mind your business + var/available_categories = MECH_ALL_AVAIBALE + + unslashable = TRUE + + vend_delay = 4 SECONDS + vend_sound = 'sound/machines/medevac_extend.ogg' + + vend_flags = VEND_CLUTTER_PROTECTION|VEND_CATEGORY_CHECK|VEND_TO_HAND|VEND_USE_VENDOR_FLAGS + +/obj/structure/machinery/cm_vending/gear/walker/tip_over() //we don't do this here + return + +/obj/structure/machinery/cm_vending/gear/walker/flip_back() + return + +/obj/structure/machinery/cm_vending/gear/walker/get_listed_products(mob/user) + var/list/display_list = list() + + display_list = GLOB.cm_vending_walker + + return display_list + +/obj/structure/machinery/cm_vending/gear/walker/ui_data(mob/user) + . = list() + . += ui_static_data(user) + + .["current_m_points"] = supply_controller.mech_points + + var/list/ui_listed_products = get_listed_products(user) + var/list/stock_values = list() + for (var/i in 1 to length(ui_listed_products)) + var/list/myprod = ui_listed_products[i] //we take one list from listed_products + var/prod_available = FALSE + var/p_cost = myprod[2] + var/avail_flag = myprod[4] + if(supply_controller.mech_points >= p_cost && (!avail_flag || ((avail_flag in available_categories) && (available_categories[avail_flag])))) + prod_available = TRUE + stock_values += list(prod_available) + + .["stock_listing"] = stock_values + +/obj/structure/machinery/cm_vending/gear/walker/handle_points(mob/living/carbon/human/H, list/L) + . = TRUE + if(L[4] != null) + if(!(L[4] in available_categories)) + return FALSE + if(!(available_categories[L[4]])) + return FALSE + if(supply_controller.mech_points < L[2]) + return FALSE + else + available_categories[L[4]] -= 1 + supply_controller.mech_points -= L[2] + else + if(supply_controller.mech_points < L[2]) + return FALSE + else + supply_controller.mech_points -= L[2] + +//------------WEAPONS RACK--------------- + +/obj/structure/machinery/cm_vending/sorted/cargo_guns/vehicle_crew/walker + name = "\improper ColMarTech Mech Operator Weapons Rack" + desc = "An automated weapon rack hooked up to a small storage of standard-issue weapons. Can be accessed only by the Mech Operator." + req_access = list(ACCESS_MARINE_WALKER) + vendor_role = list(JOB_WALKER) + +//------------CLOTHING RACK--------------- + +GLOBAL_LIST_INIT(cm_vending_clothing_walker, list( + list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null), + list("Gloves", 0, /obj/item/clothing/gloves/yellow, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY), + list("Tanker Armor", 0, /obj/item/clothing/suit/storage/marine/tanker/walker, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY), + list("M50 Tanker Helmet", 0, /obj/item/clothing/head/helmet/marine/tech/tanker/walker, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_MANDATORY), + list("Medical Helmet Optic", 0, /obj/item/device/helmet_visor/medical, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_MANDATORY), + list("Welding Kit", 0, /obj/item/tool/weldpack, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY), + list("MRE", 0, /obj/item/storage/box/MRE, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), + + list("PERSONAL SIDEARM (CHOOSE 1)", 0, null, null, null), + list("88 Mod 4 Combat Pistol", 0, /obj/item/weapon/gun/pistol/mod88, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("VP78 Pistol", 0, /obj/item/weapon/gun/pistol/vp78, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + + list("BELT (CHOOSE 1)", 0, null, null, null), + list("G8-A General Utility Pouch", 0, /obj/item/storage/backpack/general_belt, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), + list("M103 Vehicle-Ammo Rig", 0, /obj/item/storage/belt/tank, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), + list("M276 Ammo Load Rig", 0, /obj/item/storage/belt/marine, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), + list("M276 General Pistol Holster Rig", 0, /obj/item/storage/belt/gun/m4a3, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), + list("M276 M39 Holster Rig", 0, /obj/item/storage/belt/gun/m39, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), + list("M276 M44 Holster Rig", 0, /obj/item/storage/belt/gun/m44, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), + list("M276 M82F Holster Rig", 0, /obj/item/storage/belt/gun/flaregun, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), + list("M276 Shotgun Shell Loading Rig", 0, /obj/item/storage/belt/shotgun, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), + list("M276 Toolbelt Rig (Full)", 0, /obj/item/storage/belt/utility/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), + + list("POUCHES (CHOOSE 2)", 0, null, null, null), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Sidearm Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/tank, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + + list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), + list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), + list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Drop Pouch", 0, /obj/item/clothing/accessory/storage/droppouch, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + + list("MASK (CHOOSE 1)", 0, null, null, null), + list("Gas Mask", 0, /obj/item/clothing/mask/gas, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), + list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), + + list("ATTACHMENTS", 0, null, null, null), + list("Angled Grip", 10, /obj/item/attachable/angledgrip, null, VENDOR_ITEM_REGULAR), + list("Extended Barrel", 10, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR), + list("Gyroscopic Stabilizer", 10, /obj/item/attachable/gyro, null, VENDOR_ITEM_REGULAR), + list("Laser Sight", 10, /obj/item/attachable/lasersight, null, VENDOR_ITEM_REGULAR), + list("Masterkey Shotgun", 10, /obj/item/attachable/attached_gun/shotgun, null, VENDOR_ITEM_REGULAR), + list("M37 Wooden Stock", 10, /obj/item/attachable/stock/shotgun, null, VENDOR_ITEM_REGULAR), + list("M39 Stock", 10, /obj/item/attachable/stock/smg, null, VENDOR_ITEM_REGULAR), + list("M41A Solid Stock", 10, /obj/item/attachable/stock/rifle, null, VENDOR_ITEM_REGULAR), + list("Recoil Compensator", 10, /obj/item/attachable/compensator, null, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 10, /obj/item/attachable/reddot, null, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 10, /obj/item/attachable/reflex, null, VENDOR_ITEM_REGULAR), + list("Suppressor", 10, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 10, /obj/item/attachable/verticalgrip, null, VENDOR_ITEM_REGULAR), + + list("AMMUNITION", 0, null, null, null), + list("M4RA AP Magazine (10x24mm)", 10, /obj/item/ammo_magazine/rifle/m4ra/ap, null, VENDOR_ITEM_REGULAR), + list("M39 AP Magazine (10x20mm)", 10, /obj/item/ammo_magazine/smg/m39/ap , null, VENDOR_ITEM_REGULAR), + list("M39 Extended Magazine (10x20mm)", 10, /obj/item/ammo_magazine/smg/m39/extended , null, VENDOR_ITEM_REGULAR), + list("M40 HEDP Grenade", 10, /obj/item/explosive/grenade/high_explosive, null, VENDOR_ITEM_REGULAR), + list("M41A AP Magazine (10x24mm)", 10, /obj/item/ammo_magazine/rifle/ap , null, VENDOR_ITEM_REGULAR), + list("M41A Extended Magazine (10x24mm)", 10, /obj/item/ammo_magazine/rifle/extended , null, VENDOR_ITEM_REGULAR), + list("M44 Heavy Speed Loader (.44)", 10, /obj/item/ammo_magazine/revolver/heavy, null, VENDOR_ITEM_REGULAR), + + list("UTILITIES", 0, null, null, null), + list("Binoculars", 10, /obj/item/device/binoculars, null, VENDOR_ITEM_REGULAR), + list("Fire Extinguisher (Portable)", 5, /obj/item/tool/extinguisher/mini, null, VENDOR_ITEM_REGULAR), + list("Fuel Tank Strap Pouch", 5, /obj/item/storage/pouch/flamertank, null, VENDOR_ITEM_REGULAR), + list("Fulton Device Stack", 5, /obj/item/stack/fulton, null, VENDOR_ITEM_REGULAR), + list("Large Shotgun Shell Pouch", 10, /obj/item/storage/pouch/shotgun/large, null, VENDOR_ITEM_REGULAR), + list("Motion Detector", 15, /obj/item/device/motiondetector, null, VENDOR_ITEM_REGULAR), + list("Plastic Explosive", 10, /obj/item/explosive/plastic, null, VENDOR_ITEM_REGULAR), + list("Roller Bed", 5, /obj/item/roller, null, VENDOR_ITEM_REGULAR), + list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), + )) + +/obj/structure/machinery/cm_vending/clothing/vehicle_crew/walker + name = "\improper ColMarTech Mech Operator Equipment Rack" + desc = "An automated rack hooked up to a colossal storage of Mech Operator standard-issue equipment." + req_access = list(ACCESS_MARINE_WALKER) + vendor_role = list(JOB_WALKER) + +/obj/structure/machinery/cm_vending/clothing/vehicle_crew/get_listed_products(mob/user) + return GLOB.cm_vending_clothing_walker diff --git a/fray-marines/icons/mob/human/back.dmi b/fray-marines/icons/mob/human/back.dmi new file mode 100644 index 000000000000..96345f73aa77 Binary files /dev/null and b/fray-marines/icons/mob/human/back.dmi differ diff --git a/fray-marines/icons/mob/human/items_lefthand_1.dmi b/fray-marines/icons/mob/human/items_lefthand_1.dmi new file mode 100644 index 000000000000..a75cccc60114 Binary files /dev/null and b/fray-marines/icons/mob/human/items_lefthand_1.dmi differ diff --git a/fray-marines/icons/mob/human/items_righthand_1.dmi b/fray-marines/icons/mob/human/items_righthand_1.dmi new file mode 100644 index 000000000000..e7d2732659ba Binary files /dev/null and b/fray-marines/icons/mob/human/items_righthand_1.dmi differ diff --git a/fray-marines/icons/mob/human/st_equip.dmi b/fray-marines/icons/mob/human/st_equip.dmi new file mode 100644 index 000000000000..3533b0efdd63 Binary files /dev/null and b/fray-marines/icons/mob/human/st_equip.dmi differ diff --git a/fray-marines/icons/mob/xenos/lesser_xeno.dmi b/fray-marines/icons/mob/xenos/lesser_xeno.dmi new file mode 100644 index 000000000000..12490e99421f Binary files /dev/null and b/fray-marines/icons/mob/xenos/lesser_xeno.dmi differ diff --git a/fray-marines/icons/mob/xenos/lesser_xeno_big.dmi b/fray-marines/icons/mob/xenos/lesser_xeno_big.dmi new file mode 100644 index 000000000000..6d4e238788ad Binary files /dev/null and b/fray-marines/icons/mob/xenos/lesser_xeno_big.dmi differ diff --git a/fray-marines/icons/mob/xenos/lesser_xeno_big_old.dmi b/fray-marines/icons/mob/xenos/lesser_xeno_big_old.dmi new file mode 100644 index 000000000000..d4320b04dd6b Binary files /dev/null and b/fray-marines/icons/mob/xenos/lesser_xeno_big_old.dmi differ diff --git a/fray-marines/icons/mob/xenos/lesser_xeno_old.dmi b/fray-marines/icons/mob/xenos/lesser_xeno_old.dmi new file mode 100644 index 000000000000..09dbf1f4e613 Binary files /dev/null and b/fray-marines/icons/mob/xenos/lesser_xeno_old.dmi differ diff --git a/fray-marines/icons/obj/structures/alien/Buildings.dmi b/fray-marines/icons/obj/structures/alien/Buildings.dmi new file mode 100644 index 000000000000..84d5a8d7d1b4 Binary files /dev/null and b/fray-marines/icons/obj/structures/alien/Buildings.dmi differ diff --git a/fray-marines/icons/obj/structures/machinery/mech_vendor.dmi b/fray-marines/icons/obj/structures/machinery/mech_vendor.dmi new file mode 100644 index 000000000000..b3ad071001ea Binary files /dev/null and b/fray-marines/icons/obj/structures/machinery/mech_vendor.dmi differ diff --git a/fray-marines/icons/obj/vehicles/mech.dmi b/fray-marines/icons/obj/vehicles/mech.dmi new file mode 100644 index 000000000000..df48a747fa3d Binary files /dev/null and b/fray-marines/icons/obj/vehicles/mech.dmi differ diff --git a/fray-marines/icons/obj/vehicles/mecha_guns.dmi b/fray-marines/icons/obj/vehicles/mecha_guns.dmi new file mode 100644 index 000000000000..6c4333eabf7b Binary files /dev/null and b/fray-marines/icons/obj/vehicles/mecha_guns.dmi differ diff --git a/fray-marines/test/test.txt b/fray-marines/test/test.txt new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/html/changelogs/AutoChangeLog-pr-83.yml b/html/changelogs/AutoChangeLog-pr-83.yml new file mode 100644 index 000000000000..0206a39e43d4 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-83.yml @@ -0,0 +1,5 @@ +author: "XDinka" +delete-after: True +changes: + - imageadd: "новый вендор для меха." + - mapadd: "фикс интела на фиорине, ремап мехбэя, уголок меха на аламо и нормандии." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-87.yml b/html/changelogs/AutoChangeLog-pr-87.yml new file mode 100644 index 000000000000..e77e35c8946f --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-87.yml @@ -0,0 +1,4 @@ +author: "Fray2" +delete-after: True +changes: + - rscadd: "synced to newer version of CMSS13" \ No newline at end of file diff --git a/html/changelogs/archive/2023-08.yml b/html/changelogs/archive/2023-08.yml index e8c44d82dbde..835f1fd9e4b5 100644 --- a/html/changelogs/archive/2023-08.yml +++ b/html/changelogs/archive/2023-08.yml @@ -345,6 +345,8 @@ - rscadd: Added a new lockdown system to research. - rscadd: Added an admin button to interact with above. 2023-08-26: + AnuvKH: + - maptweak: Fixed deep ocean around NV monsoon, removed incend ammo. CapCamIII: - rscadd: Adds 6(8 if you're pedantic) new guns for the UPP, details for each in following lines. @@ -397,13 +399,56 @@ - balance: Masterkey and underbarrel extinguisher now must be wielded in order to be used. - bugfix: Underbarrel extinguisher no longer bypass wielding restrictions on flamers. + - bugfix: Glasses with flash protection can no longer be used for welding. + - refactor: Adds defines for negative welding protection. + Fray2: + - rscadd: Added something Morrow: - balance: You now lose nutrition when gaining blood rather than losing a ton of nutrition when you have low effective blood + - bugfix: fixed a bypass to allow ghost scan health when it should not be allowed Morrow, Frans_Feiffer (beautiful sprites): - rscadd: Added in built HUDs to various helmets - rscadd: Sensormates used by squads without medical skills have been converted to buyable helmet optics + XDinka: + - rscadd: "\u0414\u0435\u043A\u043E\u0440\u0430\u0442\u0438\u0432\u043D\u044B\u0439\ + \ \u0438 \u043D\u0435 \u043E\u0447\u0435\u043D\u044C\n\u0445\u043B\u0430\u043C\ + \ \u0432 \u043F\u0440\u0435\u043F\u0430\u0440\u0430\u0446\u0438\u0438." + - bugfix: "\u0423\u0441\u0442\u0440\u0430\u043D\u0435\u043D\u0430 \u043F\u0440\u043E\ + \u0431\u043B\u0435\u043C\u0430 \u0441 \u0434\u043E\u0441\u0442\u0443\u043F\u0430\ + \u043C\u0438, \u043B\u0430\u043C\u043F\u044B \u0442\u0435\u043F\u0435\u0440\u044C\ + \ \u0441\u0442\u043E\u044F\u0442 \u043A\u043E\u0440\u0440\u0435\u043A\u0442\u043D\ + \u043E, \u0430 \u043D\u0435 \u043D\u0430 \u0432\u0435\u043D\u0434\u043E\u0440\ + \u0430\u0445, \u0434\u0435\u043A\u0430\u043B\u0438 \u0431\u043E\u043B\u044C\u0448\ + \u0435 \u043D\u0435 \u0442\u043E\u0440\u0447\u0430\u0442 \u0438\u0437 \u043C\ + \u043E\u043D\u0438\u0442\u043E\u0440\u043E\u0432. \u041D\u0435\u0441\u043A\u043E\ + \u043B\u044C\u043A\u043E \u043D\u0435\u0437\u043D\u0430\u0447\u0438\u0442\u0435\ + \u043B\u044C\u043D\u044B\u0445 \u0431\u0430\u0433\u0444\u0438\u043A\u0441\u043E\ + \u0432." + - mapadd: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u043E\u0444\u0438\u0441\ + \ AO, \u041C\u0435\u0445-\u043E\u0442\u0441\u0435\u043A, \u0442\u0435\u043F\u0435\ + \u0440\u044C \u0430\u043B\u044C\u0444\u0430 \u0438 \u0434\u0435\u043B\u044C\u0442\ + \u0430 \u043F\u0440\u0435\u043F\u044B \u0441\u043F\u0430\u0440\u0435\u043D\u044B\ + , \u043C\u0435\u0436\u0434\u0443 \u043D\u0438\u043C\u0438 \u043D\u0430\u043B\ + \u0430\u0436\u0435\u043D\u044B \u043F\u0443\u0442\u0438 \u0434\u0432\u0438\u0436\ + \u0435\u043D\u0438\u044F, \u0447\u0442\u043E \u0443\u0441\u043A\u043E\u0440\u0438\ + \u0442 \u043E\u0431\u0449\u0438\u0439 \u0441\u0431\u043E\u0440 \u043C\u043E\u0440\ + \u043F\u0435\u0445\u043E\u0432, \u0437\u0430\u0440\u0435\u0437\u0435\u0440\u0432\ + \u0438\u0440\u043E\u0432\u0430\u043D\u044B \u0441\u0442\u0430\u0440\u044B\u0435\ + \ \u043F\u0440\u0435\u043F\u044B \u043F\u043E\u0434 \u0431\u0443\u0434\u0443\ + \u0449\u0438\u0435 \u043D\u0430\u0440\u0430\u0431\u043E\u0442\u043A\u0438, \u043F\ + \u0430\u0440\u0430 \u043F\u0440\u0438\u044F\u0442\u043D\u044B\u0445 \u0431\u043E\ + \u043D\u0443\u0441\u043E\u0432 \u043E\u0436\u0438\u0434\u0430\u0435\u0442 \u0441\ + \u043F\u0435\u0446\u0438\u0430\u043B\u0438\u0441\u0442\u043E\u0432, \u043C\u0435\ + \u0434\u0438\u043A\u043E\u0432 \u0438 \u0438\u043D\u0436\u0435\u043D\u0435\u0440\ + \u043E\u0432 \u0432 \u043D\u043E\u0432\u044B\u0445 \u043F\u0440\u0435\u043F\u0430\ + \u0445 (\u0414\u043E\u0441\u0442\u0443\u043F\u044B \u043A \u043C\u0435\u0434\ + \u0432\u0435\u043D\u0434\u0443\u0440\u0430\u043C \u043F\u043E\u0444\u0438\u043A\ + \u0448\u0435\u043D\u044B)." + cuberound: + - rscadd: UPP SL gets proper bag with mini fire extinguisher three WP grenades , + two snacks and an AP mag realforest2001: - code_imp: Changed backend for the message of walking into an invisible wall to reduce duplication. diff --git a/html/changelogs/archive/2023-09.yml b/html/changelogs/archive/2023-09.yml index ea6f57a4b490..16628543f47a 100644 --- a/html/changelogs/archive/2023-09.yml +++ b/html/changelogs/archive/2023-09.yml @@ -184,6 +184,8 @@ 2023-09-13: Morrow: - rscdel: Removed some mapped clown gear + - rscadd: Added a ghost notification for yautja self destructs + - bugfix: Fixed lifepods still working after evac canceled TeDGamer: - balance: Hive weeds can be supported by other structures when original parent structure is destroyed. @@ -205,7 +207,44 @@ - spellcheck: Renames Requisiton Officer's stamp to Quartermaster's Stamp. - maptweak: Renamed the spare Req Officer's stamp to spare Quartermaster's stamp. - rscadd: Codebooks are now faction based rather than individually unique. + Carrotman2013: + - rscadd: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u0440\u0443\u0441\ + \u0441\u043A\u043E\u044F\u0437\u044B\u0447\u043D\u044B\u0435 \u0444\u0440\u0430\ + \u0437\u044B \u0434\u043B\u044F \u0440\u0430\u0431\u043E\u0447\u0435\u0433\u043E\ + \ \u0434\u0436\u043E." + - soundadd: "\u0417\u0432\u0443\u043A\u0438 \u0442\u043E\u0436\u0435." + - balance: "\u0423\u0432\u0435\u043B\u0438\u0447\u0435\u043D\u043E \u043A\u043E\u043B\ + \u0438\u0447\u0435\u0441\u0442\u0432\u043E \u043F\u043E\u043B\u0443\u0447\u0430\ + \u0435\u043C\u044B\u0445 \u043E\u0447\u043A\u043E\u0432 \u0437\u0430 \u0441\u0431\ + \u043E\u0440 \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u0438 \u0443\ + \ \u0418\u041E." + - rscadd: "\u041F\u0435\u0440\u0435\u0432\u0435\u0434\u0435\u043D\u044B \u041F\u041A\ + \ \u0443 \u0418\u041E\u0448\u043D\u0438\u043A\u043E\u0432." + - balance: "\u042D\u043D\u0434\u0443\u0440\u0430\u043D\u0441 \u0443 \u0418\u041E\ + \u0448\u043D\u0438\u043A\u043E\u0432 \u0443\u0432\u0435\u043B\u0438\u0447\u0435\ + \u043D." + poleno1232: + - bugfix: "\u041F\u043E\u0447\u0438\u043D\u0435\u043D\u044B \u0441\u043B\u043E\u043C\ + \u0430\u043D\u043D\u044B\u0435 \u043F\u0443\u0442\u0438 \u043F\u043E\u0441\u043B\ + \u0435 \u043A\u0440\u0430\u0439\u043D\u0435\u0433\u043E \u0440\u0435\u0444\u0430\ + \u043A\u0442\u043E\u0440\u0430" 2023-09-15: + Carrotman2013: + - rscadd: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u0440\u0443\u0441\ + \u0441\u043A\u043E\u044F\u0437\u044B\u0447\u043D\u044B\u0435 \u0444\u0440\u0430\ + \u0437\u044B \u0434\u043B\u044F \u0440\u0430\u0431\u043E\u0447\u0435\u0433\u043E\ + \ \u0434\u0436\u043E." + - soundadd: "\u0417\u0432\u0443\u043A\u0438 \u0442\u043E\u0436\u0435." + - balance: "\u0423\u0432\u0435\u043B\u0438\u0447\u0435\u043D\u043E \u043A\u043E\u043B\ + \u0438\u0447\u0435\u0441\u0442\u0432\u043E \u043F\u043E\u043B\u0443\u0447\u0430\ + \u0435\u043C\u044B\u0445 \u043E\u0447\u043A\u043E\u0432 \u0437\u0430 \u0441\u0431\ + \u043E\u0440 \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u0438 \u0443\ + \ \u0418\u041E." + - rscadd: "\u041F\u0435\u0440\u0435\u0432\u0435\u0434\u0435\u043D\u044B \u041F\u041A\ + \ \u0443 \u0418\u041E\u0448\u043D\u0438\u043A\u043E\u0432." + - balance: "\u042D\u043D\u0434\u0443\u0440\u0430\u043D\u0441 \u0443 \u0418\u041E\ + \u0448\u043D\u0438\u043A\u043E\u0432 \u0443\u0432\u0435\u043B\u0438\u0447\u0435\ + \u043D." BeagleGaming1, forest2001: - rscadd: Adds a CMB ERT to investigate the Black Market - rscadd: Adds a [cmb] logo for papers @@ -223,7 +262,81 @@ - bugfix: Fixed a few ways around fire group delays Waseemq1235: - admin: TWE faction reports are now possible. +2023-09-16: + xDanilcusx: + - rscadd: "\u041F\u0435\u0440\u0435\u0434\u043E\u0437 \u0431\u0438\u043A\u0430\u0440\ + \u0434\u0438\u043D\u0430 \u0432\u043D\u043E\u0432\u044C \u0441\u043F\u043E\u0441\ + \u043E\u0431\u0435\u043D \u0432\u044B\u043B\u0435\u0447\u0438\u0442\u044C \u0418\ + \u0411, \u043D\u043E \u043B\u0438\u0448\u044C \u0441 \u043C\u0435\u043B\u043A\ + \u0438\u043C \u0448\u0430\u043D\u0441\u043E\u043C \u043D\u0430 \u043A\u0430\u0436\ + \u0434\u044B\u0439 \u0442\u0438\u043A. \u041A\u0440\u043E\u043C\u0435 \u0442\ + \u043E\u0433\u043E, \u043C\u0435\u0445\u0430\u043D \u0442\u0440\u0435\u0431\u0443\ + \u0435\u0442 \u043E\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0438\u0435 \u043B\ + \u044E\u0431\u043E\u0433\u043E \u0431\u0440\u0443\u0442 \u0443\u0440\u043E\u043D\ + \u0430 \u0443 \u043C\u043E\u0440\u043F\u0435\u0445\u0430 \u0434\u043B\u044F\ + \ \u0434\u043E\u043B\u0436\u043D\u043E\u0433\u043E \u044D\u0444\u0444\u0435\u043A\ + \u0442\u0430." + - balance: "\u0422\u0435\u0445\u043D\u0438\u043A\u0430 \u0442\u0435\u043F\u0435\u0440\ + \u044C \u043D\u0430\u043D\u043E\u0441\u0438\u0442 \u0445\u043E\u0442\u044C \u0441\ + \u043A\u043E\u043B\u044C\u043A\u043E-\u0442\u043E \u0443\u0440\u043E\u043D\u0430\ + \ \u0441\u0442\u0435\u043D\u0430\u043C, \u0432\u044A\u0435\u0437\u0436\u0430\ + \u044F \u0432 \u043D\u0438\u0445. \u0422\u0430\u043D\u043A - 1/3 \u0425\u041F\ + \ \u0440\u0435\u0437\u0438\u043D\u043E\u0432\u043E\u0439 \u0441\u0442\u0435\u043D\ + \u044B \u0437\u0430 \u0434\u0430\u0432\u043A\u0443; \u0410\u041F\u0426 - 1/8." 2023-09-17: + poleno1232: + - rscadd: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D CW-13 \"Enforcer\" -\ + \ \u0431\u043E\u0435\u0432\u043E\u0439 \u043C\u0435\u0445" + - rscadd: "\u0414\u043B\u044F \u0431\u043E\u0435\u0432\u043E\u0433\u043E \u043C\u0435\ + \u0445\u0430 \u0434\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u0441\u043C\ + \u0430\u0440\u0442\u0433\u0430\u043D, \u043E\u0433\u043D\u0435\u043C\u0451\u0442\ + \ \u0438 \u043C\u0438\u043D\u0438\u0433\u0430\u043D" + - rscadd: "\u041E\u0431\u043D\u043E\u0432\u043B\u0451\u043D \u0432\u0435\u043D\u0434\ + \u043E\u0440 \u043C\u0435\u0445\u0438" + - balance: "\u0422\u0435\u043F\u0435\u0440\u044C \u043D\u0430\u0434\u043E \u0436\ + \u0434\u0430\u0442\u044C 15 \u043C\u0438\u043D\u0443\u0442, \u043F\u043E\u043A\ + \u0430 \u0431\u043E\u0442\u043E\u0442\u043E\u043D\u043D\u0435\u043B\u044C \u043E\ + \u043F\u044F\u0442\u044C \u0431\u0443\u0434\u0435\u0442 \u0434\u043E\u0441\u0442\ + \u0443\u043F\u0435\u043D" + xDanilcusx: + - rscadd: "\u041F\u0435\u0440\u0435\u0434\u043E\u0437 \u0431\u0438\u043A\u0430\u0440\ + \u0434\u0438\u043D\u0430 \u0432\u043D\u043E\u0432\u044C \u0441\u043F\u043E\u0441\ + \u043E\u0431\u0435\u043D \u0432\u044B\u043B\u0435\u0447\u0438\u0442\u044C \u0418\ + \u0411, \u043D\u043E \u043B\u0438\u0448\u044C \u0441 \u043C\u0435\u043B\u043A\ + \u0438\u043C \u0448\u0430\u043D\u0441\u043E\u043C \u043D\u0430 \u043A\u0430\u0436\ + \u0434\u044B\u0439 \u0442\u0438\u043A. \u041A\u0440\u043E\u043C\u0435 \u0442\ + \u043E\u0433\u043E, \u043C\u0435\u0445\u0430\u043D \u0442\u0440\u0435\u0431\u0443\ + \u0435\u0442 \u043E\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0438\u0435 \u043B\ + \u044E\u0431\u043E\u0433\u043E \u0431\u0440\u0443\u0442 \u0443\u0440\u043E\u043D\ + \u0430 \u0443 \u043C\u043E\u0440\u043F\u0435\u0445\u0430 \u0434\u043B\u044F\ + \ \u0434\u043E\u043B\u0436\u043D\u043E\u0433\u043E \u044D\u0444\u0444\u0435\u043A\ + \u0442\u0430." + - balance: "\u0422\u0435\u0445\u043D\u0438\u043A\u0430 \u0442\u0435\u043F\u0435\u0440\ + \u044C \u043D\u0430\u043D\u043E\u0441\u0438\u0442 \u0445\u043E\u0442\u044C \u0441\ + \u043A\u043E\u043B\u044C\u043A\u043E-\u0442\u043E \u0443\u0440\u043E\u043D\u0430\ + \ \u0441\u0442\u0435\u043D\u0430\u043C, \u0432\u044A\u0435\u0437\u0436\u0430\ + \u044F \u0432 \u043D\u0438\u0445. \u0422\u0430\u043D\u043A - 1/3 \u0425\u041F\ + \ \u0440\u0435\u0437\u0438\u043D\u043E\u0432\u043E\u0439 \u0441\u0442\u0435\u043D\ + \u044B \u0437\u0430 \u0434\u0430\u0432\u043A\u0443; \u0410\u041F\u0426 - 1/8." + - balance: "\u041D\u044B\u043D\u0435 \u043A\u043E\u043C\u0431\u043E \u0443 \u043C\ + \u043E\u043B\u043E\u0442\u0430 \u0421\u0422\u0448\u043D\u0438\u043A\u0430 \u0434\ + \u043B\u0438\u0442\u0441\u044F \u043D\u0435 4 \u0443\u0434\u0430\u0440\u0430\ + , \u0430 3." + - balance: "\u0423\u0431\u0440\u0430\u043B \u043A\u043E\u0441\u0442\u044B\u043B\u044C\ + , \u043F\u043E\u0437\u0432\u043E\u043B\u044F\u044E\u0449\u0438\u0439 \u0441\u0435\ + \u043D\u0442\u0438\u043D\u0435\u043B\u044E \u043C\u043E\u043C\u0435\u043D\u0442\ + \u0430\u043B\u044C\u043D\u043E \u0441\u0442\u0430\u043D\u043B\u043E\u0447\u0438\ + \u0442\u044C \u043B\u044E\u0434\u0435\u0439 \u0441 \u043B\u044E\u0431\u043E\u0439\ + \ \u0431\u0440\u043E\u043D\u0451\u0439, \u043A\u043E\u0442\u043E\u0440\u0430\ + \u044F \u043D\u0435 \u0434\u0430\u0451\u0442 \u0437\u0430\u043C\u0435\u0434\u043B\ + \u0435\u043D\u0438\u044F." + - bugfix: "\u041C\u043E\u043B\u043E\u0442 \u0438 \u0449\u0438\u0442 \u0442\u0435\ + \u043F\u0435\u0440\u044C \u0438\u043C\u0435\u044E\u0442 \u0437\u0432\u0443\u043A\ + \ \u043F\u043E\u0434\u0431\u0438\u0440\u0430\u043D\u0438\u044F." + - refactor: "\u041D\u0435\u0431\u043E\u043B\u044C\u0448\u043E\u0439 \u0440\u0435\ + \u0444\u0430\u043A\u0442\u043E\u0440 \u043A\u043E\u0434\u0430 \u044D\u043A\u0438\ + \u043F\u0438\u0440\u043E\u0432\u043A\u0438 \u0421\u0422 \u0441\u043F\u0435\u043A\ + \u0430." BeagleGaming1: - bugfix: Fixed CN20-X canister grenades Drathek: @@ -233,6 +346,33 @@ - rscdel: Disables Shivas Snowball Private Tristan: - spellcheck: acid runners are now properly informed of their corrosive acid's strength. +2023-09-18: + poleno1232: + - balance: "\u0422\u0435\u043F\u0435\u0440\u044C \u043D\u0430\u0434\u043E \u0436\ + \u0434\u0430\u0442\u044C 15 \u043C\u0438\u043D\u0443\u0442, \u043F\u043E\u043A\ + \u0430 \u0431\u043E\u0442\u043E\u0442\u043E\u043D\u043D\u0435\u043B\u044C \u043E\ + \u043F\u044F\u0442\u044C \u0431\u0443\u0434\u0435\u0442 \u0434\u043E\u0441\u0442\ + \u0443\u043F\u0435\u043D" + xDanilcusx: + - rscadd: "\u0441\u0434\u0435\u043B\u0430\u0442\u044C \u0432\u0435\u043D\u0434\u043E\ + \u0440 \u0441 \u044D\u043A\u0438\u043F\u0438\u0440\u043E\u0432\u043A\u043E\u0439\ + \ \u0434\u043B\u044F \u043F\u0438\u043B\u043E\u0442\u0430 \u0432\u043E\u043B\ + \u043A\u0435\u0440\u0430, \u0437\u0430 \u043E\u0441\u043D\u043E\u0432\u0443\ + \ \u0432\u0437\u044F\u0442\u044C \u0441\u0442\u0440\u0443\u043A\u0442\u0443\u0440\ + \u0443 \u0438\u0437 \u0432\u0435\u043D\u0434\u043E\u0440\u0430 \u0434\u043B\u044F\ + \ \u0442\u0430\u043D\u043A\u0438\u0441\u0442\u043E\u0432;" + - rscadd: "\u0434\u043E\u043F\u043E\u043B\u043D\u0438\u0442\u0435\u043B\u044C\u043D\ + \u044B\u0435 \u043E\u0447\u043A\u0438 \u0432\u0435\u043D\u0434\u043E\u0440\u0430\ + \ \u0437\u0430 \u0434\u0435\u0444\u043A\u043E\u043D;" + - rscadd: "\u043F\u0435\u0440\u0435\u0448\u0430\u0433\u0438\u0432\u0430\u043D\u0438\ + \u0435 \u0447\u0435\u0440\u0435\u0437 \u0431\u0430\u0440\u0440\u0438\u043A\u0430\ + \u0434\u044B \u043C\u0430\u0440\u0438\u043A\u043E\u0432!;" + - rscadd: "\u043A\u0430\u0440\u0433\u043E \u0437\u0430\u043A\u0430\u0437 \u0430\u043C\ + \u0443\u043D\u0438\u0446\u0438\u0438 \u0434\u043E\u044F \u043C\u0435\u0445\u0438\ + ;" + - bugfix: "\u0418\u0441\u043F\u0440\u0430\u0432\u0438\u043B \u0434\u0430\u043B\u044C\ + \u043D\u043E\u0441\u0442\u044C \u0441\u0442\u0440\u0435\u043B\u044C\u0431\u044B\ + \ \u0440\u0430\u043A\u0435\u0442 \u0422\u041E\u0412\u0430." 2023-09-19: Hopek: - rscadd: 'New facehugger strain: Watcher. The Watcher loses their ability to hide @@ -246,6 +386,9 @@ realforest2001: - bugfix: Fixes the CMB tradeband scanner not being able to do it's job. 2023-09-20: + Sporticusmge: + - balance: "\u041F\u043E\u0432\u044B\u0448\u0435\u043D \u0443\u0440\u043E\u043D\ + \ \u0440\u0435\u0432\u043E\u043B\u044C\u0432\u0435\u0440\u0430." BeagleGaming1: - rscadd: Uncommented the "Observe" verb for ghosts, allowing ghosts to see from a humans HUD @@ -269,6 +412,22 @@ - bugfix: Fixes the overwrite mark prompt on admin tickets not respecting closing the confirmation prompt. 2023-09-22: + Rocky0558: + - bugfix: "\u041B\u043E\u0433\u043E\u0442\u0438\u043F \u0412\u0435\u0439\u043B\u0430\ + \u043D\u0434 \u043A\u043E\u0440\u043F \u0441\u043C\u0435\u043D\u0435\u043D \u043D\ + \u0430 \u0412-\u042E \u043A\u043E\u0440\u043F \u0432 \u043E\u0442\u0432\u0435\ + \u0442\u043D\u044B\u0445 \u0444\u0430\u043A\u0441\u0430\u0445 \u0434\u043B\u044F\ + \ \u043F\u0435\u0434\u0430\u043B\u0435\u0439." + XDinka: + - imageadd: "\u0434\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u043D\u043E\ + \u0432\u044B\u0435 \u0441\u043F\u0440\u0430\u0439\u0442\u044B \u0431\u043E\u0442\ + \u043E\u0432 \u043A\u0441\u0435\u043D\u043E\u0441\u043E\u0432" + - imagedel: "\u0443\u0434\u0430\u043B\u0435\u043D\u044B/\u0437\u0430\u043C\u0435\ + \u043D\u0435\u043D\u044B \u0441\u0442\u0430\u0440\u044B\u0435 \u0443\u043C\u0435\ + \u043D\u044C\u0448\u0435\u043D\u043D\u044B\u0435 \u0441\u043F\u0440\u0430\u0439\ + \u0442\u044B \u043A\u0441\u0435\u043D\u043E\u0431\u043E\u0442\u043E\u0432 (\u043A\ + \u0440\u043E\u0448\u043A\u0430 \u0440\u0430\u0432\u0430\u0433\u0435\u0440, \u043A\ + \u0440\u043E\u0448\u043A\u0430 \u043B\u044E\u0440\u043A\u0435\u0440)" Huffie56: - qol: reorganize and update all the squads vendors to add new categories(helmet optics, pamphlets, clothing items). @@ -306,12 +465,59 @@ SPAWN ONLY. - imageadd: Added F903 ammo band icons. 2023-09-23: - Morrow: + Sader1337: + - balance: "\u041C\u0430\u0433\u0430\u0437\u0438\u043D\u044B \u041C\u041A1 \u0432\ + \u043C\u0435\u0449\u0430\u044E\u0442 99 \u043F\u0430\u0442\u0440\u043E\u043D\ + \u043E\u0432" + Wyderar: + - bugfix: "\u0417\u0430\u043A\u0430\u0437\u044B\u0432\u0430\u0435\u043C\u044B\u0439\ + \ TOW Launcher magazines (x3) \u0442\u0435\u043F\u0435\u0440\u044C \u0441\u043E\ + \u0434\u0435\u0440\u0436\u0438\u0442 \u0432 \u0441\u0435\u0431\u0435 \u043D\u0435\ + \ \u0441\u0430\u043C\u0443 TOW, \u0430 3 \u043C\u0430\u0433\u0430\u0437\u0438\ + \u043D\u0430 \u043A \u043D\u0435\u0439." + XDinka: + - imageadd: "\u0434\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u043D\u043E\ + \u0432\u044B\u0435 \u0441\u043F\u0440\u0430\u0439\u0442\u044B \u0431\u043E\u0442\ + \u043E\u0432 \u043A\u0441\u0435\u043D\u043E\u0441\u043E\u0432" + - imagedel: "\u0443\u0434\u0430\u043B\u0435\u043D\u044B/\u0437\u0430\u043C\u0435\ + \u043D\u0435\u043D\u044B \u0441\u0442\u0430\u0440\u044B\u0435 \u0443\u043C\u0435\ + \u043D\u044C\u0448\u0435\u043D\u043D\u044B\u0435 \u0441\u043F\u0440\u0430\u0439\ + \u0442\u044B \u043A\u0441\u0435\u043D\u043E\u0431\u043E\u0442\u043E\u0432 (\u043A\ + \u0440\u043E\u0448\u043A\u0430 \u0440\u0430\u0432\u0430\u0433\u0435\u0440, \u043A\ + \u0440\u043E\u0448\u043A\u0430 \u043B\u044E\u0440\u043A\u0435\u0440)" +Morrow: - bugfix: Fixed intel squad "Unauthorized access detected" realforest2001: - rscadd: Gives survivors bank accounts. 2023-09-24: - BeagleGaming1: + xDanilcusx: + - bugfix: "\u0423\u0420\u0410 \u0423\u0420\u0410 \u043A\u0441\u0435\u043D\u043E\u0431\ + \u043E\u0442\u044B \u0443\u043C\u0438\u0440\u0430\u044E\u0442 \u043A\u043E\u0433\ + \u0434\u0430 \u043A\u043E\u043D\u0447\u0430\u0435\u0442\u0441\u044F \u0437\u0434\ + \u043E\u0440\u043E\u0432\u044C\u0435, \u0430 \u043D\u0435 \u0432 3-\u0438 \u0447\ + \u0430\u0441\u0430 \u043D\u043E\u0447\u0438 \u043A\u0430\u0436\u0434\u043E\u0439\ + \ \u043F\u044F\u0442\u043D\u0438\u0446\u044B 9-\u0439 \u043D\u0435\u0434\u0435\ + \u043B\u0438 \u0432\u0438\u0441\u043E\u043A\u043E\u0441\u043D\u043E\u0433\u043E\ + \ \u0433\u043E\u0434\u0430 \u043F\u043E \u043A\u0438\u0442\u0430\u0439\u0441\ + \u043A\u043E\u043C\u0443 \u043A\u0430\u043B\u0435\u043D\u0434\u0430\u0440\u044E\ + ." + - bugfix: "\u041A\u0441\u0435\u043D\u043E\u0431\u043E\u0442\u044B \u0431\u043E\u043B\ + \u044C\u0448\u0435 \u043D\u0435 \u0432\u044B\u0434\u0430\u044E\u0442 \u0434\u0432\ + \u043E\u0439\u043D\u043E\u0433\u043E \u0437\u0432\u0443\u043A\u0430 \u0443\u0434\ + \u0430\u0440\u0430 \u043A\u043E\u0433\u0442\u044F\u043C\u0438." + - bugfix: "\u041A\u0441\u0435\u043D\u043E\u0431\u043E\u0442\u044B \u0442\u0435\u043F\ + \u0435\u0440\u044C \u043F\u0440\u0430\u043A\u0442\u0438\u0447\u0435\u0441\u043A\ + \u0438 \u043D\u0435 \u0442\u0443\u043F\u044F\u0442 \u043F\u0435\u0440\u0435\u0434\ + \ \u043C\u043E\u0440\u043F\u0435\u0445\u0430\u043C\u0438." + - bugfix: "\u041A\u0441\u0435\u043D\u043E\u0431\u043E\u0442\u044B \u0441\u0442\u0430\ + \u043B\u0438 \u0441\u043C\u043E\u0442\u0440\u0435\u0442\u044C \u043D\u0430 \u0432\ + \u0440\u0430\u0433\u0430 \u0432\u043E \u0432\u0440\u0435\u043C\u044F \u0430\u0442\ + \u0430\u043A\u0438." + - bugfix: "\u041A\u0441\u0435\u043D\u043E\u0431\u043E\u0442\u044B \u043F\u0440\u0435\ + \u043A\u0440\u0430\u0442\u0438\u043B\u0438 \u0431\u0438\u0442\u044C \u0431\u0435\ + \u0437\u043E\u0431\u0438\u0434\u043D\u044B\u0445 \u043E\u0431\u0435\u0437\u044C\ + \u044F\u043D." +BeagleGaming1: - admin: Disabling round end delay has a confirmation - rscadd: Added a mapping effect for prop guns Morrow: @@ -324,7 +530,42 @@ Zonespace27: - balance: Specialists now have separate pools of points for ammo and utility. 2023-09-25: - Steelpoint: + XDinka: + - imageadd: "\u043D\u043E\u0432\u044B\u0439 \u0432\u0435\u043D\u0434\u043E\u0440\ + \ \u0434\u043B\u044F \u043C\u0435\u0445\u0430." + - mapadd: "\u0444\u0438\u043A\u0441 \u0438\u043D\u0442\u0435\u043B\u0430 \u043D\u0430\ + \ \u0444\u0438\u043E\u0440\u0438\u043D\u0435, \u0440\u0435\u043C\u0430\u043F\ + \ \u043C\u0435\u0445\u0431\u044D\u044F, \u0443\u0433\u043E\u043B\u043E\u043A\ + \ \u043C\u0435\u0445\u0430 \u043D\u0430 \u0430\u043B\u0430\u043C\u043E \u0438\ + \ \u043D\u043E\u0440\u043C\u0430\u043D\u0434\u0438\u0438." + xDanilcusx: + - bugfix: "\u0423\u0420\u0410 \u0423\u0420\u0410 \u043A\u0441\u0435\u043D\u043E\u0431\ + \u043E\u0442\u044B \u0443\u043C\u0438\u0440\u0430\u044E\u0442 \u043A\u043E\u0433\ + \u0434\u0430 \u043A\u043E\u043D\u0447\u0430\u0435\u0442\u0441\u044F \u0437\u0434\ + \u043E\u0440\u043E\u0432\u044C\u0435, \u0430 \u043D\u0435 \u0432 3-\u0438 \u0447\ + \u0430\u0441\u0430 \u043D\u043E\u0447\u0438 \u043A\u0430\u0436\u0434\u043E\u0439\ + \ \u043F\u044F\u0442\u043D\u0438\u0446\u044B 9-\u0439 \u043D\u0435\u0434\u0435\ + \u043B\u0438 \u0432\u0438\u0441\u043E\u043A\u043E\u0441\u043D\u043E\u0433\u043E\ + \ \u0433\u043E\u0434\u0430 \u043F\u043E \u043A\u0438\u0442\u0430\u0439\u0441\ + \u043A\u043E\u043C\u0443 \u043A\u0430\u043B\u0435\u043D\u0434\u0430\u0440\u044E\ + ." + - bugfix: "\u041A\u0441\u0435\u043D\u043E\u0431\u043E\u0442\u044B \u0431\u043E\u043B\ + \u044C\u0448\u0435 \u043D\u0435 \u0432\u044B\u0434\u0430\u044E\u0442 \u0434\u0432\ + \u043E\u0439\u043D\u043E\u0433\u043E \u0437\u0432\u0443\u043A\u0430 \u0443\u0434\ + \u0430\u0440\u0430 \u043A\u043E\u0433\u0442\u044F\u043C\u0438." + - bugfix: "\u041A\u0441\u0435\u043D\u043E\u0431\u043E\u0442\u044B \u0442\u0435\u043F\ + \u0435\u0440\u044C \u043F\u0440\u0430\u043A\u0442\u0438\u0447\u0435\u0441\u043A\ + \u0438 \u043D\u0435 \u0442\u0443\u043F\u044F\u0442 \u043F\u0435\u0440\u0435\u0434\ + \ \u043C\u043E\u0440\u043F\u0435\u0445\u0430\u043C\u0438." + - bugfix: "\u041A\u0441\u0435\u043D\u043E\u0431\u043E\u0442\u044B \u0441\u0442\u0430\ + \u043B\u0438 \u0441\u043C\u043E\u0442\u0440\u0435\u0442\u044C \u043D\u0430 \u0432\ + \u0440\u0430\u0433\u0430 \u0432\u043E \u0432\u0440\u0435\u043C\u044F \u0430\u0442\ + \u0430\u043A\u0438." + - bugfix: "\u041A\u0441\u0435\u043D\u043E\u0431\u043E\u0442\u044B \u043F\u0440\u0435\ + \u043A\u0440\u0430\u0442\u0438\u043B\u0438 \u0431\u0438\u0442\u044C \u0431\u0435\ + \u0437\u043E\u0431\u0438\u0434\u043D\u044B\u0445 \u043E\u0431\u0435\u0437\u044C\ + \u044F\u043D." +Steelpoint: - rscadd: Synthetics may now vend biohazard suits for personal use. Synth compliant. Zonespace27: - balance: Cloaked mobs no longer give off visible messages diff --git a/icons/lobby/title.dmi b/icons/lobby/title.dmi index 36124c399d8c..4b71c5a38db1 100644 Binary files a/icons/lobby/title.dmi and b/icons/lobby/title.dmi differ diff --git a/icons/mob/humans/onmob/back.dmi b/icons/mob/humans/onmob/back.dmi index 8a51050c03c3..47f72a369d6a 100644 Binary files a/icons/mob/humans/onmob/back.dmi and b/icons/mob/humans/onmob/back.dmi differ diff --git a/icons/mob/humans/onmob/head_1.dmi b/icons/mob/humans/onmob/head_1.dmi index 58a93a89da2c..07da39beb668 100644 Binary files a/icons/mob/humans/onmob/head_1.dmi and b/icons/mob/humans/onmob/head_1.dmi differ diff --git a/icons/mob/humans/onmob/items_lefthand_0.dmi b/icons/mob/humans/onmob/items_lefthand_0.dmi index a040ddb7a65e..9c6e43fe5e74 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_righthand_0.dmi b/icons/mob/humans/onmob/items_righthand_0.dmi index a09244c30139..779685b7d160 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/suit_1.dmi b/icons/mob/humans/onmob/suit_1.dmi index 8424a9795b91..64da77d9d946 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_hats.dmi b/icons/obj/items/clothing/cm_hats.dmi index 66a42bf694ba..89d89c617c06 100644 Binary files a/icons/obj/items/clothing/cm_hats.dmi and b/icons/obj/items/clothing/cm_hats.dmi differ diff --git a/icons/obj/items/clothing/cm_suits.dmi b/icons/obj/items/clothing/cm_suits.dmi index 74257ed6c8cd..fffa9d05902a 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/storage.dmi b/icons/obj/items/storage.dmi index 6edbf5b6c7d3..3065529199a6 100644 Binary files a/icons/obj/items/storage.dmi and b/icons/obj/items/storage.dmi differ diff --git a/icons/obj/items/weapons/weapons.dmi b/icons/obj/items/weapons/weapons.dmi index 398256490294..ae608c19dcca 100644 Binary files a/icons/obj/items/weapons/weapons.dmi and b/icons/obj/items/weapons/weapons.dmi differ diff --git a/icons/ooc.dmi b/icons/ooc.dmi index 8b15b1e49239..aa0d76b6866a 100644 Binary files a/icons/ooc.dmi and b/icons/ooc.dmi differ diff --git a/map_config/maps.txt b/map_config/maps.txt index ba0bd17a89c7..31c982651090 100644 --- a/map_config/maps.txt +++ b/map_config/maps.txt @@ -20,7 +20,6 @@ map bigredv2 endmap map prison_station_fop - disabled endmap map fiorina_sciannex diff --git a/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm b/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm index 0fd8b269d33c..08fc679f7a2b 100644 --- a/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm +++ b/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm @@ -179,6 +179,7 @@ icon_state = "S" }, /obj/effect/decal/cleanable/blood/splatter, +/obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ dir = 10; icon_state = "floor_plate" @@ -459,6 +460,7 @@ /area/prison/research/secret/testing) "aaZ" = ( /obj/structure/surface/table/reinforced, +/obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ dir = 10; icon_state = "sterile_white" @@ -890,6 +892,7 @@ /obj/structure/machinery/light{ dir = 8 }, +/obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison{ icon_state = "whitepurplefull" }, @@ -1706,6 +1709,7 @@ /area/prison/research/secret/bioengineering) "aef" = ( /obj/structure/surface/table/reinforced, +/obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison{ dir = 10; icon_state = "sterile_white" @@ -1793,6 +1797,7 @@ pixel_y = -3 }, /obj/item/paper/prison_station/nursery_rhyme, +/obj/effect/landmark/objective_landmark/medium, /turf/open/floor/plating/plating_catwalk/prison, /area/prison/cellblock/maxsec/north) "aeq" = ( @@ -4300,14 +4305,18 @@ /turf/open/floor/plating, /area/prison/cellblock/maxsec/south) "aln" = ( -/obj/structure/machinery/light{ - dir = 1 +/obj/structure/machinery/power/apc{ + dir = 8; + pixel_x = -24; + start_charge = 0 }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 +/obj/structure/pipes/vents/pump{ + dir = 4 }, -/turf/open/floor/plating, -/area/prison/cellblock/maxsec/south) +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, +/area/prison/cellblock/mediumsec/north) "alo" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating, @@ -4315,6 +4324,7 @@ "alp" = ( /obj/effect/landmark/corpsespawner/prison_security, /obj/item/reagent_container/food/drinks/bottle/whiskey, +/obj/effect/landmark/objective_landmark/close, /turf/open/floor/plating, /area/prison/maintenance/research_medbay) "alq" = ( @@ -4381,6 +4391,7 @@ /area/prison/maintenance/research_medbay) "alA" = ( /obj/structure/surface/rack, +/obj/effect/landmark/objective_landmark/far, /turf/open/floor/plating, /area/prison/residential/north) "alB" = ( @@ -4469,6 +4480,7 @@ pixel_y = -24; start_charge = 0 }, +/obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison{ dir = 9; icon_state = "darkpurplefull2" @@ -4476,6 +4488,7 @@ /area/prison/research/secret/chemistry) "alU" = ( /obj/structure/surface/table/reinforced, +/obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison{ dir = 9; icon_state = "darkpurplefull2" @@ -5151,6 +5164,7 @@ /area/prison/cellblock/highsec/north/north) "anK" = ( /obj/structure/surface/table/reinforced, +/obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison{ dir = 10; icon_state = "whitegreenfull" @@ -5586,6 +5600,9 @@ /obj/structure/machinery/light{ dir = 4 }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, /turf/open/floor/prison{ dir = 4; icon_state = "red" @@ -5614,6 +5631,7 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, +/obj/item/clothing/suit/storage/marine/light/vest, /turf/open/floor/prison{ icon_state = "darkredcorners2" }, @@ -5984,9 +6002,7 @@ }, /area/prison/cellblock/highsec/north/north) "aqc" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 - }, +/obj/structure/pipes/standard/manifold/fourway/hidden/supply, /turf/open/floor/prison{ dir = 1; icon_state = "redcorner" @@ -7583,6 +7599,7 @@ /obj/structure/closet/secure_closet/medical3{ req_access_txt = "100" }, +/obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ dir = 10; icon_state = "whitegreenfull" @@ -8826,13 +8843,11 @@ /turf/closed/wall/r_wall/prison_unmeltable, /area/prison/security/checkpoint/maxsec) "axU" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, -/turf/open/floor/plating, -/area/prison/maintenance/residential/access/north) +/area/prison/cellblock/mediumsec/east) "axV" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/prison{ @@ -8968,6 +8983,7 @@ /area/prison/medbay/foyer) "ayr" = ( /obj/structure/filingcabinet, +/obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ dir = 5; icon_state = "darkred2" @@ -9801,12 +9817,14 @@ /area/prison/medbay) "aAS" = ( /obj/structure/bed, +/obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison{ icon_state = "whitegreen" }, /area/prison/medbay) "aAT" = ( /obj/structure/filingcabinet, +/obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ dir = 6; icon_state = "whitegreen" @@ -9829,6 +9847,7 @@ pixel_y = 8 }, /obj/effect/landmark/item_pool_spawner/prison_lock, +/obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison{ dir = 10; icon_state = "darkredfull2" @@ -10240,25 +10259,22 @@ }, /area/prison/toilet/research) "aCd" = ( -/obj/structure/machinery/shower{ - dir = 8 - }, -/obj/structure/machinery/light/small{ - dir = 1 - }, -/turf/open/floor{ - icon_state = "freezerfloor" - }, -/area/prison/toilet/research) +/obj/structure/window/framed/prison/reinforced, +/turf/open/floor/plating, +/area/prison/library) "aCe" = ( /obj/structure/bed, /obj/item/bedsheet/purple, /turf/open/floor/wood, /area/prison/quarters/research) "aCf" = ( -/obj/structure/pipes/vents/scrubber, -/turf/open/floor/wood, -/area/prison/quarters/research) +/obj/structure/platform{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "red" + }, +/area/prison/security/monitoring/highsec) "aCg" = ( /turf/open/floor/prison{ dir = 8; @@ -10316,15 +10332,20 @@ /turf/open/floor/wood, /area/prison/quarters/research) "aCp" = ( -/obj/structure/bed/chair/office/dark{ +/obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/obj/structure/pipes/vents/scrubber, -/turf/open/floor/wood, -/area/prison/quarters/research) +/obj/structure/platform, +/turf/open/floor/plating/plating_catwalk/prison, +/area/prison/security/monitoring/highsec) "aCq" = ( -/obj/structure/surface/table, -/turf/open/floor/wood, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/prison/quarters/research) "aCt" = ( /obj/structure/window/framed/prison/reinforced, @@ -10346,6 +10367,7 @@ /area/prison/recreation/highsec/n) "aCB" = ( /obj/structure/surface/table/gamblingtable, +/obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ dir = 10 }, @@ -10649,17 +10671,27 @@ }, /area/prison/toilet/research) "aDs" = ( -/obj/structure/machinery/light/small{ - dir = 8 +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" }, -/turf/open/floor/wood, /area/prison/quarters/research) "aDt" = ( -/obj/structure/bed/chair/office/dark{ +/obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/wood, +/obj/structure/machinery/door/airlock/almayer/generic{ + density = 0; + icon_state = "door_open"; + name = "Toilet"; + opacity = 0 + }, +/turf/open/floor{ + icon_state = "freezerfloor" + }, /area/prison/quarters/research) "aDu" = ( /obj/structure/pipes/standard/simple/hidden/supply, @@ -10673,10 +10705,14 @@ /turf/open/floor/wood, /area/prison/quarters/research) "aDw" = ( -/obj/structure/machinery/light/small{ - dir = 8 +/obj/structure/surface/table, +/obj/item/clothing/head/beret/cm/red{ + desc = "Join the penal battalions today they said. Regret all of this you have."; + name = "\improper military beret" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/obj/effect/landmark/monkey_spawn, /turf/open/floor/wood, /area/prison/quarters/research) "aDy" = ( @@ -11111,7 +11147,10 @@ /obj/structure/pipes/vents/pump{ dir = 8 }, -/turf/open/floor/wood, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/prison/quarters/research) "aEH" = ( /obj/structure/closet, @@ -11825,6 +11864,7 @@ /obj/structure/pipes/vents/scrubber{ dir = 4 }, +/obj/effect/landmark/objective_landmark/medium, /turf/open/floor/wood, /area/prison/chapel) "aGJ" = ( @@ -11937,6 +11977,7 @@ pixel_x = 9; pixel_y = 8 }, +/obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison{ dir = 10; icon_state = "whitegreenfull" @@ -12067,17 +12108,8 @@ }, /area/prison/quarters/research) "aHq" = ( -/obj/structure/machinery/alarm/almayer{ - dir = 1 - }, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 - }, -/turf/open/floor/prison{ - dir = 1; - icon_state = "whitepurple" - }, -/area/prison/quarters/research) +/turf/open/floor/plating, +/area/space) "aHs" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -12125,10 +12157,14 @@ }, /area/prison/cellblock/highsec/north/south) "aHy" = ( -/obj/structure/machinery/light{ - dir = 1 +/obj/effect/alien/weeds/node, +/turf/open/floor/prison, +/area/prison/cellblock/highsec/south/south) +"aHz" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/obj/structure/pipes/standard/manifold/hidden/supply{ +/obj/structure/machinery/light{ dir = 1 }, /turf/open/floor/prison{ @@ -12136,13 +12172,6 @@ icon_state = "whitepurple" }, /area/prison/quarters/research) -"aHz" = ( -/obj/structure/pipes/standard/manifold/hidden/supply, -/turf/open/floor/prison{ - dir = 1; - icon_state = "whitepurple" - }, -/area/prison/quarters/research) "aHA" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -12480,6 +12509,9 @@ /obj/effect/decal/siding{ icon_state = "siding2" }, +/obj/effect/decal/siding/wood_siding{ + icon_state = "wood_siding2" + }, /turf/open/floor{ icon_state = "asteroid" }, @@ -12948,12 +12980,11 @@ }, /area/prison/quarters/research) "aJY" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8 +/obj/structure/machinery/door/airlock/almayer/maint/colony{ + name = "South Civilian Residences Access" }, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/wood, -/area/prison/quarters/research) +/turf/open/floor/plating, +/area/prison/maintenance/residential/nw) "aJZ" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, @@ -13398,7 +13429,7 @@ /turf/open/floor/prison{ icon_state = "greenfull" }, -/area/prison/maintenance/staff_research) +/area/prison/quarters/staff) "aLw" = ( /turf/open/floor/prison{ dir = 9; @@ -13688,8 +13719,8 @@ }, /area/prison/residential/north) "aMu" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 }, /turf/open/floor/prison{ dir = 1; @@ -13716,31 +13747,17 @@ }, /area/prison/quarters/staff) "aMy" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, +/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/prison{ - dir = 1; - icon_state = "green" + dir = 10; + icon_state = "sterile_white" }, -/area/prison/quarters/staff) +/area/prison/quarters/research) "aMz" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/prison{ - dir = 1; - icon_state = "green" - }, -/area/prison/quarters/staff) +/obj/structure/surface/table/reinforced, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/prison, +/area/prison/cellblock/highsec/north/north) "aMA" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -13754,12 +13771,8 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/obj/structure/machinery/door/airlock/almayer/medical/glass/colony{ - name = "Staff Quarters" - }, -/turf/open/floor/prison{ - icon_state = "greenfull" - }, +/obj/structure/window/framed/prison/reinforced, +/turf/open/floor/plating, /area/prison/quarters/staff) "aMC" = ( /obj/structure/pipes/standard/simple/hidden/supply{ @@ -16655,8 +16668,7 @@ dir = 6 }, /turf/open/floor/prison{ - dir = 4; - icon_state = "redcorner" + dir = 10 }, /area/prison/cellblock/highsec/north/south) "aVj" = ( @@ -17527,6 +17539,9 @@ /turf/open/floor/plating, /area/prison/maintenance/residential/nw) "aXI" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out" + }, /obj/effect/decal/warning_stripes{ icon_state = "SE-out" }, @@ -20082,6 +20097,7 @@ dir = 1; flipped = 1 }, +/obj/effect/landmark/objective_landmark/far, /turf/open/floor/prison{ dir = 10; icon_state = "bright_clean" @@ -21466,7 +21482,6 @@ /turf/open/gm/river, /area/prison/residential/central) "bja" = ( -/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/prison{ dir = 9; icon_state = "whitegreen" @@ -21555,12 +21570,11 @@ /turf/open/floor/wood, /area/prison/security/monitoring/highsec) "bjn" = ( -/obj/structure/machinery/door/airlock/almayer/engineering/colony{ - dir = 2; - name = "Storage" +/obj/structure/machinery/door/airlock/almayer/maint/colony{ + name = "South Civilian Residences Access" }, /turf/open/floor/plating, -/area/prison/security/monitoring/highsec) +/area/prison/maintenance/residential/ne) "bjo" = ( /obj/structure/window/reinforced{ dir = 4 @@ -21825,6 +21839,7 @@ "bkc" = ( /obj/structure/surface/table/reinforced, /obj/item/ammo_casing, +/obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ dir = 10; icon_state = "bright_clean2" @@ -21984,7 +21999,6 @@ /turf/open/organic/grass, /area/prison/residential/central) "bkC" = ( -/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/prison{ dir = 10; icon_state = "whitegreenfull" @@ -22044,7 +22058,9 @@ /area/prison/security/monitoring/highsec) "bkM" = ( /obj/structure/largecrate/random, -/turf/open/floor/plating, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/prison/security/monitoring/highsec) "bkN" = ( /obj/effect/landmark/monkey_spawn, @@ -22330,14 +22346,10 @@ /turf/open/floor/prison, /area/prison/hanger/main) "blI" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/prison/residential/central) +/obj/structure/surface/rack, +/obj/item/clothing/suit/storage/marine/light/vest, +/turf/open/floor/prison, +/area/prison/security/armory/lethal) "blK" = ( /obj/structure/pipes/standard/manifold/fourway/hidden/supply, /turf/open/floor/prison{ @@ -22734,7 +22746,6 @@ }, /area/prison/hanger/main) "bmT" = ( -/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/prison{ dir = 10; icon_state = "whitegreen" @@ -22825,7 +22836,9 @@ }, /area/prison/cellblock/vip) "bnh" = ( -/turf/open/floor/plating, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/prison/security/monitoring/highsec) "bni" = ( /obj/effect/decal/cleanable/blood, @@ -23308,6 +23321,7 @@ /area/prison/hanger/main) "boz" = ( /obj/effect/decal/siding, +/obj/effect/decal/siding/wood_siding, /turf/open/floor{ icon_state = "asteroid" }, @@ -23503,6 +23517,7 @@ dir = 4; flipped = 1 }, +/obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ dir = 10; icon_state = "bright_clean" @@ -24779,10 +24794,7 @@ dir = 4 }, /obj/structure/girder, -/turf/open/floor/prison{ - dir = 1; - icon_state = "yellow" - }, +/turf/open/floor/plating/plating_catwalk/prison, /area/prison/cellblock/mediumsec/south) "bsY" = ( /obj/structure/bed/chair/office/dark, @@ -26762,7 +26774,10 @@ }, /area/prison/holding/holding1) "bzv" = ( -/turf/closed/wall/prison, +/obj/structure/machinery/door/airlock/almayer/maint/colony{ + name = "South Civilian Residences Access" + }, +/turf/open/floor/plating, /area/prison/maintenance/residential/se) "bzw" = ( /obj/structure/pipes/standard/simple/hidden/supply, @@ -27829,9 +27844,12 @@ /turf/open/floor/plating/plating_catwalk/prison, /area/prison/hallway/east) "bCL" = ( -/obj/structure/girder, -/turf/open/floor/plating, -/area/prison/maintenance/residential/access/south) +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, +/area/prison/cellblock/lowsec/se) "bCM" = ( /turf/open/floor/prison{ dir = 4; @@ -28643,24 +28661,16 @@ /obj/structure/machinery/light{ dir = 1 }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/item/stack/rods, /turf/open/floor/prison{ - dir = 1; - icon_state = "yellow" + icon_state = "yellowfull" }, -/area/prison/cellblock/mediumsec/south) +/area/prison/cellblock/mediumsec/north) "bEZ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, /obj/item/stack/rods, -/turf/open/floor/prison{ - dir = 1; - icon_state = "yellow" - }, +/turf/open/floor/plating/plating_catwalk/prison, /area/prison/cellblock/mediumsec/south) "bFb" = ( /turf/open/floor/prison{ @@ -29003,10 +29013,7 @@ dir = 8 }, /obj/effect/decal/cleanable/blood, -/turf/open/floor/prison{ - dir = 8; - icon_state = "red" - }, +/turf/open/floor/prison, /area/prison/cellblock/highsec/south/north) "bGa" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ @@ -29494,6 +29501,7 @@ pixel_y = 7 }, /obj/effect/decal/cleanable/blood/gibs, +/obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison{ dir = 10; icon_state = "darkredfull2" @@ -30128,6 +30136,7 @@ pixel_y = 8 }, /obj/structure/pipes/vents/scrubber, +/obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison{ dir = 10; icon_state = "darkredfull2" @@ -32490,14 +32499,12 @@ }, /area/prison/security/checkpoint/medsec) "bQW" = ( -/obj/structure/machinery/light, /turf/open/floor/prison{ dir = 10; icon_state = "yellow" }, /area/prison/security/checkpoint/medsec) "bQX" = ( -/obj/structure/machinery/light, /turf/open/floor/prison{ dir = 6; icon_state = "yellow" @@ -32513,6 +32520,7 @@ pixel_x = 9; pixel_y = 8 }, +/obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison{ dir = 10; icon_state = "darkredfull2" @@ -32534,6 +32542,7 @@ /turf/open/floor/prison, /area/prison/security/checkpoint/medsec) "bRb" = ( +/obj/item/clothing/suit/storage/marine/light/vest, /turf/open/floor/prison{ dir = 4; icon_state = "darkred2" @@ -32631,6 +32640,7 @@ "bRo" = ( /obj/structure/surface/table/reinforced, /obj/item/tool/pen, +/obj/effect/landmark/objective_landmark/close, /turf/open/floor/wood, /area/prison/library) "bRp" = ( @@ -33011,6 +33021,7 @@ "bSD" = ( /obj/structure/surface/table/reinforced, /obj/item/device/flashlight/lamp, +/obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison{ dir = 10; icon_state = "darkredfull2" @@ -33071,10 +33082,10 @@ /area/prison/storage/medsec) "bSM" = ( /turf/open/floor/prison{ - dir = 10; - icon_state = "blue" + dir = 1; + icon_state = "redcorner" }, -/area/prison/cellblock/protective) +/area/prison/security/monitoring/highsec) "bSN" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment, @@ -34983,10 +34994,7 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/turf/open/floor/prison{ - dir = 8; - icon_state = "red" - }, +/turf/open/floor/prison, /area/prison/cellblock/highsec/south/north) "bYy" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ @@ -35010,6 +35018,7 @@ "bYB" = ( /obj/structure/surface/table/woodentable, /obj/item/tool/stamp/hos, +/obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison, /area/prison/security/head) "bYC" = ( @@ -35034,6 +35043,7 @@ pixel_x = -3; pixel_y = 7 }, +/obj/effect/landmark/objective_landmark/close, /turf/open/floor/carpet, /area/prison/security/head) "bYH" = ( @@ -35642,9 +35652,6 @@ }, /area/prison/cellblock/protective) "caL" = ( -/obj/structure/machinery/light{ - dir = 4 - }, /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/junction{ dir = 1; @@ -36074,7 +36081,7 @@ /turf/open/floor/plating/plating_catwalk/prison, /area/prison/security) "ccf" = ( -/obj/structure/pipes/vents/pump{ +/obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, /turf/open/floor/prison{ @@ -36308,16 +36315,13 @@ /turf/open/floor/plating/plating_catwalk/prison, /area/prison/cellblock/mediumsec/north) "ccY" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 +/obj/structure/platform{ + dir = 8 }, /turf/open/floor/prison{ - dir = 8; - icon_state = "yellow" + icon_state = "red" }, -/area/prison/cellblock/mediumsec/north) +/area/prison/security/monitoring/highsec) "cde" = ( /turf/closed/wall/prison, /area/prison/quarters/staff) @@ -36616,6 +36620,7 @@ "cec" = ( /obj/structure/surface/table/woodentable, /obj/item/device/taperecorder, +/obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison, /area/prison/security/head) "ced" = ( @@ -37949,6 +37954,7 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 }, +/obj/effect/landmark/objective_landmark/close, /turf/open/floor/wood, /area/prison/security/head) "cin" = ( @@ -38057,19 +38063,18 @@ }, /area/prison/cellblock/mediumsec/north) "ciD" = ( -/obj/structure/pipes/vents/scrubber, +/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/prison{ - dir = 1; - icon_state = "yellowcorner" + icon_state = "floor_plate" }, -/area/prison/cellblock/mediumsec/north) +/area/prison/quarters/staff) "ciE" = ( -/obj/structure/pipes/vents/pump/on, +/obj/item/clothing/suit/storage/marine/light/vest, /turf/open/floor/prison{ - dir = 1; - icon_state = "yellow" + dir = 10; + icon_state = "bright_clean" }, -/area/prison/cellblock/mediumsec/north) +/area/prison/hallway/east) "ciF" = ( /obj/structure/girder/reinforced, /turf/open/floor/prison{ @@ -38437,11 +38442,11 @@ }, /area/prison/cellblock/mediumsec/north) "cjL" = ( -/obj/structure/pipes/standard/manifold/hidden/supply, +/obj/item/clothing/suit/storage/marine/light/vest, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "darkred2" }, -/area/prison/cellblock/mediumsec/north) +/area/prison/security/checkpoint/maxsec) "cjN" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -38489,9 +38494,7 @@ /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 }, -/turf/open/floor/prison{ - icon_state = "bluecorner" - }, +/turf/open/floor/plating/plating_catwalk/prison, /area/prison/cellblock/protective) "cjU" = ( /obj/structure/pipes/standard/manifold/hidden/supply, @@ -38786,12 +38789,13 @@ }, /area/prison/cellblock/protective) "ckO" = ( -/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, /turf/open/floor/prison{ - dir = 4; - icon_state = "blue" + dir = 10 }, -/area/prison/cellblock/protective) +/area/prison/cellblock/highsec/north/south) "ckP" = ( /obj/structure/machinery/door/airlock/prison/horizontal{ density = 0; @@ -38849,6 +38853,7 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, +/obj/effect/landmark/objective_landmark/close, /turf/open/floor/wood, /area/prison/parole/protective_custody) "ckW" = ( @@ -38959,8 +38964,7 @@ "clp" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/prison{ - dir = 8; - icon_state = "yellowcorner" + icon_state = "floor_plate" }, /area/prison/cellblock/mediumsec/north) "clq" = ( @@ -39264,10 +39268,7 @@ /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 }, -/turf/open/floor/prison{ - dir = 4; - icon_state = "blue" - }, +/turf/open/floor/plating/plating_catwalk/prison, /area/prison/cellblock/protective) "cmo" = ( /obj/structure/machinery/light/small{ @@ -39617,6 +39618,7 @@ dir = 8 }, /obj/effect/decal/cleanable/blood, +/obj/effect/landmark/objective_landmark/close, /turf/open/floor/plating, /area/prison/disposal) "cnA" = ( @@ -40237,6 +40239,7 @@ /area/prison/disposal) "cpC" = ( /obj/structure/surface/table/reinforced, +/obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ dir = 10; icon_state = "bright_clean" @@ -40590,15 +40593,12 @@ }, /area/prison/cellblock/mediumsec/east) "cqY" = ( -/obj/structure/machinery/light{ - dir = 1 - }, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, /turf/open/floor/prison{ - dir = 1; - icon_state = "yellow" + dir = 4; + icon_state = "yellowcorner" }, /area/prison/cellblock/mediumsec/east) "cra" = ( @@ -40713,6 +40713,7 @@ /obj/structure/machinery/light{ dir = 4 }, +/obj/effect/landmark/objective_landmark/far, /turf/open/shuttle, /area/prison/pirate) "crp" = ( @@ -40803,6 +40804,7 @@ "crJ" = ( /obj/structure/surface/table/woodentable, /obj/item/device/flashlight/lamp, +/obj/effect/landmark/objective_landmark/far, /turf/open/floor/carpet, /area/prison/pirate) "crK" = ( @@ -41287,19 +41289,16 @@ /area/prison/cellblock/mediumsec/south) "cto" = ( /obj/effect/decal/cleanable/blood, -/obj/structure/pipes/standard/manifold/hidden/supply, -/turf/open/floor/prison{ - dir = 1; - icon_state = "yellowcorner" +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, +/turf/open/floor/plating/plating_catwalk/prison, /area/prison/cellblock/mediumsec/south) "ctp" = ( -/obj/structure/pipes/standard/manifold/fourway/hidden/supply, -/turf/open/floor/prison{ - dir = 4; - icon_state = "yellowcorner" - }, -/area/prison/cellblock/mediumsec/south) +/obj/structure/surface/rack, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/prison, +/area/prison/security/armory/lethal) "ctq" = ( /obj/item/weapon/gun/rifle/mar40, /turf/open/floor/plating, @@ -41687,14 +41686,11 @@ }, /area/prison/cellblock/mediumsec/south) "cuv" = ( -/obj/structure/pipes/vents/pump{ - dir = 8 - }, +/obj/structure/pipes/vents/pump/on, /turf/open/floor/prison{ - dir = 4; - icon_state = "yellow" + icon_state = "yellowfull" }, -/area/prison/cellblock/mediumsec/south) +/area/prison/cellblock/mediumsec/north) "cuw" = ( /obj/structure/pipes/vents/pump{ dir = 8 @@ -41983,6 +41979,7 @@ "cvy" = ( /obj/structure/surface/rack, /obj/item/clothing/head/soft/ferret, +/obj/effect/landmark/objective_landmark/far, /turf/open/floor/prison{ dir = 6; icon_state = "darkred2" @@ -42919,6 +42916,7 @@ pixel_x = 9; pixel_y = 8 }, +/obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ dir = 1; icon_state = "darkred2" @@ -42945,6 +42943,7 @@ "cyX" = ( /obj/structure/surface/table/reinforced, /obj/item/device/flashlight/lamp, +/obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ dir = 1; icon_state = "darkred2" @@ -43060,6 +43059,7 @@ /area/prison/security/monitoring/medsec/south) "czq" = ( /obj/structure/surface/table/reinforced, +/obj/effect/landmark/objective_landmark/far, /turf/open/floor/prison, /area/prison/security/monitoring/medsec/south) "czr" = ( @@ -43293,6 +43293,15 @@ icon_state = "darkpurple2" }, /area/prison/hanger/research) +"cMD" = ( +/obj/structure/platform{ + dir = 4 + }, +/turf/open/floor/prison{ + dir = 1; + icon_state = "red" + }, +/area/prison/security/monitoring/highsec) "cMW" = ( /obj/item/weapon/gun/rifle/mar40, /turf/open/floor/prison{ @@ -43345,12 +43354,29 @@ icon_state = "bright_clean2" }, /area/prison/hallway/central/west) +"cVE" = ( +/obj/structure/toilet{ + dir = 4 + }, +/obj/structure/machinery/light/small{ + dir = 1 + }, +/obj/effect/landmark/objective_landmark/medium, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/prison/recreation/highsec/n) "cWg" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony{ dir = 2 }, /turf/open/floor/prison, /area/prison/canteen) +"cWm" = ( +/obj/structure/bookcase, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/wood, +/area/prison/residential/north) "cWx" = ( /turf/open/floor/prison{ dir = 10; @@ -43384,6 +43410,14 @@ icon_state = "sterile_white" }, /area/prison/research/RD) +"cYN" = ( +/obj/structure/surface/table/reinforced, +/obj/effect/landmark/objective_landmark/medium, +/turf/open/floor/prison{ + dir = 10; + icon_state = "bright_clean" + }, +/area/prison/execution) "cYR" = ( /obj/structure/machinery/power/apc{ dir = 1; @@ -43411,6 +43445,12 @@ icon_state = "darkyellowfull2" }, /area/prison/storage/medsec) +"ddF" = ( +/obj/structure/machinery/door/airlock/almayer/medical/glass/colony{ + name = "Staff Quarters" + }, +/turf/open/floor/plating, +/area/prison/quarters/staff) "deI" = ( /turf/closed/shuttle/elevator{ dir = 10 @@ -43597,6 +43637,13 @@ icon_state = "bright_clean2" }, /area/prison/cellblock/highsec/south/south) +"dGa" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/prison{ + dir = 1; + icon_state = "red" + }, +/area/prison/cellblock/highsec/north/north) "dHr" = ( /turf/open/floor/prison{ dir = 1; @@ -43646,14 +43693,9 @@ }, /area/prison/hanger/research) "dRQ" = ( -/obj/structure/machinery/alarm/almayer{ - dir = 1 - }, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/prison, -/area/prison/storage/medsec) +/obj/structure/window/framed/prison/reinforced, +/turf/open/floor/plating, +/area/prison/quarters/staff) "dSI" = ( /obj/structure/largecrate/random, /turf/open/floor/plating, @@ -43674,12 +43716,30 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/prison/hallway/central/north) +"dXt" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/item/clothing/suit/storage/marine/light/vest, +/turf/open/floor/plating/plating_catwalk/prison, +/area/prison/security) "dYS" = ( /obj/structure/machinery/light{ dir = 4 }, /turf/open/floor/plating, /area/prison/maintenance/residential/access/north) +"dYY" = ( +/obj/structure/bed, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, +/area/prison/cellblock/highsec/south/south) "ead" = ( /obj/structure/largecrate/random/secure, /turf/open/floor/plating, @@ -43689,6 +43749,12 @@ /obj/item/tool/mop, /turf/open/floor/plating, /area/prison/maintenance/residential/nw) +"ecV" = ( +/obj/structure/window/framed/prison/reinforced, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/prison/quarters/research) "eev" = ( /obj/structure/bed/chair/office{ dir = 4 @@ -43718,6 +43784,7 @@ /obj/structure/machinery/alarm/almayer{ dir = 1 }, +/obj/effect/landmark/objective_landmark/medium, /turf/open/floor/wood, /area/prison/library) "efw" = ( @@ -43730,6 +43797,12 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating, /area/prison/research/secret/bioengineering) +"ejG" = ( +/obj/structure/pipes/vents/scrubber, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, +/area/prison/cellblock/mediumsec/north) "ekt" = ( /obj/structure/machinery/light, /turf/open/floor/plating, @@ -43751,6 +43824,12 @@ }, /turf/open/floor/plating, /area/prison/maintenance/residential/nw) +"eoV" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/open/floor/wood, +/area/prison/security/monitoring/highsec) "ept" = ( /obj/item/tool/warning_cone, /obj/effect/decal/cleanable/blood/oil, @@ -43760,6 +43839,11 @@ /obj/structure/machinery/light, /turf/open/floor/plating, /area/prison/maintenance/residential/access/north) +"erY" = ( +/obj/structure/surface/table/woodentable, +/obj/effect/landmark/objective_landmark/far, +/turf/open/floor/wood, +/area/prison/residential/south) "esR" = ( /turf/open/organic/grass, /area/prison/residential/north) @@ -43803,6 +43887,16 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/prison, /area/prison/residential/central) +"eBd" = ( +/obj/structure/surface/table/gamblingtable, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/prison{ + dir = 10 + }, +/area/prison/recreation/highsec/n) "eBV" = ( /obj/structure/machinery/door/airlock/almayer/security/glass/colony{ dir = 2; @@ -43834,6 +43928,16 @@ icon_state = "yellow" }, /area/prison/cellblock/mediumsec/south) +"eIW" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 12 + }, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/prison/cellblock/mediumsec/east) "eKr" = ( /turf/open/floor/plating, /area/prison/storage/medsec) @@ -43851,6 +43955,15 @@ /obj/effect/alien/weeds/node, /turf/open/floor/plating, /area/prison/maintenance/residential/se) +"eLy" = ( +/obj/structure/machinery/door/airlock/almayer/medical/glass/colony{ + name = "Staff Quarters"; + dir = 2 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/prison/quarters/research) "eLV" = ( /obj/item/device/walkman, /obj/structure/surface/table/almayer, @@ -43896,6 +44009,10 @@ "eRY" = ( /turf/closed/wall/r_wall/prison, /area/prison/cellblock/mediumsec/north) +"eTd" = ( +/obj/structure/window/framed/prison/reinforced, +/turf/open/floor/plating, +/area/prison/research/secret/containment) "eTo" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/prison{ @@ -43953,9 +44070,9 @@ }, /area/prison/cellblock/mediumsec/north) "faW" = ( -/obj/structure/girder/displaced, -/turf/open/floor/plating, -/area/prison/maintenance/residential/access/south) +/obj/structure/machinery/light, +/turf/open/floor/prison, +/area/prison/security/checkpoint/medsec) "fbk" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony{ dir = 2 @@ -43983,6 +44100,11 @@ /obj/effect/alien/weeds/node, /turf/open/floor/plating, /area/prison/maintenance/residential/sw) +"fhj" = ( +/obj/structure/surface/table/reinforced, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/wood, +/area/prison/library) "fkk" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -44048,6 +44170,12 @@ icon_state = "kitchen" }, /area/prison/cellblock/lowsec/se) +"fxL" = ( +/obj/structure/machinery/door/airlock/almayer/security/glass/colony{ + name = "Maximum-Security Panopticon" + }, +/turf/open/floor/plating, +/area/prison/cellblock/maxsec/south) "fxZ" = ( /obj/structure/machinery/door/airlock/prison{ density = 0; @@ -44074,6 +44202,23 @@ }, /turf/open/floor/plating, /area/prison/maintenance/residential/sw) +"fDd" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/alarm/almayer{ + dir = 1 + }, +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitepurple" + }, +/area/prison/quarters/research) +"fEo" = ( +/obj/structure/pipes/standard/manifold/hidden/supply, +/obj/structure/platform, +/turf/open/floor/plating/plating_catwalk/prison, +/area/prison/security/monitoring/highsec) "fEZ" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/prison{ @@ -44094,12 +44239,23 @@ icon_state = "sterile_white" }, /area/prison/research/secret/testing) +"fGn" = ( +/obj/structure/bed, +/obj/item/bedsheet, +/obj/effect/landmark/objective_landmark/medium, +/turf/open/floor/wood, +/area/prison/residential/north) "fHI" = ( /obj/structure/machinery/light{ dir = 8 }, /turf/open/floor/plating, /area/prison/cellblock/mediumsec/east) +"fLj" = ( +/obj/structure/surface/table/woodentable, +/obj/effect/landmark/objective_landmark/medium, +/turf/open/floor/wood, +/area/prison/residential/north) "fLH" = ( /obj/structure/machinery/space_heater, /turf/open/floor/prison{ @@ -44239,6 +44395,10 @@ icon_state = "damaged2" }, /area/prison/hallway/central/east) +"gfR" = ( +/obj/structure/mineral_door/resin, +/turf/open/floor/prison, +/area/prison/cellblock/highsec/south/north) "ghp" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -44342,6 +44502,15 @@ icon_state = "darkpurple2" }, /area/prison/hanger/research) +"gxE" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "red" + }, +/area/prison/cellblock/highsec/north/south) "gxV" = ( /obj/structure/surface/table/reinforced, /obj/item/reagent_container/food/snacks/boiledrice, @@ -44350,12 +44519,27 @@ icon_state = "bright_clean" }, /area/prison/canteen) +"gzC" = ( +/obj/structure/largecrate/random, +/obj/structure/platform{ + dir = 8 + }, +/turf/open/floor/prison{ + icon_state = "redfull" + }, +/area/prison/security/monitoring/highsec) "gAa" = ( /obj/structure/machinery/light/small{ dir = 1 }, /turf/open/floor/prison, /area/prison/medbay/morgue) +"gAD" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/plating, +/area/prison/cellblock/maxsec/south) "gAV" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -44409,6 +44593,13 @@ icon_state = "darkyellow2" }, /area/prison/telecomms) +"gHk" = ( +/obj/item/clothing/suit/storage/marine/light/vest, +/turf/open/floor/prison{ + dir = 10; + icon_state = "darkredfull2" + }, +/area/prison/cellblock/maxsec/north) "gIv" = ( /obj/structure/stairs/perspective{ dir = 8; @@ -44440,6 +44631,15 @@ }, /turf/open/floor/carpet, /area/prison/residential/central) +"gJD" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, +/turf/open/floor/prison{ + dir = 1; + icon_state = "green" + }, +/area/prison/quarters/staff) "gJO" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -44498,7 +44698,7 @@ dir = 4 }, /turf/open/floor/prison{ - dir = 9; + dir = 1; icon_state = "blue" }, /area/prison/cellblock/protective) @@ -44511,8 +44711,11 @@ }, /area/prison/cellblock/mediumsec/west) "gPR" = ( -/turf/closed/wall/prison, -/area/prison/maintenance/staff_research) +/obj/structure/machinery/door/airlock/almayer/maint/colony{ + name = "South Civilian Residences Access" + }, +/turf/open/floor/plating, +/area/prison/maintenance/residential/sw) "gPU" = ( /obj/structure/machinery/light/small, /turf/open/floor/prison{ @@ -44540,6 +44743,17 @@ }, /turf/closed/wall/prison, /area/prison/residential/central) +"gTb" = ( +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/closed/wall/prison, +/area/prison/cellblock/mediumsec/south) +"gUX" = ( +/turf/open/floor/prison{ + icon_state = "bluefull" + }, +/area/prison/storage/medsec) "gWT" = ( /obj/structure/largecrate/random/case, /turf/open/floor/plating, @@ -44550,6 +44764,11 @@ }, /turf/open/floor/plating, /area/prison/cellblock/highsec/south/south) +"hak" = ( +/turf/open/floor/prison{ + icon_state = "redcorner" + }, +/area/prison/security/monitoring/highsec) "hcG" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -44643,8 +44862,7 @@ dir = 4 }, /turf/open/floor/prison{ - dir = 8; - icon_state = "yellow" + icon_state = "floor_plate" }, /area/prison/cellblock/mediumsec/east) "hnD" = ( @@ -44654,14 +44872,10 @@ /turf/open/floor/plating, /area/prison/quarters/research) "hoY" = ( -/obj/structure/largecrate/random, -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 +/turf/open/floor/prison{ + icon_state = "kitchen" }, -/turf/open/floor/plating, -/area/prison/security/monitoring/highsec) +/area/prison/cellblock/highsec/north/south) "hpd" = ( /obj/structure/stairs/perspective{ dir = 4; @@ -44682,6 +44896,16 @@ /obj/effect/landmark/static_comms/net_one, /turf/open/floor/prison, /area/prison/telecomms) +"hwb" = ( +/obj/effect/landmark/objective_landmark/medium, +/turf/open/floor/wood, +/area/prison/security/monitoring/highsec) +"hxD" = ( +/turf/open/floor/prison{ + dir = 10; + icon_state = "blue" + }, +/area/prison/storage/medsec) "hyp" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -44730,10 +44954,7 @@ dir = 8 }, /obj/structure/mineral_door/resin, -/turf/open/floor/prison{ - dir = 8; - icon_state = "red" - }, +/turf/open/floor/prison, /area/prison/cellblock/highsec/south/north) "hCM" = ( /obj/structure/pipes/standard/simple/hidden/supply{ @@ -44744,6 +44965,14 @@ icon_state = "chapel" }, /area/prison/chapel) +"hEr" = ( +/obj/structure/surface/rack, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/prison{ + dir = 10; + icon_state = "bright_clean" + }, +/area/prison/laundry) "hEK" = ( /obj/structure/machinery/light/small, /turf/open/floor/plating/plating_catwalk/prison, @@ -44819,6 +45048,12 @@ icon_state = "floor_plate" }, /area/prison/cellblock/highsec/south/north) +"hMX" = ( +/obj/structure/machinery/door/airlock/almayer/maint/colony{ + name = "South Civilian Residences Access" + }, +/turf/open/floor/plating, +/area/prison/monorail/west) "hND" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -44854,6 +45089,16 @@ icon_state = "floor_plate" }, /area/prison/cellblock/mediumsec/south) +"hOU" = ( +/obj/structure/sink{ + dir = 8; + pixel_x = -12 + }, +/obj/effect/landmark/objective_landmark/far, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/prison/cellblock/mediumsec/south) "hQm" = ( /turf/open/floor/prison{ dir = 10; @@ -44925,6 +45170,19 @@ /obj/effect/landmark/monkey_spawn, /turf/open/floor/plating/plating_catwalk/prison, /area/prison/hallway/central/south) +"hXf" = ( +/obj/effect/landmark/objective_landmark/close, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, +/turf/open/floor{ + icon_state = "freezerfloor" + }, +/area/prison/quarters/research) "hXj" = ( /turf/open/floor/prison{ dir = 5; @@ -44948,8 +45206,7 @@ use_power = 0 }, /turf/open/floor/prison{ - dir = 8; - icon_state = "yellow" + icon_state = "floor_plate" }, /area/prison/cellblock/mediumsec/north) "hYq" = ( @@ -44966,6 +45223,19 @@ icon_state = "bright_clean" }, /area/prison/yard) +"hZJ" = ( +/obj/structure/machinery/door/poddoor/almayer{ + dir = 2; + id = "map_lockdown"; + name = "Timed Emergency Blast Door"; + unacidable = 1; + use_power = 0 + }, +/turf/open/floor/prison{ + dir = 8; + icon_state = "yellow" + }, +/area/prison/cellblock/mediumsec/north) "ibG" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -44992,6 +45262,16 @@ icon_state = "asteroid" }, /area/prison/residential/north) +"ieK" = ( +/obj/structure/sink{ + dir = 8; + pixel_x = -12 + }, +/obj/effect/landmark/objective_landmark/medium, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/prison/cellblock/mediumsec/east) "ifS" = ( /obj/structure/largecrate/random/barrel, /turf/open/floor/prison{ @@ -45017,6 +45297,16 @@ icon_state = "darkredfull2" }, /area/prison/security/checkpoint/highsec/s) +"igP" = ( +/obj/structure/surface/table/reinforced{ + dir = 8; + flipped = 1 + }, +/obj/effect/landmark/objective_landmark/medium, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/prison/cellblock/mediumsec/south) "iif" = ( /obj/effect/landmark/hunter_primary, /turf/open/floor/plating/plating_catwalk/prison, @@ -45024,10 +45314,22 @@ "iiI" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/prison{ - dir = 4; - icon_state = "yellowcorner" + icon_state = "floor_plate" }, /area/prison/cellblock/mediumsec/east) +"iiZ" = ( +/obj/structure/machinery/light, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out" + }, +/turf/open/floor/plating, +/area/prison/maintenance/residential/ne) +"ikv" = ( +/turf/open/floor/prison{ + dir = 8; + icon_state = "redcorner" + }, +/area/prison/security/monitoring/highsec) "iob" = ( /turf/open/floor/prison{ dir = 10; @@ -45047,6 +45349,17 @@ icon_state = "yellow" }, /area/prison/cellblock/mediumsec/north) +"ioU" = ( +/obj/structure/toilet{ + dir = 8; + pixel_x = -4 + }, +/obj/effect/landmark/objective_landmark/medium, +/turf/open/floor/prison{ + dir = 4; + icon_state = "cell_stripe" + }, +/area/prison/cellblock/highsec/north/south) "iph" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -45103,6 +45416,12 @@ icon_state = "cell_stripe" }, /area/prison/cellblock/mediumsec/west) +"ivH" = ( +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/prison{ + icon_state = "bluecorner" + }, +/area/prison/cellblock/protective) "ixb" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -45149,6 +45468,17 @@ }, /turf/open/floor/plating, /area/prison/maintenance/residential/sw) +"iCq" = ( +/obj/structure/surface/table/reinforced{ + dir = 1; + flipped = 1 + }, +/obj/effect/landmark/objective_landmark/far, +/turf/open/floor/prison{ + dir = 10; + icon_state = "bright_clean" + }, +/area/prison/yard) "iCH" = ( /obj/structure/machinery/computer/telecomms/traffic{ req_one_access_txt = "19;200" @@ -45222,9 +45552,6 @@ }, /area/prison/security/checkpoint/highsec/n) "iOc" = ( -/obj/structure/machinery/light{ - dir = 4 - }, /obj/structure/bed/chair{ dir = 8 }, @@ -45240,12 +45567,26 @@ /obj/item/storage/box/mousetraps, /turf/open/floor/plating, /area/prison/maintenance/residential/sw) +"iRY" = ( +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkred2" + }, +/area/prison/cellblock/mediumsec/east) "iSi" = ( /turf/open/floor/prison{ dir = 10; icon_state = "bright_clean" }, /area/prison/maintenance/residential/access/south) +"iTm" = ( +/obj/structure/pipes/vents/scrubber{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, +/area/prison/cellblock/mediumsec/north) "iVr" = ( /obj/structure/bed/chair/comfy, /obj/structure/sign/poster{ @@ -45254,6 +45595,10 @@ }, /turf/open/floor/prison, /area/prison/recreation/medsec) +"iWD" = ( +/obj/structure/bed, +/turf/open/floor/plating, +/area/prison/cellblock/mediumsec/south) "iWG" = ( /turf/open/floor/prison{ dir = 9; @@ -45282,6 +45627,15 @@ icon_state = "sterile_white" }, /area/prison/residential/north) +"iZo" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/platform_decoration{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk/prison, +/area/prison/security/monitoring/highsec) "jan" = ( /obj/structure/pipes/vents/pump{ dir = 8 @@ -45333,6 +45687,15 @@ "jfp" = ( /turf/closed/wall/prison, /area/prison/storage/highsec/n) +"jfB" = ( +/obj/structure/largecrate/random, +/obj/structure/platform{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "redfull" + }, +/area/prison/security/monitoring/highsec) "jfN" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk/prison, @@ -45411,6 +45774,12 @@ icon_state = "darkyellowfull2" }, /area/prison/hangar_storage/main) +"joL" = ( +/obj/effect/landmark/objective_landmark/medium, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/prison/cellblock/mediumsec/east) "jpt" = ( /obj/structure/machinery/light{ dir = 4 @@ -45456,6 +45825,15 @@ icon_state = "darkpurple2" }, /area/prison/hanger/research) +"jsP" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/platform_decoration{ + dir = 8 + }, +/turf/open/floor/plating/plating_catwalk/prison, +/area/prison/security/monitoring/highsec) "jtk" = ( /obj/effect/alien/weeds/node, /turf/open/floor/prison{ @@ -45583,6 +45961,16 @@ icon_state = "darkyellowfull2" }, /area/prison/storage/medsec) +"jNE" = ( +/obj/structure/machinery/shower{ + dir = 8 + }, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/prison{ + dir = 10; + icon_state = "kitchen" + }, +/area/prison/cellblock/lowsec/se) "jOj" = ( /obj/structure/surface/table/reinforced, /obj/item/tank/nitrogen, @@ -45590,6 +45978,10 @@ icon_state = "redfull" }, /area/prison/hallway/central/west) +"jPh" = ( +/obj/effect/landmark/objective_landmark/far, +/turf/open/floor/prison, +/area/prison/security/monitoring/maxsec/panopticon) "jRi" = ( /obj/structure/machinery/light{ dir = 1 @@ -45712,6 +46104,13 @@ icon_state = "damaged2" }, /area/prison/hallway/central/south) +"kfb" = ( +/obj/structure/machinery/door/poddoor/almayer/open{ + name = "emergency lockdown"; + use_power = 0 + }, +/turf/open/floor/plating, +/area/prison/cellblock/mediumsec/east) "kfj" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -45734,6 +46133,15 @@ icon_state = "floor_plate" }, /area/prison/cellblock/lowsec/nw) +"kjc" = ( +/obj/structure/surface/table, +/obj/item/clothing/head/beret/cm/red{ + desc = "Join the penal battalions today they said. Regret all of this you have."; + name = "\improper military beret" + }, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/wood, +/area/prison/quarters/research) "kjh" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -45849,6 +46257,14 @@ icon_state = "bright_clean2" }, /area/prison/cellblock/highsec/south/south) +"kBV" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "cell_stripe" + }, +/area/prison/cellblock/mediumsec/north) "kCz" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -45871,6 +46287,16 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/prison/hallway/central/east) +"kDV" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/item/clothing/suit/storage/marine/light/vest, +/turf/open/floor/prison{ + dir = 1; + icon_state = "red" + }, +/area/prison/cellblock/highsec/south/south) "kEk" = ( /obj/structure/surface/table/reinforced, /obj/item/device/flashlight/lamp, @@ -45895,6 +46321,10 @@ icon_state = "sterile_white" }, /area/prison/cellblock/lowsec/se) +"kIU" = ( +/obj/item/hardpoint/locomotion/van_wheels, +/turf/open/floor/plating, +/area/prison/cellblock/mediumsec/west) "kJw" = ( /obj/structure/largecrate/random, /turf/open/floor/prison{ @@ -45930,6 +46360,14 @@ "kSt" = ( /turf/closed/wall/r_wall/prison_unmeltable, /area/prison/maintenance/staff_research) +"kXt" = ( +/obj/structure/surface/table/reinforced, +/obj/effect/landmark/objective_landmark/science, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/prison/research/secret/testing) "kZc" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -45995,6 +46433,14 @@ icon_state = "red" }, /area/prison/recreation/highsec/s) +"lhI" = ( +/obj/structure/toilet, +/obj/effect/landmark/objective_landmark/medium, +/turf/open/floor/prison{ + dir = 1; + icon_state = "cell_stripe" + }, +/area/prison/cellblock/highsec/north/south) "liM" = ( /obj/structure/machinery/light/small, /obj/item/storage/box/lights, @@ -46047,6 +46493,18 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/prison, /area/prison/cellblock/highsec/north/south) +"lpc" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/prison{ + dir = 9; + icon_state = "blue" + }, +/area/prison/storage/medsec) "lpo" = ( /obj/structure/window/framed/prison/reinforced/hull, /turf/open/floor/plating, @@ -46063,6 +46521,13 @@ icon_state = "yellowcorner" }, /area/prison/cellblock/mediumsec/east) +"lrU" = ( +/obj/structure/bed/chair/comfy{ + dir = 4 + }, +/obj/item/clothing/suit/storage/marine/light/vest, +/turf/open/floor/carpet, +/area/prison/residential/central) "ltv" = ( /turf/open/floor/prison{ dir = 10; @@ -46119,6 +46584,12 @@ icon_state = "blue" }, /area/prison/cellblock/protective) +"lCo" = ( +/turf/open/floor/prison{ + dir = 8; + icon_state = "blue" + }, +/area/prison/storage/medsec) "lCQ" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, /obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall, @@ -46167,6 +46638,14 @@ }, /turf/open/floor/plating, /area/prison/maintenance/staff_research) +"lJe" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, +/turf/open/floor/prison{ + dir = 10 + }, +/area/prison/cellblock/highsec/north/north) "lJo" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/prison, @@ -46197,6 +46676,11 @@ }, /turf/open/floor/plating, /area/prison/maintenance/residential/nw) +"lTK" = ( +/obj/structure/closet, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/prison, +/area/prison/quarters/security) "lUS" = ( /obj/structure/sign/poster{ icon_state = "poster_agents"; @@ -46227,6 +46711,12 @@ icon_state = "floor_plate" }, /area/prison/cellblock/lowsec/nw) +"lWn" = ( +/turf/open/floor/prison{ + dir = 8; + icon_state = "red" + }, +/area/prison/security/monitoring/highsec) "lWT" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -46292,6 +46782,10 @@ }, /turf/open/floor/plating, /area/prison/maintenance/residential/access/south) +"mjw" = ( +/obj/effect/landmark/objective_landmark/science, +/turf/open/floor/wood, +/area/prison/security/monitoring/highsec) "mjI" = ( /obj/structure/surface/table, /obj/item/book/manual/medical_diagnostics_manual, @@ -46308,6 +46802,12 @@ icon_state = "asteroid" }, /area/prison/residential/north) +"mlg" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/prison{ + icon_state = "greenfull" + }, +/area/prison/quarters/research) "mpg" = ( /obj/structure/closet/gmcloset, /turf/open/floor/plating, @@ -46341,6 +46841,14 @@ icon_state = "bright_clean" }, /area/prison/store) +"mtX" = ( +/obj/structure/bed, +/obj/effect/landmark/objective_landmark/medium, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, +/area/prison/cellblock/highsec/north/north) "mxM" = ( /turf/open/floor/prison{ dir = 8; @@ -46483,6 +46991,15 @@ }, /turf/open/floor/carpet, /area/prison/residential/north) +"mOQ" = ( +/obj/structure/surface/table/reinforced, +/obj/item/reagent_container/food/condiment/saltshaker, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/prison{ + dir = 10; + icon_state = "bright_clean" + }, +/area/prison/canteen) "mPy" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -46559,20 +47076,21 @@ }, /turf/open/floor/plating, /area/prison/cellblock/mediumsec/west) +"mZT" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/prison{ + dir = 10 + }, +/area/prison/cellblock/highsec/north/south) "ncG" = ( /obj/structure/window_frame/prison, /turf/open/floor/plating, /area/prison/cellblock/mediumsec/east) "ncT" = ( -/obj/effect/landmark/corpsespawner/prisoner, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/prison{ - dir = 4; - icon_state = "cell_stripe" - }, -/area/prison/cellblock/mediumsec/east) +/turf/open/floor/prison, +/area/prison/cellblock/protective) "ndk" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -46608,6 +47126,11 @@ icon_state = "asteroid" }, /area/prison/residential/south) +"nez" = ( +/obj/structure/surface/table/woodentable, +/obj/effect/landmark/objective_landmark/far, +/turf/open/floor/wood, +/area/prison/residential/north) "niK" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -46641,6 +47164,12 @@ icon_state = "darkyellowfull2" }, /area/prison/telecomms) +"nmX" = ( +/obj/structure/toilet, +/turf/open/floor{ + icon_state = "freezerfloor" + }, +/area/prison/quarters/research) "non" = ( /obj/structure/machinery/washing_machine{ desc = "The bottom portion of the machine of dread. The second oen, it beckons." @@ -46668,11 +47197,13 @@ /turf/open/floor/plating, /area/prison/maintenance/residential/access/north) "nxt" = ( -/obj/structure/machinery/light{ - dir = 4 +/obj/structure/closet/wardrobe/orange, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/prison{ + dir = 10; + icon_state = "bright_clean" }, -/turf/open/organic/grass, -/area/prison/residential/central) +/area/prison/laundry) "nyk" = ( /obj/structure/machinery/door/airlock/almayer/security/glass/colony{ name = "Security Booth" @@ -46688,6 +47219,18 @@ }, /turf/open/floor/plating, /area/prison/maintenance/residential/nw) +"nzf" = ( +/obj/structure/machinery/shower{ + pixel_y = 15 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/effect/landmark/objective_landmark/far, +/turf/open/floor/prison{ + icon_state = "sterile_white" + }, +/area/prison/residential/central) "nzm" = ( /obj/structure/pipes/standard/simple/visible/yellow{ dir = 4 @@ -46703,16 +47246,18 @@ }, /turf/open/floor/grass, /area/prison/residential/south) +"nES" = ( +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/prison/quarters/staff) "nFQ" = ( /obj/effect/alien/weeds/node, /obj/structure/sign/poster{ icon_state = "poster14"; pixel_x = -32 }, -/turf/open/floor/prison{ - dir = 8; - icon_state = "red" - }, +/turf/open/floor/prison, /area/prison/cellblock/highsec/south/south) "nGQ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ @@ -46893,6 +47438,13 @@ icon_state = "floor_plate" }, /area/prison/cellblock/lowsec/nw) +"obA" = ( +/obj/structure/surface/table/gamblingtable, +/obj/effect/landmark/objective_landmark/medium, +/turf/open/floor/prison{ + dir = 10 + }, +/area/prison/recreation/highsec/n) "obV" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, @@ -46915,23 +47467,36 @@ /turf/open/floor/plating, /area/prison/maintenance/residential/nw) "ogu" = ( -/obj/structure/surface/table, -/obj/item/book/codebook, -/turf/open/floor/wood, -/area/prison/quarters/research) +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/prison{ + dir = 10; + icon_state = "kitchen" + }, +/area/prison/cellblock/highsec/north/south) "ogF" = ( /obj/structure/window/framed/prison/reinforced, /turf/open/floor/plating, /area/prison/hallway/central/west) -"oip" = ( +"ohu" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/platform{ + dir = 1 }, -/turf/open/floor/prison, -/area/prison/storage/medsec) +/turf/open/floor/plating/plating_catwalk/prison, +/area/prison/security/monitoring/highsec) +"oip" = ( +/obj/structure/sink{ + dir = 8; + pixel_x = -12 + }, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, +/area/prison/cellblock/lowsec/se) "old" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, @@ -47015,6 +47580,10 @@ icon_state = "cell_stripe" }, /area/prison/cellblock/mediumsec/north) +"otx" = ( +/obj/item/clothing/suit/storage/marine/light/vest, +/turf/open/floor/prison, +/area/prison/security) "oud" = ( /obj/structure/mineral_door/resin, /turf/open/floor/prison{ @@ -47028,6 +47597,26 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/prison/hallway/central/south) +"owT" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/prison{ + dir = 1; + icon_state = "red" + }, +/area/prison/cellblock/highsec/south/north) +"oxI" = ( +/obj/structure/machinery/power/apc{ + dir = 1; + pixel_y = 24; + start_charge = 0 + }, +/turf/open/floor/prison{ + dir = 1; + icon_state = "red" + }, +/area/prison/security/monitoring/highsec) "oxQ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -47043,6 +47632,9 @@ "oxT" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/alarm/almayer{ + dir = 1 + }, /turf/open/floor/prison{ dir = 10; icon_state = "damaged2" @@ -47098,6 +47690,13 @@ }, /turf/open/floor/plating, /area/prison/holding/holding1) +"oGz" = ( +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, +/area/prison/cellblock/highsec/north/south) "oHo" = ( /obj/structure/surface/table/reinforced, /obj/item/reagent_container/food/snacks/appletart, @@ -47142,6 +47741,11 @@ icon_state = "darkpurplefull2" }, /area/prison/hanger/research) +"oKr" = ( +/obj/structure/surface/table/woodentable, +/obj/effect/landmark/objective_landmark/far, +/turf/open/floor/wood, +/area/prison/residential/central) "oLL" = ( /obj/structure/surface/table/reinforced, /obj/item/device/flashlight/lamp, @@ -47412,6 +48016,15 @@ icon_state = "red" }, /area/prison/cellblock/highsec/south/south) +"psd" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 12 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/prison/cellblock/highsec/north/south) "ptn" = ( /obj/item/device/radio/headset, /turf/open/floor/prison, @@ -47447,6 +48060,12 @@ icon_state = "bright_clean2" }, /area/prison/hallway/central/south) +"pwb" = ( +/obj/structure/surface/table/woodentable, +/obj/item/device/flashlight/lamp, +/obj/effect/landmark/objective_landmark/medium, +/turf/open/floor/wood, +/area/prison/residential/north) "pwl" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ @@ -47462,9 +48081,25 @@ icon_state = "bright_clean" }, /area/prison/hallway/central/south) +"pzi" = ( +/obj/structure/surface/table/reinforced, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/prison{ + icon_state = "whitepurplefull" + }, +/area/prison/research/secret/testing) "pzJ" = ( /turf/open/floor/plating, /area/prison/holding/holding1) +"pAv" = ( +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "cell_stripe" + }, +/area/prison/cellblock/mediumsec/north) "pDH" = ( /obj/item/stack/cable_coil/cut{ amount = 1; @@ -47529,10 +48164,31 @@ icon_state = "bright_clean2" }, /area/prison/hallway/central/south) +"pMa" = ( +/obj/structure/surface/table/reinforced{ + dir = 8; + flipped = 1 + }, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/prison{ + dir = 10; + icon_state = "bright_clean" + }, +/area/prison/yard) "pPB" = ( /obj/structure/window/framed/prison/reinforced/hull, /turf/open/floor/plating, /area/prison/hallway/central/west) +"pPD" = ( +/obj/structure/closet/secure_closet/medical3{ + req_access_txt = "100" + }, +/obj/effect/landmark/objective_landmark/science, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/prison/medbay) "pPF" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -47553,6 +48209,26 @@ icon_state = "darkyellow2" }, /area/prison/telecomms) +"pWY" = ( +/obj/structure/toilet{ + dir = 4 + }, +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/prison/cellblock/highsec/north/south) +"pXh" = ( +/obj/structure/platform{ + dir = 8 + }, +/turf/open/floor/prison{ + dir = 1; + icon_state = "red" + }, +/area/prison/security/monitoring/highsec) "pXk" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/prison{ @@ -47575,6 +48251,13 @@ icon_state = "cell_stripe" }, /area/prison/cellblock/mediumsec/east) +"qac" = ( +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/prison{ + dir = 10; + icon_state = "bright_clean2" + }, +/area/prison/residential/north) "qai" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/effect/alien/weeds/node, @@ -47640,6 +48323,15 @@ icon_state = "sterile_white" }, /area/prison/residential/central) +"qkI" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/platform{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk/prison, +/area/prison/security/monitoring/highsec) "qla" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -47681,6 +48373,23 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/prison/hallway/central/south) +"qrI" = ( +/obj/structure/machinery/door/airlock/almayer/maint/colony{ + dir = 2 + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/plating, +/area/prison/cellblock/highsec/north/north) +"qtv" = ( +/obj/structure/surface/table/gamblingtable, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/landmark/objective_landmark/medium, +/turf/open/floor/prison{ + dir = 10 + }, +/area/prison/recreation/highsec/n) "qtz" = ( /obj/structure/flora/bush/ausbushes/var3/brflowers, /turf/open/organic/grass, @@ -47714,6 +48423,15 @@ icon_state = "bright_clean2" }, /area/prison/residential/north) +"qCU" = ( +/obj/structure/surface/table/reinforced, +/obj/effect/landmark/objective_landmark/science, +/turf/open/floor/carpet, +/area/prison/research/RD) +"qDo" = ( +/obj/structure/window/reinforced, +/turf/open/floor/wood, +/area/prison/security/monitoring/highsec) "qEB" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor{ name = "Infirmary" @@ -47745,6 +48463,12 @@ /obj/structure/window/framed/prison, /turf/open/floor/plating, /area/prison/cellblock/highsec/north/south) +"qId" = ( +/obj/effect/vehicle_spawner/van, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/prison/cellblock/mediumsec/west) "qIg" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/prison{ @@ -47772,6 +48496,17 @@ icon_state = "bright_clean2" }, /area/prison/cellblock/highsec/south/south) +"qMW" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "blue" + }, +/area/prison/cellblock/protective) "qNw" = ( /turf/open/floor/prison{ dir = 6; @@ -47798,6 +48533,17 @@ icon_state = "floor_plate" }, /area/prison/cellblock/mediumsec/south) +"qWS" = ( +/obj/structure/closet/secure_closet/security_empty, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/item/clothing/suit/storage/marine/light/vest, +/turf/open/floor/prison{ + dir = 10; + icon_state = "darkredfull2" + }, +/area/prison/security) "qXa" = ( /obj/structure/window/framed/prison/reinforced/hull, /turf/open/floor/plating, @@ -47848,18 +48594,49 @@ icon_state = "bluefull" }, /area/prison/storage/medsec) +"rjp" = ( +/obj/structure/surface/table/reinforced{ + dir = 8; + flipped = 1 + }, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/prison/cellblock/mediumsec/south) "rjx" = ( /turf/open/floor/prison{ icon_state = "yellowfull" }, /area/prison/cellblock/protective) +"rkO" = ( +/obj/structure/pipes/vents/pump{ + dir = 8 + }, +/turf/open/floor{ + icon_state = "freezerfloor" + }, +/area/prison/quarters/research) +"rlM" = ( +/turf/open/floor/prison{ + dir = 4; + icon_state = "blue" + }, +/area/prison/cellblock/protective) +"rmz" = ( +/obj/effect/decal/cleanable/blood, +/obj/effect/landmark/objective_landmark/medium, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, +/area/prison/cellblock/highsec/north/north) "rpB" = ( -/obj/structure/flora/bush/ausbushes/var3/brflowers, -/obj/structure/machinery/light{ - dir = 4 +/obj/effect/decal/cleanable/blood, +/turf/open/floor/prison{ + icon_state = "kitchen" }, -/turf/open/organic/grass, -/area/prison/residential/central) +/area/prison/cellblock/highsec/north/south) "rqF" = ( /obj/structure/machinery/computer/cameras{ network = list("PRISON") @@ -47936,6 +48713,18 @@ icon_state = "yellow" }, /area/prison/cellblock/mediumsec/south) +"rAy" = ( +/obj/structure/machinery/door/poddoor/almayer{ + dir = 4; + id = "map_lockdown"; + name = "Timed Emergency Blast Door"; + unacidable = 1; + use_power = 0 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/prison/cellblock/mediumsec/east) "rDG" = ( /obj/effect/decal/cleanable/blood, /obj/effect/decal/cleanable/dirt, @@ -47952,6 +48741,15 @@ icon_state = "bright_clean" }, /area/prison/hallway/central/west) +"rFm" = ( +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "cell_stripe" + }, +/area/prison/cellblock/highsec/north/south) "rFO" = ( /obj/structure/platform{ dir = 1 @@ -47982,6 +48780,9 @@ icon_state = "bright_clean" }, /area/prison/yard) +"rMP" = ( +/turf/open/space/basic, +/area/space) "rOL" = ( /obj/structure/barricade/handrail/type_b{ dir = 4 @@ -48014,6 +48815,17 @@ /obj/structure/window_frame/colony/reinforced, /turf/open/floor/plating, /area/prison/cellblock/mediumsec/east) +"rUZ" = ( +/obj/structure/surface/table/reinforced{ + dir = 4; + flipped = 1 + }, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/prison{ + dir = 10; + icon_state = "bright_clean" + }, +/area/prison/yard) "rWA" = ( /obj/structure/window/framed/prison/reinforced/hull, /turf/open/floor/plating, @@ -48154,6 +48966,12 @@ icon_state = "cell_stripe" }, /area/prison/cellblock/mediumsec/east) +"sAI" = ( +/turf/open/floor/prison{ + dir = 8; + icon_state = "yellowcorner" + }, +/area/prison/cellblock/mediumsec/north) "sBF" = ( /obj/structure/stairs/perspective{ dir = 4; @@ -48174,6 +48992,11 @@ icon_state = "bright_clean" }, /area/prison/canteen) +"sFa" = ( +/obj/structure/bookcase, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/wood, +/area/prison/library) "sGc" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, /turf/open/floor/prison{ @@ -48229,6 +49052,17 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk/prison, /area/prison/hallway/central/south) +"sMq" = ( +/obj/structure/surface/table/reinforced{ + dir = 1; + flipped = 1 + }, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/prison{ + dir = 10; + icon_state = "bright_clean" + }, +/area/prison/yard) "sMK" = ( /obj/structure/machinery/alarm/almayer{ dir = 1 @@ -48263,12 +49097,28 @@ icon_state = "darkred2" }, /area/prison/security/checkpoint/maxsec) +"sTl" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/platform_decoration, +/turf/open/floor/plating/plating_catwalk/prison, +/area/prison/security/monitoring/highsec) "sTy" = ( /turf/closed/wall/resin, /area/prison/cellblock/highsec/south/north) "sUB" = ( /turf/open/floor/prison, /area/prison/cellblock/mediumsec/north) +"sVf" = ( +/obj/structure/surface/table/reinforced, +/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/prison{ + dir = 10; + icon_state = "darkredfull2" + }, +/area/prison/intake) "sVg" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -48319,6 +49169,14 @@ icon_state = "bright_clean" }, /area/prison/canteen) +"tdF" = ( +/obj/structure/surface/table/reinforced, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/prison{ + dir = 10; + icon_state = "bright_clean" + }, +/area/prison/canteen) "teg" = ( /obj/structure/machinery/door/poddoor/almayer/open{ name = "emergency lockdown"; @@ -48393,6 +49251,12 @@ icon_state = "floor_plate" }, /area/prison/cellblock/lowsec/nw) +"tjZ" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/prison, +/area/prison/storage/medsec) "tmn" = ( /obj/structure/bed, /turf/open/floor/prison{ @@ -48426,6 +49290,7 @@ /obj/structure/bed/chair/comfy{ dir = 8 }, +/obj/effect/landmark/objective_landmark/medium, /turf/open/organic/grass, /area/prison/residential/north) "tvF" = ( @@ -48462,6 +49327,12 @@ icon_state = "sterile_white" }, /area/prison/security/checkpoint/highsec/n) +"txk" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/prison/quarters/research) "tzm" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -48496,10 +49367,31 @@ /obj/effect/landmark/railgun_camera_pos, /turf/open/floor/plating, /area/prison/hanger/main) +"tBp" = ( +/obj/structure/sink{ + dir = 8; + pixel_x = -11 + }, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/prison/medbay) "tCH" = ( /obj/structure/bed/chair, /turf/open/floor/prison, /area/prison/cellblock/highsec/north/north) +"tCS" = ( +/obj/structure/surface/table/reinforced{ + dir = 1; + flipped = 1 + }, +/obj/effect/landmark/objective_landmark/medium, +/turf/open/floor/plating{ + icon_state = "platebot" + }, +/area/prison/pirate) "tDB" = ( /obj/structure/machinery/light{ dir = 4 @@ -48532,6 +49424,12 @@ icon_state = "bright_clean2" }, /area/prison/residential/north) +"tGH" = ( +/obj/structure/machinery/door/airlock/almayer/maint/colony{ + dir = 2 + }, +/turf/open/floor/plating, +/area/prison/cellblock/highsec/north/north) "tGY" = ( /turf/open/floor/prison{ icon_state = "floor_plate" @@ -48557,6 +49455,23 @@ }, /turf/open/floor/carpet, /area/prison/residential/north) +"tLr" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/platform_decoration{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk/prison, +/area/prison/security/monitoring/highsec) +"tLt" = ( +/obj/structure/platform{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "redfull" + }, +/area/prison/security/monitoring/highsec) "tMB" = ( /obj/structure/girder/reinforced, /turf/open/floor/plating, @@ -48593,6 +49508,14 @@ "tOU" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/prison/hallway/central/west) +"tOW" = ( +/obj/structure/pipes/vents/scrubber{ + dir = 8 + }, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, +/area/prison/cellblock/mediumsec/north) "tPi" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -48660,6 +49583,16 @@ icon_state = "redfull" }, /area/prison/recreation/highsec/s) +"ugA" = ( +/obj/structure/bed/chair/comfy{ + dir = 8 + }, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/prison{ + dir = 10; + icon_state = "darkredfull2" + }, +/area/prison/monorail/east) "ugC" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -48669,6 +49602,14 @@ icon_state = "red" }, /area/prison/cellblock/highsec/south/north) +"uhl" = ( +/obj/structure/surface/table/reinforced, +/obj/item/clothing/suit/storage/marine/light/vest, +/turf/open/floor/prison{ + dir = 10; + icon_state = "bright_clean" + }, +/area/prison/canteen) "uhE" = ( /obj/effect/decal/cleanable/blood, /obj/effect/landmark/corpsespawner/prison_security, @@ -48677,6 +49618,14 @@ icon_state = "darkred2" }, /area/prison/cellblock/mediumsec/east) +"uhY" = ( +/obj/structure/surface/table/reinforced, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/landmark/objective_landmark/far, +/turf/open/floor/wood, +/area/prison/parole/protective_custody) "umM" = ( /obj/structure/machinery/light/small, /turf/open/floor/plating, @@ -48738,6 +49687,17 @@ }, /turf/open/floor/prison, /area/prison/cellblock/highsec/south/north) +"uux" = ( +/obj/structure/machinery/power/apc{ + dir = 1; + pixel_y = 24; + start_charge = 0 + }, +/turf/open/floor/prison{ + dir = 5; + icon_state = "green" + }, +/area/prison/quarters/staff) "uuB" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22" @@ -48829,6 +49789,11 @@ icon_state = "green" }, /area/prison/monorail/west) +"uJF" = ( +/obj/structure/surface/table/reinforced, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/wood, +/area/prison/parole/protective_custody) "uKd" = ( /obj/structure/machinery/power/apc{ dir = 4; @@ -48926,6 +49891,7 @@ dir = 1; flipped = 1 }, +/obj/effect/landmark/objective_landmark/close, /turf/open/floor/plating{ icon_state = "platebot" }, @@ -48985,6 +49951,7 @@ /area/prison/library) "vda" = ( /obj/structure/surface/rack, +/obj/effect/landmark/objective_landmark/science, /turf/open/floor/plating, /area/prison/maintenance/residential/nw) "vdb" = ( @@ -48992,6 +49959,16 @@ /obj/item/coin/diamond, /turf/open/floor/plating, /area/prison/maintenance/staff_research) +"vdQ" = ( +/obj/structure/closet/secure_closet/chemical{ + req_access_txt = "100" + }, +/obj/effect/landmark/objective_landmark/science, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/prison/medbay) "vdU" = ( /obj/structure/window/framed/prison, /turf/open/floor/plating, @@ -49016,6 +49993,12 @@ }, /turf/open/floor/prison, /area/prison/medbay/morgue) +"vgv" = ( +/turf/open/floor/prison{ + dir = 5; + icon_state = "darkred2" + }, +/area/prison/cellblock/mediumsec/east) "vhZ" = ( /obj/structure/machinery/computer/telecomms/server{ req_one_access_txt = "19;200" @@ -49026,6 +50009,10 @@ icon_state = "darkyellowfull2" }, /area/prison/telecomms) +"vih" = ( +/obj/structure/window/framed/prison, +/turf/open/floor/plating, +/area/prison/maintenance/residential/nw) "vix" = ( /turf/closed/wall/prison, /area/prison/security/monitoring/protective) @@ -49038,6 +50025,12 @@ icon_state = "cell_stripe" }, /area/prison/cellblock/mediumsec/north) +"vjj" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/prison/quarters/research) "vmX" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 @@ -49085,6 +50078,15 @@ icon_state = "yellowfull" }, /area/prison/cellblock/protective) +"vwn" = ( +/obj/structure/machinery/door/airlock/almayer/medical/glass/colony{ + dir = 2; + name = "Toilet" + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/prison/cellblock/highsec/north/south) "vxy" = ( /obj/structure/reagent_dispensers/water_cooler/stacks, /turf/open/floor/prison{ @@ -49131,6 +50133,14 @@ icon_state = "darkpurplecorners2" }, /area/prison/hanger/research) +"vEF" = ( +/obj/structure/platform{ + dir = 8 + }, +/turf/open/floor/prison{ + icon_state = "redfull" + }, +/area/prison/security/monitoring/highsec) "vGg" = ( /obj/structure/largecrate/random, /obj/structure/platform{ @@ -49170,6 +50180,13 @@ icon_state = "redfull" }, /area/prison/security/checkpoint/highsec/n) +"vOv" = ( +/obj/structure/surface/table/gamblingtable, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/prison/recreation/medsec) "vPr" = ( /obj/structure/machinery/light{ dir = 1 @@ -49189,6 +50206,11 @@ icon_state = "bright_clean2" }, /area/prison/hallway/central/north) +"vTn" = ( +/obj/structure/surface/table/woodentable, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/wood, +/area/prison/residential/north) "vTZ" = ( /obj/structure/surface/table/reinforced, /obj/structure/machinery/microwave, @@ -49233,12 +50255,22 @@ icon_state = "bright_clean" }, /area/prison/canteen) +"wbo" = ( +/obj/structure/surface/rack, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/prison, +/area/prison/security/armory/riot) "wdr" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out" }, /turf/open/floor/wood, /area/prison/security/monitoring/highsec) +"wdK" = ( +/obj/structure/surface/table/reinforced, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/plating, +/area/prison/disposal) "wiC" = ( /obj/structure/machinery/shower{ pixel_y = 15 @@ -49264,20 +50296,46 @@ }, /turf/open/floor/wood, /area/prison/quarters/research) +"wpI" = ( +/obj/structure/machinery/door/poddoor/almayer/open{ + name = "emergency lockdown"; + use_power = 0 + }, +/turf/open/floor/plating, +/area/prison/cellblock/protective) "wpK" = ( /obj/structure/bed/chair, /turf/open/floor/prison, /area/prison/security/checkpoint/maxsec) +"wqY" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/plating, +/area/prison/maintenance/residential/access/south) "wqZ" = ( /obj/structure/largecrate/random/barrel/blue, /turf/open/floor/plating, /area/prison/maintenance/residential/nw) +"wsV" = ( +/turf/open/floor/prison{ + dir = 4; + icon_state = "redcorner" + }, +/area/prison/security/monitoring/highsec) "wty" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, /turf/closed/wall/r_wall/prison, /area/prison/security/monitoring/medsec/central) +"wtT" = ( +/obj/item/clothing/suit/storage/marine/light/vest, +/turf/open/floor/prison{ + dir = 10; + icon_state = "bright_clean" + }, +/area/prison/yard) "wvp" = ( /obj/structure/machinery/shower{ dir = 1 @@ -49323,6 +50381,10 @@ /obj/structure/pipes/vents/scrubber, /turf/open/floor/plating, /area/prison/maintenance/residential/sw) +"wDc" = ( +/obj/structure/window/framed/prison, +/turf/open/floor/plating, +/area/prison/monorail/west) "wEQ" = ( /turf/open/floor/prison{ dir = 10; @@ -49350,6 +50412,13 @@ }, /turf/open/floor/carpet, /area/prison/residential/north) +"wGL" = ( +/obj/item/clothing/suit/storage/marine/light/vest, +/turf/open/floor/prison{ + dir = 8; + icon_state = "cell_stripe" + }, +/area/prison/cellblock/highsec/north/north) "wHq" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -49376,6 +50445,14 @@ icon_state = "bright_clean" }, /area/prison/medbay/foyer) +"wKN" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/prison{ + dir = 10 + }, +/area/prison/cellblock/highsec/north/north) "wNk" = ( /obj/structure/machinery/computer/secure_data, /obj/structure/surface/table/reinforced, @@ -49420,6 +50497,10 @@ /obj/structure/flora/bush/ausbushes/var3/ywflowers, /turf/open/organic/grass, /area/prison/residential/north) +"wUA" = ( +/obj/effect/landmark/objective_landmark/medium, +/turf/open/floor/plating, +/area/prison/hallway/central/east) "wUP" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/prison{ @@ -49486,18 +50567,13 @@ /obj/structure/barricade/wooden{ dir = 8 }, -/turf/open/floor/prison{ - dir = 1; - icon_state = "yellow" - }, +/turf/open/floor/plating/plating_catwalk/prison, /area/prison/cellblock/mediumsec/south) "xiB" = ( -/obj/structure/largecrate/random, -/obj/structure/machinery/light{ - dir = 4 - }, +/obj/structure/bed, +/obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison, -/area/prison/storage/medsec) +/area/prison/cellblock/maxsec/north) "xji" = ( /obj/structure/pipes/vents/scrubber, /obj/structure/machinery/light{ @@ -49512,6 +50588,9 @@ /obj/item/stack/cable_coil, /turf/open/floor/plating, /area/prison/maintenance/staff_research) +"xjI" = ( +/turf/open/floor/prison, +/area/prison/cellblock/highsec/south/south) "xkp" = ( /turf/open/floor/prison{ icon_state = "greenfull" @@ -49530,6 +50609,14 @@ icon_state = "bright_clean2" }, /area/prison/hallway/central/west) +"xrb" = ( +/obj/structure/pipes/vents/pump{ + dir = 8 + }, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, +/area/prison/cellblock/mediumsec/north) "xsY" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -49537,6 +50624,11 @@ /obj/structure/largecrate/random/case/small, /turf/open/floor/plating, /area/prison/maintenance/staff_research) +"xtj" = ( +/obj/structure/surface/table/reinforced, +/obj/effect/landmark/objective_landmark/medium, +/turf/open/floor/prison, +/area/prison/cellblock/highsec/north/north) "xtt" = ( /obj/structure/surface/table/reinforced{ dir = 1; @@ -49548,6 +50640,12 @@ icon_state = "bright_clean" }, /area/prison/yard) +"xuA" = ( +/obj/structure/surface/table/woodentable, +/obj/item/device/flashlight/lamp, +/obj/effect/landmark/objective_landmark/far, +/turf/open/floor/wood, +/area/prison/residential/south) "xwh" = ( /obj/effect/decal/siding/wood_siding{ icon_state = "wood_siding5" @@ -49568,6 +50666,15 @@ icon_state = "floor_plate" }, /area/prison/cellblock/highsec/south/south) +"xyF" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "yellow" + }, +/area/prison/cellblock/mediumsec/east) "xzA" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -49577,6 +50684,14 @@ icon_state = "yellow" }, /area/prison/cellblock/mediumsec/west) +"xzN" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/prison{ + dir = 10 + }, +/area/prison/cellblock/highsec/north/south) "xCv" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -49592,6 +50707,11 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/prison/hallway/central/east) +"xCR" = ( +/obj/structure/surface/table/woodentable, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/wood, +/area/prison/residential/central) "xDM" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -49608,6 +50728,14 @@ }, /turf/open/floor/wood, /area/prison/parole/protective_custody) +"xGf" = ( +/obj/structure/surface/table/reinforced, +/obj/effect/landmark/objective_landmark/science, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/prison/research) "xIA" = ( /obj/structure/platform, /turf/open/floor/prison{ @@ -49653,6 +50781,15 @@ }, /turf/open/organic/grass, /area/prison/residential/north) +"xTm" = ( +/obj/structure/closet/secure_closet/security_empty, +/obj/structure/window/reinforced, +/obj/item/clothing/suit/storage/marine/light/vest, +/turf/open/floor/prison{ + dir = 10; + icon_state = "darkredfull2" + }, +/area/prison/security) "xUp" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ @@ -49673,6 +50810,16 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/prison/cellblock/mediumsec/north) +"xVZ" = ( +/obj/structure/surface/table/reinforced{ + dir = 1; + flipped = 1 + }, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/plating{ + icon_state = "platebot" + }, +/area/prison/pirate) "xXN" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -49752,14 +50899,23 @@ }, /area/prison/cellblock/mediumsec/east) "ykG" = ( +/obj/effect/landmark/corpsespawner/prisoner, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, /obj/structure/machinery/light/small{ dir = 1 }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "cell_stripe" }, -/turf/open/floor/plating/plating_catwalk/prison, /area/prison/cellblock/mediumsec/east) +"ymc" = ( +/obj/item/stack/rods, +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/plating/plating_catwalk/prison, +/area/prison/cellblock/mediumsec/south) (1,1,1) = {" aAO @@ -53038,8 +54194,8 @@ aAO aAO aAO aAO -aAO -aAO +aRS +aRS aRS aRS aRS @@ -53054,8 +54210,8 @@ smr buS buS buS -aAO -aAO +buS +buS aAO aAO aAO @@ -53250,8 +54406,6 @@ aAO aAO aAO aAO -aAO -aRS aRS aQS aQS @@ -53259,13 +54413,16 @@ aQS aQS aQS aQS +aQS +aQS +bxf +bxf bxf bxf bxf bxf bxf bxf -buS buS aAO aAO @@ -53278,7 +54435,6 @@ aAO aAO aAO aAO -aAO buS bxf bBn @@ -53462,7 +54618,6 @@ aAO aAO aAO aAO -aAO aRS aQS aQS @@ -53471,6 +54626,8 @@ aQS aQS aQS aQS +aQS +bxf bxf bxf bxf @@ -53490,7 +54647,6 @@ aAO aAO aAO aAO -aAO buS fCr bBn @@ -53657,7 +54813,7 @@ aHB avN avM aJr -aKj +fLj avN aQS aSb @@ -53674,13 +54830,13 @@ aAO aAO aAO aAO -aAO aRS aQS aQS aQS aQS aQS +aQS aBk toL bxf @@ -53690,6 +54846,7 @@ bxf bxf bxf bxf +bxf buS aAO aAO @@ -53702,7 +54859,6 @@ aAO aAO aAO aAO -aAO buS bxf bBn @@ -53869,7 +55025,7 @@ aHC avN aIK axb -awi +pwb avN aQS aSb @@ -53886,10 +55042,10 @@ aAO aAO aAO aAO -aAO aRS aQS aQS +aQS aRS rWA aRS @@ -53902,6 +55058,7 @@ lxE buS bxf bxf +bxf buS aAO aAO @@ -53914,7 +55071,6 @@ aAO aAO aAO aAO -aAO buS bxf bBn @@ -54098,10 +55254,10 @@ aAO aAO aAO aAO -aAO aRS aQS aQS +aQS rWA acL aAO @@ -54114,6 +55270,7 @@ acL lxE bxf bxf +bxf buS aAO aAO @@ -54126,7 +55283,6 @@ aAO aAO aAO aAO -aAO buS bxf bBn @@ -54311,7 +55467,7 @@ aRS aRS aRS aRS -aRS +aQS aQS aQS aRS @@ -54326,7 +55482,7 @@ lxE buS bxf bxf -buS +bxf buS buS buS @@ -54518,7 +55674,7 @@ aTu aQS aQS aQS -aRT +vih aQS aQS aQS @@ -54699,7 +55855,7 @@ aAO aAO aAO avm -aKj +vTn awi aut avN @@ -54785,7 +55941,7 @@ bJB cct bGU bJA -bIf +xuA bGR bGQ aAO @@ -54942,7 +56098,7 @@ aTu aQS aQS aQS -aRT +vih aQS aQS bcM @@ -55123,7 +56279,7 @@ aAO aAO aAO avm -avM +fGn awk avM avN @@ -55131,9 +56287,9 @@ aKn awJ xld avN -aRT +aJY eoP -aRT +aJY avN avN avN @@ -55165,10 +56321,10 @@ aWr aWr aWr aWr -aWr +bga oAs oAs -aWr +bga aWr aWr aWr @@ -55200,9 +56356,9 @@ bLT bGU bGU bGU -buT +gPR bBq -buT +gPR bGU sYr bMC @@ -55351,13 +56507,13 @@ azI azI aHH avN -aut +cWm axb aKm avN aut awi -aKj +vTn avN aQW aSb @@ -55394,7 +56550,7 @@ bxh aWr aYQ aXv -aWo +oKr aWr bxf bBn @@ -56843,9 +57999,9 @@ avN avN avN avN -aRT +aJY aSe -aRT +aJY aRT aWr aWr @@ -56880,9 +58036,9 @@ aWr aWr aWr aWr -buT +gPR bBq -buT +gPR bGU bGU bGU @@ -57479,10 +58635,10 @@ azI azI azI gQP -mpt -aHH azI +aHH azI +mpt aWv aXD aWv @@ -57691,9 +58847,9 @@ avN avN avN aRU -aRU +bjn aSg -aRU +bjn aRU aWr aWr @@ -57921,11 +59077,11 @@ bgc aRH bdv bgc -rpB -bgc +aZP +aWn +aWn +aZP bgc -nxt -bLY aRH bdv bLY @@ -58133,10 +59289,10 @@ bgc aRH bdv bgc -aZP aWn +aAO +aAO aWn -aZP bgc aRH bdv @@ -58331,7 +59487,7 @@ aSR baS aSR aRU -aWx +nzf aXF aWr aZR @@ -58556,12 +59712,12 @@ bgc bxO aRH bdv -bgc +aWr +aIy aWn -aAO -aAO aWn -bgc +aIy +aWr aRH bdv bgc @@ -58768,12 +59924,12 @@ bgc bgc aRH aIA -aWr -aIy -aWn -aWn -aIy -aWr +bga +bja +bkC +bkC +bmT +bga boz bdv bLY @@ -58981,10 +60137,10 @@ beE bhD aLd bbN -bja -bkC -blI -bmT +bjd +bkG +beD +bmV bbN boA bhD @@ -59167,7 +60323,7 @@ azI azI aHH avN -aut +cWm axb aKr avN @@ -59179,7 +60335,7 @@ aSR baS aSR aRU -aWo +oKr aXv aYQ aWr @@ -59210,7 +60366,7 @@ bsj aWr aYQ aXv -aWo +oKr aWr bxc bvZ @@ -59442,7 +60598,7 @@ bGU bGU bRW bTK -bSj +bRW bGU mSe bLP @@ -59792,7 +60948,7 @@ aNO cAA azI azI -azI +qac azI awm awm @@ -59874,7 +61030,7 @@ ccy bGU bJA bIf -bGR +erY bGQ aAO aAO @@ -60462,7 +61618,7 @@ aXG aWq aWr bsi -bbO +lrU vCU aWr bjb @@ -60865,7 +62021,7 @@ aHP avN avM aJr -aKj +nez avl aAO aAO @@ -60886,7 +62042,7 @@ aXv aYQ aWr baQ -aYR +xCR aYQ aWr bjb @@ -61116,9 +62272,9 @@ bqb bsm bsm bsm -bqb +hMX uqH -bqb +hMX bsm bsm bsm @@ -61304,7 +62460,7 @@ aSR aSR aSR aSR -aWr +tfd bcQ seq bcQ @@ -61330,10 +62486,10 @@ bpl bpl bpl bwc -hmc -byQ bpM -bqb +byQ +hmc +wDc bTL bTL bTL @@ -61727,8 +62883,8 @@ oOJ aSR aSR baS -vAR -aWr +aSR +tfd aZF baj bbk @@ -61757,7 +62913,7 @@ bxe byR byR bBw -bqb +wDc bTL bTL bTL @@ -61939,7 +63095,7 @@ aSR aSR aXI aYo -aSR +iiZ aWr aZG bar @@ -62582,7 +63738,7 @@ aZI bbn bcZ aXN -baa +bdC bjR bod bkK @@ -62591,7 +63747,7 @@ blS bkK boc bqK -aWz +wWB bsn acL acL @@ -62797,10 +63953,10 @@ aXN bdC bjR bkW -bjm -bkL -blT -bna +hak +bjq +bjq +bSM bkW bqK wWB @@ -63009,10 +64165,10 @@ aXN bdC bjR bkW -baa -baa -baa -baa +bqK +bnh +bnh +bjR bkW bqK wWB @@ -63221,10 +64377,10 @@ etX baa bjR bkW -baa +bqK bkM bkM -baa +bjR bkW bqK aWz @@ -63431,12 +64587,12 @@ bbo bdb bdb baa -bjR +oxI bkW -bjn +bqK bnh bnh -bjn +bjR bkW bqK aWz @@ -63644,12 +64800,12 @@ jBu baa baa bhh -bkW -baa -bnh -bkM -baa -bkW +sTl +aCf +tLt +jfB +cMD +jsP boH aWz aWz @@ -63856,12 +65012,12 @@ bgs dAz baa bkZ -bkW -baa -hoY -bkM -baa -bkW +aCp +bjm +bkL +blT +bna +ohu bqK baa bpN @@ -64068,12 +65224,12 @@ aYY nTn baa bjR -bkW -baa -bkM -bkM -baa -bkW +aCp +eoV +hwb +mjw +qDo +ohu bqK baa bpO @@ -64280,12 +65436,12 @@ bpU bhJ biR bjT -boc -baa -bkM -bkM -baa -bod +fEo +bjo +bkQ +blU +bnb +qkI boI biR bpP @@ -64492,12 +65648,12 @@ aYY bhK beW bjR -bkW -baa -bkM -bnh -baa -bkW +tLr +ccY +gzC +vEF +pXh +iZo bqK beW brZ @@ -64533,11 +65689,11 @@ bSk bTL bWL bZG -bSk -bSk -bSk -bSk -bSk +bSj +bTL +wqY +bTL +bSj bTL bTL bTL @@ -64653,218 +65809,6 @@ aAO aAO aAO aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -axI -axU -ayD -axN -axI -aAO -acL -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aWz -aXK -sqS -aXK -aXK -bbT -baa -bdG -bqU -bgt -bhL -baa -bjR -bkW -bjn -bnh -bnh -bjn -bkW -bqK -baa -bfe -bqU -bqU -bsa -baa -bty -aYY -aXK -aYY -aXK -aWz -aAO -aAO -aAO -aAO -acL -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -acL -acL -aAO -bSk -bTL -bWL -bXQ -bSk -aAO -acL -aAO -bSk -bCL -faW -faW -bSk -acL -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -coo -con -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -"} -(72,1,1) = {" -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO anA anA anA @@ -64904,30 +65848,30 @@ aEN aEN aEN aWz -bdI -bdI -bdI -bdI -bdI -bdI -bdH -beV -aYY -bhK -bdC -bjR -bkW +aXK +sqS +aXK +aXK +bbT baa -bkM -bkM +bdG +bqU +bgt +bhL baa +bjR bkW bqK -bdC -aYY -brZ -bba -bsb +bnh +bnh +bjR +bkW +bqK +baa +bfe +bqU +bqU +bsa bdI bdI bdI @@ -64957,11 +65901,11 @@ bSk bVd bYv bTL -bSk -ceH -ceH -ceH -ceH +bSj +bYC +bYC +bYC +bYC bYC tMB bYC @@ -64979,7 +65923,6 @@ aAO aAO aAO aAO -csR aAO aAO aAO @@ -65024,8 +65967,9 @@ aAO aAO aAO aAO +aAO "} -(73,1,1) = {" +(72,1,1) = {" aAO aAO aAO @@ -65116,30 +66060,30 @@ aCl aEO aGa aCl -aEO -aGa -aCl -aKz -bda -aXL bdI -bdc +bdI +bdI +bdI +bdI +bdI +bdH +beV aYY bhK bdC bjR bkW -baa -baa -baa -baa +bqK +bkM +bkM +bjR bkW bqK bdC aYY -bqu -oUR -bdI +brZ +bba +bsb bdI buI bvv @@ -65191,8 +66135,7 @@ aAO aAO aAO aAO -aAO -aAO +csR aAO aAO aAO @@ -65236,8 +66179,9 @@ aAO aAO aAO aAO +aAO "} -(74,1,1) = {" +(73,1,1) = {" aAO aAO aAO @@ -65328,30 +66272,30 @@ aCl aEP aGb aCl -aEP -aGb +aEO +aGa aCl -aLO -aEU +aKz bda -beW -bdd +aXL +bdI +bdc aYY bhK bdC bjR bkW -bjo -bkQ -blU -bnb +bqK +bnh +bnh +bjR bkW bqK bdC aYY -brZ -aYY -beW +bqu +oUR +bdI buI bFb bvw @@ -65410,7 +66354,6 @@ aAO aAO aAO aAO -aAO coo con aAO @@ -65448,8 +66391,9 @@ aAO aAO aAO aAO +aAO "} -(75,1,1) = {" +(74,1,1) = {" aAO aAO aAO @@ -65540,30 +66484,30 @@ aCl aEQ aGc aCl -aEQ +rFm aGc aCl aLO -lnV -bas -bbr -btz -bqU -vWd +aEU +bda +beW +bdd +aYY +bhK bdC bjR bkW -bjp -bjp -bjp -bjp +ikv +lWn +lWn +wsV bkW bqK bdC aYY -baZ -bgt -bbr +brZ +aYY +beW buJ bKs bvw @@ -65623,7 +66567,6 @@ aAO aAO aAO aAO -aAO coo con aAO @@ -65660,8 +66603,9 @@ aAO aAO aAO aAO +aAO "} -(76,1,1) = {" +(75,1,1) = {" aAO aAO aAO @@ -65756,26 +66700,26 @@ aIs aEV aCl aLO -kyS -bat -qjI -bdf -blY -bpW -baa -bhi -bik -bjq -bjq -bjq -bjq -boe -boJ -baa -aYY -brZ +lnV +bas +bbr +btz +bqU +vWd +bdC +bjR +bkW +bjp +bjp +bjp +bjp +bkW +bqK +bdC aYY -qjI +baZ +bgt +bbr buK unO bvw @@ -65836,7 +66780,6 @@ aAO aAO aAO aAO -aAO coo con aAO @@ -65872,8 +66815,9 @@ aAO aAO aAO aAO +aAO "} -(77,1,1) = {" +(76,1,1) = {" aAO aAO aAO @@ -65931,7 +66875,7 @@ lqe lqe lqe apX -aqH +rmz arr arM apn @@ -65968,28 +66912,28 @@ aCg aCg aCg aNf -aZL -bau -bdI -jBu -bfb -jBu -baa -baa -baa -bdC -bkR -bkR -bdC -baa +kyS +bat +qjI +bdf +blY +bpW baa +bhi +bik +bjq +bjq +bjq +bjq +boe +boJ baa -jBu -gJO -jBu -bdI -buL -bvy +aYY +brZ +aYY +qjI +owT +bKs bxm bwz bwz @@ -65999,32 +66943,32 @@ bwz bwz bwz bwz -jtk -bFZ bwz bwz bwz -jtk bwz bwz bwz bwz bwz -oud -jtk bwz bwz bwz -bYx bwz bwz -hBf -prF bZT bZT bZT bZT -nFQ +bZT +bZT +bZT +bZT +bZT +bZT +bZT +bZT +bZT cle bZQ cld @@ -66049,7 +66993,6 @@ aAO aAO aAO aAO -aAO coo con aAO @@ -66084,52 +67027,53 @@ aAO aAO aAO aAO -"} -(78,1,1) = {" -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO -aAO +aAO +"} +(77,1,1) = {" +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO aAO aAO aAO @@ -66176,8 +67120,220 @@ aDP aDP aDP blW -aDP -aDP +aLN +ckO +aCi +aCi +aZL +bau +bdI +jBu +bfb +jBu +baa +baa +baa +bdC +bkR +bkR +bdC +baa +baa +baa +jBu +gJO +jBu +bdI +buL +bvy +bKs +bKs +bKs +bKs +bKs +bKs +bKs +bKs +bKs +afH +bFZ +bKs +bKs +bKs +afH +bKs +bKs +bKs +bKs +bKs +gfR +afH +bKs +bKs +bKs +bYx +bKs +bKs +hBf +aHy +xjI +xjI +xjI +xjI +nFQ +xjI +bZQ +cld +bZQ +bZQ +bZQ +bZQ +bZQ +bZQ +cba +ceH +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +coo +con +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +"} +(78,1,1) = {" +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +aAO +anA +aoo +apk +aor +aoQ +tCH +aMz +pXC +apZ +aor +aor +apj +aon +aor +aor +apj +aon +aon +aor +aoQ +axW +axW +aCi +aCi +aES +aCl +aEV +aIs +aCl +aEV +aIs +aCl +aEV +aIs +aCl +aMY +aES +aCl +aUY +aCl +aUY +aCl +aJu +gxE aDP aDP aDP @@ -66347,46 +67503,46 @@ aAO aAO aAO anA -aoo -apk +aop +aox aor aoQ tCH gFT -pXC +ppz apZ aor +apC +apk +aoo aor -apj -aon -aor -aor -apj -aon -aon +apC +apk +apk +aoo aor -aoQ +awS axW axW aCi aCi -aES +aET aCl -aEV -aIs +aGg +aDR aCl -aEV -aIs +aGg +aDR aCl -aEV -aIs +aGg +aDR aCl aMY aES aCl -aUY +aKx aCl -aUY +aKx aCl aUY aCl @@ -66559,39 +67715,39 @@ aAO aAO aAO anA -aop -aox +aoq +apl aor aoQ -tCH -gFT -ppz +lqe +lqe +lqe apZ aor -apC -apk -aoo +apl +app +aox aor -apC -apk -apk -aoo +apl +app +aox +aox aor -awS +awT axW axW aCi aCi aET aCl -aGg -aDR +aEP +aGb aCl -aGg -aDR +aKv +aGb aCl -aGg -aDR +aEP +aGb aCl aMY aES @@ -66771,46 +67927,46 @@ aAO aAO aAO anA -aoq -apl aor -aoQ +aor +aor +atB lqe lqe lqe apZ aor -apl -app -aox aor -apl -app -aox -aox +aor +aor +aor +aor +aor +aor +aor aor awT axW axW aCi aCi -aET +eWk aCl -aEP -aGb +aHv +aEO aCl -aKv -aGb +aHv +aEO aCl -aEP -aGb +aHv +aEO aCl aMY aES aCl -aKx aCl -aKx +aCl +aCl aCl aKx aCl @@ -66983,48 +68139,48 @@ aAO aAO aAO anA +aos +apl aor -aor -aor -atB -lqe +aoQ lqe lqe +aoS apZ aor +apl +aos aor +apl +aos aor +apl +auX aor -aor -aor -aor -aor -aor -aor -awT -axW +sGB axW +ayO aCi aCi -eWk +aET aCl -aHv -aEO aCl -aHv -aEO aCl -aHv -aEO aCl -aMY -aES aCl aCl aCl aCl aCl aCl +aMZ +aES +aCl +aGa +aGb +aVs +aEV +aCl aCl aCl aCl @@ -67195,47 +68351,47 @@ aAO aAO aAO anA -aos -apl +aop +aox aor aoQ -lqe -lqe -aoS +tCH +aMz +ppz apZ aor -apl -aos +aop +aox aor -apl -aos +aop +aox aor -apl -auX +aop +aox aor -sGB +awT +axW axW -ayO aCi aCi aET aCl +aEO +aDS +aJP +oGz aCl +aEO +aJP +aGb aCl -aCl -aCl -aCl -aCl -aCl -aCl -aCl -aMZ +aMY aES aCl -aGa -aGb -aVs -aEV +aEO +aJQ +aVt +aWA aKz bda aEV @@ -67407,23 +68563,23 @@ aAO aAO aAO anA -aop -aox +aot +apm aor aoQ tCH -gFT +xtj ppz apZ aor -aop -aox +apm +aot aor -aop -aox +apm +aot aor -aop -aox +apm +aot aor awT axW @@ -67432,22 +68588,22 @@ aCi aCi aET aCl -aEO -aDS -aJP -aGb +aHw +aEQ +aEQ +ioU aCl -aEO -aJP -aGb +aHw +aKs +aGc aCl aMY aES aCl -aEO -aJQ -aVt -aWA +hoY +aCl +aCl +aCl aLO aES aWA @@ -67614,51 +68770,51 @@ aAO aAO aAO aAO -aAO -aAO -aAO -aAO +akF +akF +akF +akF anA -aot -apm +aon +apj aor aoQ tCH gFT -ppz -apZ +mqW +aqa aor -apm -aot +apj +aon aor -apm -aot +apj +aon aor -apm -aot +apj +aon aor -awT +aoQ axW axW aCi aCi -aET -aCl -aHw -aEQ -aEQ -aGc +aES aCl -aHw -aKs -aGc aCl -aMY -aES +aEV +aIs +aEV aCl aCl +aIs +aEV aCl +aMY +aEU +bda +rpB aCl +pWY aCl aNe aES @@ -67826,52 +68982,52 @@ aAO aAO aAO aAO -aAO -aAO -aAO -aAO -anA -aon -apj -aor -aoQ -tCH -gFT -mqW -aqa -aor -apj -aon -aor -apj -aon -aor -apj -aon -aor -aoQ -axW +akF +akV +akV +akV +tGH +aou +apn +apn +aoU +anx +lqe +lqe +aqb +apn +apn +apn +apn +apn +apn +arM +apn +apn +apn +aoU axW +ayP +aCj aCi -aCi -aES -aCl -aCl -aEV -aIs -aEV -aCl -aCl -aIs -aEV -aCl -aMY -aES +aEU +aCg +aHx +aCg +aCg +aCg +aCg +aCg +aCg +aCg +aCg +aNa +aWB +aZM +psd +vwn +hoY aCl -aGa -aGb -aVs -aEV aLO aES aEV @@ -67954,7 +69110,7 @@ cqN cuA pnT pnT -cqM +kIU cqM gcy igb @@ -68038,52 +69194,52 @@ aAO aAO aAO aAO -aAO -aAO -aAO -aAO -anA -aou -apn -apn -aoU -anx -lqe -lqe -aqb -apn -apn -apn -apn -apn -apn -arM -apn -apn -apn -aoU +akF +akV +akW +alo +qrI +dGa +axV +axV +axV +axV +axV +lJe +wKN axW -ayP -aCj +axW +axW +axW +axW +axW +axW +axW +axW +axW +axW +axW +wKN +xzN aCi -aEU -aCg -aHx -aCg -aCg -aCg -aCg -aCg -aCg -aCg -aCg -aNa -aOI +aCi +aCi +aCi +aCi +aCi +aCi +aCi +aCi +aCi +aCi +aDS +aNc +aES +aCl +aCl +aCl +aCl aCl -aEO -aJQ -aVt -aWA aLO aES aWA @@ -68250,11 +69406,11 @@ aAO aAO aAO aAO -aAO -aAO -aAO -aAO -anA +akF +akV +alF +akV +tGH aov apo apo @@ -68292,10 +69448,10 @@ aLH aNb aOJ aCl -aCl -aCl -aCl -aCl +aGa +aGb +aTx +aEV aLO aES aCl @@ -68462,10 +69618,10 @@ aAO aAO aAO aAO -aAO -aAO -aAO -aAO +akF +akV +alF +akV anA aon apj @@ -68504,10 +69660,10 @@ aDS aNc aES aCl -aGa -aGb -aTx -aEV +aEO +aDS +aVt +aWA aLO aES aEV @@ -68674,10 +69830,10 @@ aAO aAO aAO aAO -aAO -aAO -aAO -aAO +akF +akV +alF +akV anA aow apk @@ -68690,7 +69846,7 @@ aoQ apZ aor aow -apk +wGL apC aor aoQ @@ -68716,10 +69872,10 @@ aDS aNc aES aCl -aEO -aDS -aVt -aWA +aCl +aCl +aCl +aCl aLO aES aWA @@ -68802,7 +69958,7 @@ knf cpm cpm cpm -cpm +qId cpm cpm cpm @@ -68886,10 +70042,10 @@ aAO aAO aAO aAO -aAO -aAO -aAO -aAO +akF +akV +alF +akV anA aox app @@ -68903,7 +70059,7 @@ apZ aor aox asi -apl +mtX aor aoQ apZ @@ -68926,13 +70082,13 @@ aLe aLg aDS aNc -aES -aCl -aCl -aCl -aCl -aCl -aLO +aEU +aCg +aCg +aCg +aCg +aCg +aNf aES aCl aCl @@ -69098,10 +70254,10 @@ aAO aAO aAO aAO -aAO -aAO -aAO -aAO +akF +akV +alF +akV anA anA anA @@ -69138,12 +70294,12 @@ aCl aLO aDS aNc -aEU -aCg -aCg -aCg -aHx -aCg +aCi +aCi +aCi +aCi +mZT +aCi aVi aWm aCg @@ -69310,11 +70466,11 @@ aAO aAO aAO aAO -aAO -aAO -aAO -aAO -acL +akF +akV +alF +akV +akF acL aAO aAO @@ -69522,11 +70678,11 @@ aAO aAO aAO aAO -aAO -aAO -aAO -aAO -aAO +akF +akV +alF +akV +akF acL aAO aAO @@ -69537,7 +70693,7 @@ ang aqf aqJ aor -apl +mtX asj asP atm @@ -69734,11 +70890,11 @@ aAO aAO aAO aAO -aAO -aAO -aAO -aAO -aAO +akF +akV +alF +akV +akF acL aAO aAO @@ -69763,7 +70919,7 @@ aBg azS aBy aCA -aDH +eBd aBy aGB aBg @@ -69946,11 +71102,11 @@ aAO aAO aAO aAO -aAO -aAO -aAO -aAO -aAO +akF +akV +alF +akV +akF acL aAO aAO @@ -70158,11 +71314,11 @@ aAO aAO aAO aAO -aAO -aAO -aAO -aAO -aAO +akF +akV +alF +akV +akF acL aAO aAO @@ -70186,8 +71342,8 @@ apl aBg azS aBy -aCB -aDH +obA +qtv aFn aGB aBg @@ -70370,11 +71526,11 @@ aAO aAO aAO aAO -aAO -aAO -aAO -aAO -aAO +akF +akV +alF +akV +akF acL aAO aAO @@ -70582,11 +71738,11 @@ aAO aAO aAO aAO -aAO -aAO -aAO -aAO -aAO +akF +akV +alF +akV +akF acL aAO aAO @@ -70794,11 +71950,11 @@ aAO aAO aAO aAO -aAO -aAO -aAO -aAO -aAO +akF +akV +alF +akV +akF acL aAO aAO @@ -70895,7 +72051,7 @@ bZV bZQ caz bZO -cdi +kDV cen bZO cgj @@ -71006,11 +72162,11 @@ aAO aAO aAO aAO -aAO -aAO -aAO -aAO -aAO +akF +akV +alF +akV +akF anA anA anA @@ -71218,12 +72374,12 @@ aAO aAO aAO aAO -aAO -aAO -aAO -aAO -aAO -anA +akF +akV +alF +akV +akV +aor apq apq ang @@ -71430,12 +72586,12 @@ aAO aAO aAO aAO -aAO -aAO -aAO -aAO -aAO -anA +akF +akV +alF +akV +akV +aor aor aor aor @@ -71479,7 +72635,7 @@ aEV aJu aZM aEV -bbc +lhI aEW aHv bdO @@ -71638,16 +72794,16 @@ aAO aAO aAO aAO -aAO -akF -akF -akF -akF -akF +cnB akF akF akF akF +akV +alF +akV +vnq +vnq vnq vnq vnq @@ -71849,14 +73005,14 @@ aAO aAO aAO aAO -aAO -aAO -akF +cnB +cnB +akV amh alD akV akV -akV +alF akV akV akV @@ -72061,14 +73217,14 @@ aAO aAO aAO aAO -aAO -akF -akF -aln +cnB +gAD +akV +ald alE alo alo -alo +ajl alo akm alo @@ -72092,7 +73248,7 @@ aox awU apl aBg -azZ +cVE aBg aCF aCE @@ -72113,7 +73269,7 @@ aRj aRj aRj aVm -aRj +ogu aRj aYx aRj @@ -72273,8 +73429,8 @@ aAO aAO aAO aAO -aAO -akF +cnB +akV akV akV alF @@ -72485,8 +73641,8 @@ aAO aAO aAO aAO -aAO -akF +cnB +akV akW alo aux @@ -72624,7 +73780,7 @@ cxU cyp cun cuL -cuU +hOU cun cuL cuU @@ -72698,9 +73854,9 @@ acK acK acK acK -akF +fxL aix -akF +fxL alH alH aAO @@ -72751,7 +73907,7 @@ aRj aVp aRj aRj -aRj +ogu aRj aZU bfg @@ -72912,8 +74068,8 @@ aho acO acO acS -aff -aAO +acO +cnB aAO aAO alH @@ -73006,8 +74162,8 @@ bKd bOq bNo bPf -bQJ -bQJ +hEr +hEr bPf bVt bNr @@ -73055,7 +74211,7 @@ cuV cun cxF mCC -hOy +rjp mCC cyp cun @@ -73124,8 +74280,8 @@ ahp ads ads adb -aff -aAO +acO +cnB alH alH akF @@ -73223,7 +74379,7 @@ bPf bPf bVt bNr -bZS +dYY cmc cay cbR @@ -73336,8 +74492,8 @@ acS ahO acO acS -aff -aAO +acO +aHq alH amd amw @@ -73548,8 +74704,8 @@ adv add acO acS -aff -aAO +acO +aHq alH ame amx @@ -73760,8 +74916,8 @@ aem add acP acS -aff -acL +acO +aHq alH amf amy @@ -73852,7 +75008,7 @@ bJx bKg bLk bOq -bNo +nxt bPf bQJ bSr @@ -73972,8 +75128,8 @@ ahq add acO acS -aff -acL +acO +cnB akF akK akK @@ -74064,7 +75220,7 @@ bJy bKh bLm bOq -bNo +nxt bPf bPf bSs @@ -74114,9 +75270,9 @@ cyO cun cyc hOy -hOy +rjp mCC -hOy +igP cyp cAc cyV @@ -74184,8 +75340,8 @@ aen add acO acS -aff -acL +acO +aHq alH amf amz @@ -74286,7 +75442,7 @@ bNr iVr bYT bYT -cbS +vOv cbS bYT cfh @@ -74325,9 +75481,9 @@ cun cyO cun cxT -hOy +igP mCC -hOy +rjp hOy cyp cAc @@ -74388,7 +75544,7 @@ aeQ add afe afD -aeN +xiB aeQ add adR @@ -74396,8 +75552,8 @@ add add acO acS -aff -aAO +acO +aHq alH ame amA @@ -74499,7 +75655,7 @@ bXY bYU caD cbS -cbS +vOv cex bYT cgl @@ -74596,7 +75752,7 @@ acq add adn adA -aeN +xiB add adn aeQ @@ -74608,8 +75764,8 @@ aco add acO acS -aff -aAO +acO +aHq alH amg amB @@ -74710,7 +75866,7 @@ fbk caG bYT caE -cbS +vOv cds bYT bYT @@ -74820,8 +75976,8 @@ ahr add acO acS -aff -aAO +acO +aHq alH alH akF @@ -74939,7 +76095,7 @@ ccU cmM ccU ccU -cbY +omu cto ctX cut @@ -75032,8 +76188,8 @@ acq add acO acS -aff -aAO +acO +cnB aAO aAO alH @@ -75142,6 +76298,7 @@ bXW caa cae cbr +uZm ccV cuy cby @@ -75149,10 +76306,9 @@ ccV cuy cby ccV -cuy -cby -ccV -ctf +uZm +cae +cwM ctT cun cuR @@ -75244,9 +76400,9 @@ add add aik aiy +aik acK aff -aff aAO alH ajQ @@ -75354,6 +76510,7 @@ caa caa cae cbr +uZm ccV cao cbz @@ -75361,9 +76518,8 @@ ccV cao cbz ccV -cao -cbz -ccV +uZm +cae xii ctT cun @@ -75386,7 +76542,7 @@ cvd cuS cun cxF -hOy +igP mCC hOy cyp @@ -75566,6 +76722,7 @@ cgm caa cae cbr +uZm ccV xVH cbA @@ -75573,10 +76730,9 @@ ccV xVH cbA ccV -xVH -cbA -ccV -ctf +tOW +wVs +jfN mJH cun cuM @@ -75653,7 +76809,7 @@ aeN aff aAO acr -acY +jPh ado adF acY @@ -75762,8 +76918,8 @@ cWx bPf bNr bPk -bQJ -bQJ +hEr +hEr bPf bPf bNr @@ -75778,6 +76934,7 @@ cgn caa ciA cbr +uZm ccV caq cbB @@ -75785,10 +76942,9 @@ ccV caq cbB ccV -caq -cbB -ccV -ctf +uZm +cae +cwM ctT cun cuT @@ -75990,9 +77146,7 @@ caa caa cae cbr -ccV -ccV -ccV +uZm ccV ccV ccV @@ -76001,6 +77155,8 @@ ccV ccV ccV bEY +cae +bEZ ctT cun cun @@ -76202,6 +77358,7 @@ cbX chy ciB cbw +uZm ccV caq cjD @@ -76209,9 +77366,8 @@ ccV caq cjD ccV -caq -cjD -ccV +uZm +cae bEZ ctT cun @@ -76302,7 +77458,7 @@ acr ahN ahv aht -aht +gHk aiz aht aht @@ -76414,6 +77570,7 @@ cgp ccU ciC cbr +uZm ccV xVH clY @@ -76421,9 +77578,8 @@ ccV xVH cbA ccV -xVH -cbA -ccV +uZm +cae bsX bGm cun @@ -76502,7 +77658,7 @@ acK abS acr acr -acY +jPh acY acY acY @@ -76549,7 +77705,7 @@ aBK aCO aDV aFx -aye +cjL aBL rxa aIY @@ -76626,9 +77782,7 @@ ccV ccV cae cbr -ccV -ciz -cjE +uZm ccV ciz cjE @@ -76636,7 +77790,9 @@ ccV cpq cjE ccV -bEZ +xrb +wVs +ymc cBD cun cuV @@ -76709,7 +77865,7 @@ acO add adW aeu -aeN +xiB aff aAO aAO @@ -76728,9 +77884,9 @@ add add aik aiy +aik acK aff -aff aAO alH ajQ @@ -76838,6 +77994,7 @@ cbZ ccV cae cbr +uZm ccV cuy cby @@ -76845,10 +78002,9 @@ ccV cuy cby ccV -cuy -cby -ccV -ctf +uZm +cae +cwM igB cun cuR @@ -76940,8 +78096,8 @@ acs add acO acS -aff -aAO +acO +acK aAO aAO alH @@ -77059,10 +78215,10 @@ ccT ccT ccT ccT -ccT -ctp +ciB +cwL mDi -cuu +cuZ cuZ cuZ cuZ @@ -77152,8 +78308,8 @@ ahw add acO acS -aff -aAO +acO +acK alH alH akF @@ -77268,13 +78424,13 @@ ccU ccU ccU coL -coL +xyF coL coL crb ctl ctX -cuv +cvc cvc cvc cvW @@ -77364,8 +78520,8 @@ act add acO acS -aff -aAO +acO +acO alH amd amw @@ -77459,7 +78615,7 @@ bMr bNB bPt bQW -bNv +faW bNv bVA bWR @@ -77576,8 +78732,8 @@ add add acO acS -aff -aAO +acO +acO alH ajm ajC @@ -77695,7 +78851,7 @@ cpY cpU cpY cpY -cpU +xxa cqT ctT cun @@ -77788,8 +78944,8 @@ aex add acO acS -aff -acL +acO +acO alH amf ajD @@ -77901,18 +79057,18 @@ cbt cag clo ccV -cbZ ccV -cpY +ccV +cpU +cpU +cpU cpU -cpY -cpY cpU cqT ctZ cun -cuM -cyO +gTb +iWD cun cuM cvA @@ -78000,8 +79156,8 @@ ahq add acO acS -aff -acL +acO +acK akF akK akK @@ -78095,8 +79251,8 @@ bMr bNE bWT bQX -bNv -bNv +bSF +bUa bVD bWT cai @@ -78108,22 +79264,22 @@ ccU ccU ccU ccU -ciD -cjL +omu +cjK cbA -clo -ccV -ccV -ccV -cpU -cpU -cpU -cpU -cpU +sAI +ccW +ccW +ccW +coK +cpt +coK +coK +coK cqY ctT +cvA cun -cuL cuT cun cuL @@ -78212,8 +79368,8 @@ aey add acP acS -aff -acL +acO +acO alH amf ajE @@ -78313,27 +79469,28 @@ bVE bVI cae cbr +uZm ccV ccV -cdA ceA -cdA ccV ccV +uZm cae cjJ ckI clp -ccT -ccT -ccT -csc -csc -csc -csc -csc +clp +clp +clp +axU +axU +axU +axU +axU iiI -crz +mxM +cwv aFB xxa xxa @@ -78347,7 +79504,6 @@ aFB cpU cpU aFB -dMw uGU uGU cyO @@ -78424,8 +79580,8 @@ adv add acO acS -aff -aAO +acO +acO alH ajm ajF @@ -78525,13 +79681,13 @@ bVE bVI caj cbr +uZm ccV ccb cdB -cdB -cdB ceB ccV +uZm ciA cbq ccU @@ -78545,6 +79701,7 @@ coL coL coL lrB +cqO crz cpU cqO @@ -78559,7 +79716,6 @@ cpU cwu cvG cpU -dMw uGU cyO cyO @@ -78636,8 +79792,8 @@ acS aej acO acS -aff -aAO +acO +acO alH amg amB @@ -78737,15 +79893,15 @@ bVF bVI cae cbr +uZm ccV ccc -cdB ccd -cdB cdC ccV -cae -cbr +ejG +wVs +cbw ccV cuy cby @@ -78758,6 +79914,7 @@ cqd cpU pZu csH +csH cpU csG cqO @@ -78771,7 +79928,6 @@ cpU cok cqO cpU -uGU cyO cyO cxA @@ -78848,8 +80004,8 @@ aDY ahT ads adb -aff -aAO +acO +acK alH alH akF @@ -78949,14 +80105,14 @@ bNv bNv cak cbw +uZm ccV ccc -cdC ccV -ccc cdC ccV -ciE +cuv +wVs cbw ccV cao @@ -78969,6 +80125,7 @@ coN coi cpU hyp +rAy gbV aFB csH @@ -78988,7 +80145,6 @@ cyO cyO cyO cyO -cyO uGU uGU cxa @@ -79060,8 +80216,8 @@ ahz brd acO acS -aff -aAO +acO +acK aAO aAO alH @@ -79121,10 +80277,10 @@ bgQ bgG bfu bfw -bfw bfx bfx -bfw +bfx +bfx bfw bfu bgQ @@ -79161,14 +80317,14 @@ bVG bPQ byo cbr +uZm ccV ccc -cdB ceB -cdB cdC ccV -caj +bEY +cae cbr ccV xVH @@ -79182,6 +80338,7 @@ udR xxa sye coN +coN cpU coM cqd @@ -79199,7 +80356,6 @@ cyO cyO cyO cyO -cyO kag hdp cxa @@ -79373,13 +80529,13 @@ bVH bPQ byr bBZ +uZm ccV ccc cdB -cdB -cdB cdC ccV +uZm ciA cbr ccV @@ -79467,7 +80623,7 @@ aaT abh abs abB -acw +pzi acv agJ adq @@ -79548,8 +80704,8 @@ biv aWR aWR bgH -bgH -bgH +pMa +pMa bhG rMk bfs @@ -79585,13 +80741,13 @@ bNQ bPQ cal bCa +uZm ccV ccc -cdB ccd -cdB cdC ccV +uZm byo cbr ccV @@ -79797,15 +80953,15 @@ bNI bPQ cae cbr +uZm ccV ccc -cdC ccV -ccc cdC ccV +uZm ciF -cbr +bBZ ccV caq cjD @@ -80009,24 +81165,24 @@ bNI bPQ cdP cbr +uZm ccV -ccc -cdB -ceB +ccd cdB -cdC +cgq ccV +uZm ciG cjN ccV -xVH -clY +pAv +cjE ccV -xVH -cqO +pAv +ctu cpU ykG -cqO +ctu cpU ruY cpY @@ -80177,7 +81333,7 @@ aWR bdV bfw aWR -bib +iCq bgQ bku aWR @@ -80186,7 +81342,7 @@ aWR bjj aWR bjj -aWR +wtT bgQ biv aWR @@ -80221,24 +81377,24 @@ bVJ bPQ mYM cbr +uZm +ccV +ccV +cdA ccV -ccd -cdB -cdB -cdB -cgq ccV +uZm ciA cbr +eRY +cuy +cby ccV -ciz -cjE -ccV -ciz -ctu +cuy +cqd cpU -ncT -ctu +vUy +cqd cpU cpY cpY @@ -80387,12 +81543,12 @@ aWR bck aWR bdW -bfw +bfx bxt bib bgQ bku -aWR +wtT bkd blo bmB @@ -80402,7 +81558,7 @@ aWR bpC bqc aWR -bfw +bfx bdW aWR bck @@ -80433,25 +81589,25 @@ bPQ bNH cae uWf -ccV -ccV -cdA -cdA -cdA -ccV -ccV +uZm +aln +uZm +uZm +uZm +iTm +uZm cae -cbr -eRY -cuy -cby -ccV -cuy -cqd -cpU -vUy -cqd -cpU +kBV +hZJ +juy +ccW +ccW +ccW +coK +coK +coK +cpY +cpY vAs cpY cpY @@ -80553,7 +81709,7 @@ agJ bFh akA apK -apH +tBp aqt aqW apK @@ -80645,22 +81801,22 @@ bVK bWU cae cbs -ccY +ccW ccf ccW ccW ccW -cgr +ccf ccW caf faM hXW osO -ccT -ccT -ccT -csc -csc +clp +clp +clp +axU +axU hmZ myY cpY @@ -81023,9 +82179,9 @@ aWR bck aWR bdW -bfw +bfx bjU -bib +sMq bjk aWR bln @@ -81038,7 +82194,7 @@ bjj bgQ biv aWR -bfw +bfx bdW aWR bck @@ -81159,7 +82315,7 @@ aai aau aaF aaK -aaZ +kXt abk aaK aaK @@ -81310,8 +82466,8 @@ cjw ckn cpb cjw -cpa -cpa +tCS +tCS cjw cqA crl @@ -81371,7 +82527,7 @@ acH aav aaF aaK -aaZ +kXt abl abv aaK @@ -81523,7 +82679,7 @@ ckn ckn cjw uTL -cpa +xVZ cjw cqA crm @@ -81584,7 +82740,7 @@ aay aaF aaK aaZ -aaZ +kXt aaK aaK abZ @@ -81681,7 +82837,7 @@ bbp aAO bqr bwp -brl +bCL bzk brW bCk @@ -81700,7 +82856,7 @@ eKr kfj bNQ bNQ -bNQ +tjZ jNC bPQ caq @@ -81877,7 +83033,7 @@ bfs jeD bdW aWR -bgM +rUZ bgM aWR bjj @@ -82120,11 +83276,11 @@ qbj qbj qbj bOz -dRQ -oip -bNQ -xiB -bPQ +bNH +gvb +rhV +rhV +bNH bVM bWW veb @@ -82159,7 +83315,7 @@ ckn cmT cjw ckn -cpa +tCS cjw cio cio @@ -82301,10 +83457,10 @@ bgQ bgQ bfu bfw -bfw bfx bfx -bfw +bfx +bfx bfw bfu bgQ @@ -82324,7 +83480,7 @@ bCl bFA brW bFz -brl +bCL brT bqr aAO @@ -82332,11 +83488,11 @@ aAO aAO aAO bOz -bNH -gvb -rhV -bNH -bNH +gUX +lpc +lCo +hxD +gUX mOu bWX bWX @@ -82546,8 +83702,8 @@ aAO bMv cgv gOT -bRk -bSM +ncT +ciK bUf bVN bWY @@ -82766,7 +83922,7 @@ bRl bYb bRl caL -bRl +qMW bRl bRl bRl @@ -82899,7 +84055,7 @@ apL atu aue auN -avn +vdQ apK axl ayh @@ -82975,16 +84131,16 @@ bPZ bPZ bPZ bPZ -bNU +aCd cbC -bNU +aCd bPZ bPZ bNU cht cgv chD -cht +cmx vix cjQ cjQ @@ -83083,10 +84239,10 @@ aec aha agM agt -agt +eTd ajZ aib -agt +eTd alf aka aka @@ -83186,12 +84342,12 @@ bRm bPI bPI bPI -bPI bRm bPI bPI bPI bPI +bPI bNU cht cgw @@ -83410,8 +84566,8 @@ cgx chF ciM cjT -ckO -ckO +ciM +ciM cmn uOF teg @@ -83533,8 +84689,8 @@ apK ast asU atw -aug -aug +pPD +pPD aug apK axn @@ -83597,7 +84753,7 @@ bFA brW bFz brl -brT +oip bqr aAO aAO @@ -83621,17 +84777,17 @@ cfk cgy chG ciN -cjU -cht -cht -cht -cht -cpp -cpX -cpX -cpX -cpX -cqh +ivH +rlM +rlM +rlM +rlM +wpI +vgv +iRY +iRY +mbv +kfb hcG cpY cpY @@ -83825,7 +84981,7 @@ bSO bWZ bSO bPI -bSO +sFa bPI bSO bNU @@ -83834,15 +84990,15 @@ cht cht ciO fkk -cmx -clv -cmo -cmR +cgt +cgt +cgt +cgt cpp -aAO -aAO -aAO -aAO +cpX +cpX +cpX +cpX cqh cqT crB @@ -83931,10 +85087,10 @@ acV afP agb acg -aiI +aiT ahH aie -aiI +aiT alf aiO alx @@ -84037,7 +85193,7 @@ bSO bPI bSO bYZ -bSO +sFa bPI bSO bPZ @@ -84046,10 +85202,10 @@ cfl chI bVN fkk -ckP -cni -cod -bWY +cgt +cgt +cgt +cgt cpp aAO aAO @@ -84058,6 +85214,7 @@ aAO cqh cqX crz +rMP cpU cpU xxa @@ -84074,7 +85231,6 @@ cqh cqh cqh cqh -cqh aAO acL acL @@ -84258,10 +85414,10 @@ cht cht ciP fkk -cmx -clw -bWY -cmU +cgt +cgt +cgt +cgt cpp cqh cqh @@ -84270,12 +85426,13 @@ cqh cqh vsk crz +rMP cpU cpV cvG cpU cpV -cvG +ieK cpU cwu cvG @@ -84288,7 +85445,6 @@ aAO aAO aAO aAO -aAO acL acL aAO @@ -84474,7 +85630,7 @@ cht cht cht cht -aFA +cpp cpV cqO cpr @@ -84482,6 +85638,7 @@ cpI cqo vsk crz +rMP cpU csG cqO @@ -84501,7 +85658,6 @@ aAO aAO aAO aAO -aAO acL acL aAO @@ -84686,7 +85842,7 @@ cmx clv cmo cmR -aFA +cpp cpW cqO cqO @@ -84694,6 +85850,7 @@ cpJ cqd vsk crz +rMP cpU csH ctu @@ -84714,7 +85871,6 @@ aAO aAO aAO aAO -aAO acL acL aAO @@ -84867,7 +86023,7 @@ bAD bCy bDC ldR -bCB +jNE bAC bEs bqr @@ -84896,9 +86052,9 @@ ciQ cjU ckP cni -cmp +cod bWY -aFA +cpp cpU cpU cpU @@ -84906,6 +86062,7 @@ cpU cpU vsk crz +rMP cpU coM cqd @@ -84927,7 +86084,6 @@ aAO aAO aAO aAO -aAO acL sLI cnD @@ -85110,7 +86266,7 @@ cmx clw bWY cmU -aFA +cpp cqb coK cpt @@ -85303,7 +86459,7 @@ bOD bNZ bPI bPI -bNV +fhj bPI bSO bPI @@ -85444,7 +86600,7 @@ asb auk arQ avp -awy +xGf axp ayu arQ @@ -85656,7 +86812,7 @@ awf auk arQ avp -awy +xGf awy ayu arQ @@ -85732,9 +86888,9 @@ bPZ bPZ bPZ bPZ -bNU +aCd cbC -bPZ +aCd bNU bOf bRC @@ -85744,7 +86900,7 @@ ciR fkk ckP cni -cod +cmp bWY aFA coi @@ -85972,7 +87128,7 @@ csG cqO cpU cok -cqO +joL cpU cok cqO @@ -86177,7 +87333,7 @@ cpU col cpV cpU -col +eIW cpV cpU col @@ -86279,7 +87435,7 @@ alT ajk amM ans -anr +qCU ant apR aqB @@ -87169,14 +88325,14 @@ aUZ aVS aUZ aVS -aUZ +wUA ucU bfC bec bfF bfC ucU -aUZ +wUA ucU aAO aAO @@ -87992,12 +89148,12 @@ kkA kkA kkA jsm -aDy -aBZ -aDy -aBZ -aDy -aHl +aDA +aED +aED +aED +aED +aHz aId aED aED @@ -88204,11 +89360,11 @@ hAq axx dHr uaW -aDy -aCd -aDy -aCd -aDy +ssJ +aCe +aDv +aEH +aED aHl aIb aED @@ -88234,7 +89390,7 @@ baH uyi cPc bfK -aXd +tdF hjN aXf aVT @@ -88286,7 +89442,7 @@ cgG eUF eUF chM -ckV +uhY chM cgG chH @@ -88416,12 +89572,12 @@ amu axy jDr uaW -aDz -aDy -aDy -aDy -aDy -aHq +aDA +tcY +aDu +aEF +aGj +aHn aIc aGj sQI @@ -88497,7 +89653,7 @@ chH cgH chM eUF -chM +uJF ckV chM cgG @@ -88628,12 +89784,12 @@ amu axz jDr uaW -ssJ -aCe -aDs -aEE +aDA +aCo +kjc +aEI aED -aHl +fDd aIb aED aEE @@ -88840,12 +89996,12 @@ amu axA jDr uaW +aDA aED -aCf -aDt -aEF -aGj -aHn +aED +aED +aED +aHs aIe aED aED @@ -89052,23 +90208,23 @@ amu axB jDr uaW -aED -aCo +eLy +aJW aCq aEG -aED -aHl -aIb -tGY -rXA -aJW -xkp -tGY -aMs +aMy +aHn +aIc +txk +vjj +aMy +mlg +ciD +gJD aNQ aPm aQy -cde +dRQ aVa aVV uyi @@ -89079,7 +90235,7 @@ aXd aYu aXf wFn -cPc +mOQ hEL poa aXd @@ -89264,23 +90420,23 @@ amu axy jDr uaW -aDA -aED -aED -aED -aED +ecV +aJW +aJW +aJW +aJW aHl aIb tGY rXA aJW xkp -tGY -aMs +nES +aMv aNP aPl aQz -hHP +dRQ aVa aVV hjN @@ -89475,24 +90631,24 @@ amu amu axz jDr -azw -ssJ -aCe +uaW +eLy +aJW aDs -aEE -aED +aJW +aJW aHl aIb tGY rXA aJW xkp -tGY -aMs +nES +aMv aNQ aPm aQy -cde +dRQ aVc aVW boq @@ -89517,7 +90673,7 @@ boq boq bnG bqf -bmF +bfC brv bvb bsT @@ -89555,7 +90711,7 @@ cdM cgI cfz cgM -chP +wdK chP ckf ckf @@ -89687,24 +90843,24 @@ amu amu axA jDr -uaW +azw aDA -aCp -aDu -aEF -aGj -aHn -aIf aED aED aED aED +aHs +aIf aED -uNi +aED +aED +aED +aMr +aMv aNP aPl aQx -hHP +dRQ aVd aVX aXf @@ -89900,23 +91056,23 @@ amu axB jDr uaW -aDA -aCq -aCo -aEG +ssJ +aCe +aDv +aEH aED aHl aIb aED wju -ogu aCo aED aMs +aMv aNR aPn aQy -cde +dRQ aVa aVT hjN @@ -89940,8 +91096,8 @@ bnH aVT hjN aYu -eWi -bmF +aVa +bfC brx bvb bvb @@ -90113,22 +91269,22 @@ axy jDr uaW aDA -aED -aED -aED -aED -aHy +tcY +aDu +aEF +aGj +aHn aIc aGj aJm -aJY aKS aED aMs +aMv aNP aPl aQx -hHP +dRQ aVa aVT gxV @@ -90152,7 +91308,7 @@ bnH aVT aXd aYu -aVa +eWi bmF bry bsq @@ -90324,23 +91480,23 @@ amu axz jDr uaW -ssJ -aCe -aDv -aEH +aDA +aCo +cAe +aEI aED aHl aIb aED aEE -aJU aCe ssJ +aMs aMu aNS aPm aQy -cde +dRQ aVa aVT aXd @@ -90358,7 +91514,7 @@ baV kaz bae aVT -aXd +uhl aYu bnH aVT @@ -90537,22 +91693,22 @@ axA jDr uaW aDA -tcY -aDu -aEF -aGj -aHz -aIb aED aED aED aED +aHz +aId +aED +aED +aED aDA +aMs aMv aNP aPl aQz -hHP +dRQ aVa aVT gxV @@ -90748,23 +91904,23 @@ oNG axC jDr azx -aDA -aCo -cAe -aEI +ssJ +aCe +aDv +aEH aED aHl aIb aED aJl -aCo mjI aED +aMs aMw aNX aPm aQy -cde +dRQ aVa aVT uyi @@ -90837,7 +91993,7 @@ coP cnK cox coW -cpC +cYN cpf aAO aAO @@ -90961,22 +92117,22 @@ ayx mVf azy aDA -aED -aED -aED -aED -aHs +tcY +aEF +aEF +aGj +aHn aIc aGj aJm -aDu aKV aED +uNi aMv aNY aPl aQz -hHP +dRQ aVa aVT aXd @@ -91169,26 +92325,26 @@ auU avu arJ arJ -gPR +lJd lJd azz aDA -aCe +aCo aDw -aEE +aEI aED aHl aIb aED rtS -aJU aCe ssJ -aMy +aMs +aMv aNQ aPo aQy -cde +dRQ aVa aVT aXd @@ -91384,23 +92540,23 @@ arJ xjn ayz azA -ssJ -aCf +aDA +aED aDt -aEF -aGj -aHz +aED +aED +aHl aIb aDA aED aED -aED aDA -aMz +uux +aMv aNY aPl aQz -hHP +dRQ aVa aVT aXd @@ -91597,9 +92753,9 @@ ayz ayz azA aDA -aCo -aCq -aEG +nmX +hXf +rkO aED aHA aIg @@ -91612,7 +92768,7 @@ aMA aNZ aPm aQy -aOt +dRQ uuB aVa aVa @@ -91819,7 +92975,7 @@ aDA aJo ayz ayy -ayy +ddF aMB aOa aRr @@ -92024,13 +93180,13 @@ ayz ayz flQ aEK -ayy +uEJ ayz azA aIC ayz ayz -gPR +uEJ aLw aMC aOb @@ -93995,7 +95151,7 @@ bLG bLG bOh bTx -bTm +sVf bUH bTx bZp @@ -94617,7 +95773,7 @@ byl bBB bCS bAA -bAA +ciE bEI bFH bFH @@ -95049,9 +96205,9 @@ bDM bEI bJb bLv -bKH +qWS bMu -bMF +xTm bOj bMu bMF @@ -95484,7 +96640,7 @@ bMu bMu bMu bMu -cce +dXt bMu bMu bOl @@ -95920,7 +97076,7 @@ cjj chb chb clG -cie +wbo cnk aAO aAO @@ -96099,7 +97255,7 @@ aXu bzg byp bAE -byp +lTK byp bDZ byp @@ -96945,21 +98101,21 @@ aAO aAO aAO bzg -byp +lTK bAE byp byp bEc -byp +lTK byp bDZ -byp +lTK bIE bLA bLz bNk bMu -bMu +otx bOt bQm bOl @@ -97404,7 +98560,7 @@ cjl cku clb clK -chr +ctp cnl aAO aAO @@ -97828,7 +98984,7 @@ cjn cku cku clK -chr +blI cnl aAO aAO @@ -98035,12 +99191,12 @@ ceb cgY cga chs -chr -chr +blI +blI chs chr clN -chr +blI cnl aAO aAO @@ -101829,8 +102985,8 @@ bEk bCY bCY bCY -bCY -bCY +ugA +ugA bCY bCY bLb diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 36fd4cb7f2a2..0eabcca32045 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -107,46 +107,6 @@ "aap" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_m_s) -"aaq" = ( -/obj/item/bedsheet/purple{ - layer = 3.2 - }, -/obj/item/bedsheet/purple{ - pixel_y = 13 - }, -/obj/item/clothing/head/helmet/marine/tech{ - layer = 4.1; - pixel_y = 12 - }, -/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 - }, -/mob/living/simple_animal/mouse/brown{ - name = "rat" - }, -/obj/structure/sign/safety/bathunisex{ - pixel_x = -16; - pixel_y = 8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/port_emb) "aar" = ( /turf/closed/wall/almayer, /area/almayer/hull/upper_hull/u_m_s) @@ -548,18 +508,6 @@ icon_state = "redfull" }, /area/almayer/engineering/upper_engineering) -"abS" = ( -/obj/structure/machinery/cm_vending/sorted/tech/comtech_tools, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/squads/alpha) -"abT" = ( -/obj/structure/machinery/cm_vending/sorted/tech/comtech_tools, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/squads/bravo) "abU" = ( /obj/structure/machinery/computer/aa_console, /obj/structure/bed/chair/ob_chair, @@ -631,12 +579,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/basketball) -"ack" = ( -/obj/structure/machinery/cm_vending/sorted/tech/comtech_tools, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/squads/charlie) "acl" = ( /turf/open/floor/wood/ship, /area/almayer/living/basketball) @@ -707,12 +649,6 @@ icon_state = "plate" }, /area/almayer/living/chapel) -"acp" = ( -/obj/structure/machinery/cm_vending/sorted/tech/comtech_tools, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/squads/delta) "acq" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -835,20 +771,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/basketball) -"acJ" = ( -/mob/living/silicon/decoy/ship_ai{ - layer = 2.98; - pixel_y = -16 - }, -/obj/structure/blocker/invisible_wall, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer/no_build{ - icon_state = "ai_floors" - }, -/area/almayer/command/airoom) "acK" = ( /obj/structure/desertdam/decals/road_edge{ pixel_x = 2 @@ -1453,12 +1375,6 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/starboard) -"aeN" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/offices/flight) "aeO" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 4; @@ -2723,13 +2639,6 @@ /obj/structure/filingcabinet, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) -"aiH" = ( -/obj/item/tool/crew_monitor, -/obj/structure/surface/rack, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/upper_hull/u_m_s) "aiJ" = ( /obj/effect/step_trigger/teleporter_vector{ name = "Almayer_Down3"; @@ -5211,12 +5120,6 @@ icon_state = "plate" }, /area/almayer/medical/medical_science) -"aqI" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "silver" - }, -/area/almayer/living/auxiliary_officer_office) "aqJ" = ( /turf/open/floor/almayer{ dir = 5; @@ -5541,15 +5444,6 @@ icon_state = "silver" }, /area/almayer/command/cic) -"arG" = ( -/obj/structure/machinery/power/apc/almayer/hardened{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "silver" - }, -/area/almayer/command/cic) "arH" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer{ @@ -5823,19 +5717,6 @@ icon_state = "plate" }, /area/almayer/engineering/engineering_workshop/hangar) -"asD" = ( -/obj/effect/step_trigger/clone_cleaner, -/obj/structure/machinery/door_control{ - id = "ARES StairsUpper"; - name = "ARES Core Access"; - pixel_x = -24; - pixel_y = 24; - req_one_access_txt = "90;91;92" - }, -/turf/open/floor/almayer/no_build{ - icon_state = "ai_floors" - }, -/area/almayer/command/airoom) "asE" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/engineering/engineering_workshop/hangar) @@ -5946,11 +5827,6 @@ icon_state = "redfull" }, /area/almayer/command/cic) -"asR" = ( -/turf/open/floor/almayer{ - icon_state = "orange" - }, -/area/almayer/command/cic) "asS" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -5987,12 +5863,6 @@ icon_state = "blue" }, /area/almayer/hallways/aft_hallway) -"asX" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie_delta_shared) "asY" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_sn_full_cap" @@ -6806,6 +6676,9 @@ /obj/item/ammo_magazine/rifle/m41aMK1/ap, /obj/item/ammo_magazine/rifle/m41aMK1/ap, /obj/item/weapon/gun/rifle/m41aMK1/ap, +/obj/item/ammo_magazine/rifle/m41aMK1/ap, +/obj/item/ammo_magazine/rifle/m41aMK1/ap, +/obj/item/ammo_magazine/rifle/m41aMK1/ap, /turf/open/floor/almayer{ icon_state = "redfull" }, @@ -6820,12 +6693,6 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering) -"auT" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orangecorner" - }, -/area/almayer/command/cic) "auU" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/effect/decal/warning_stripes{ @@ -6932,6 +6799,17 @@ icon_state = "cargo" }, /area/almayer/engineering/engineering_workshop/hangar) +"avf" = ( +/obj/structure/machinery/cm_vending/sorted/attachments/squad{ + req_access = null; + req_one_access = null; + req_one_access_txt = "15;16;21"; + vend_y_offset = 0 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/cryo_cells) "avi" = ( /obj/structure/reagent_dispensers/fueltank/custom, /turf/open/floor/almayer{ @@ -6987,17 +6865,6 @@ icon_state = "red" }, /area/almayer/command/lifeboat) -"avv" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/obj/structure/surface/table/almayer, -/obj/item/tool/hand_labeler, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "red" - }, -/area/almayer/squads/alpha) "avw" = ( /obj/structure/window/framed/almayer, /turf/open/floor/plating, @@ -7416,13 +7283,6 @@ "awC" = ( /turf/closed/wall/almayer, /area/almayer/shipboard/port_missiles) -"awD" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/prop/almayer/CICmap, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/cic) "awE" = ( /turf/closed/wall/almayer, /area/almayer/command/corporateliason) @@ -7533,16 +7393,6 @@ icon_state = "rasputin3" }, /area/almayer/powered/agent) -"axc" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 - }, -/obj/item/tool/warning_cone{ - pixel_x = -20; - pixel_y = 18 - }, -/turf/open/floor/almayer, -/area/almayer/living/port_emb) "axe" = ( /turf/open/floor/almayer{ dir = 8; @@ -7619,6 +7469,20 @@ icon_state = "green" }, /area/almayer/hallways/aft_hallway) +"axt" = ( +/obj/structure/machinery/cm_vending/clothing/leader/alpha{ + density = 0; + pixel_y = 30 + }, +/obj/structure/machinery/cm_vending/gear/leader{ + density = 0; + pixel_x = 31 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "red" + }, +/area/almayer/squads/alpha) "axu" = ( /obj/structure/machinery/computer/telecomms/server, /turf/open/floor/almayer{ @@ -7878,20 +7742,6 @@ icon_state = "redfull" }, /area/almayer/shipboard/starboard_missiles) -"ayr" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/storage/belt/medical/full, -/obj/item/storage/belt/medical/full, -/obj/item/storage/belt/medical/full, -/obj/item/storage/belt/medical/full, -/obj/structure/machinery/computer/working_joe{ - dir = 8; - pixel_x = 17 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/cic) "ays" = ( /turf/open/floor/almayer{ icon_state = "silvercorner" @@ -7939,38 +7789,6 @@ icon_state = "redcorner" }, /area/almayer/shipboard/navigation) -"ayy" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/computer/overwatch/almayer{ - dir = 8; - layer = 3.2; - pixel_x = -17; - pixel_y = 15 - }, -/obj/structure/machinery/light, -/obj/structure/transmitter/rotary{ - name = "Bravo Overwatch Telephone"; - phone_category = "Command"; - phone_id = "Bravo Overwatch" - }, -/obj/structure/sign/safety/terminal{ - pixel_x = -17; - pixel_y = -8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/cic) -"ayz" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8; - layer = 3.25 - }, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "orange" - }, -/area/almayer/command/cic) "ayD" = ( /obj/structure/disposalpipe/trunk{ dir = 1 @@ -8124,20 +7942,6 @@ icon_state = "sterile_green" }, /area/almayer/medical/medical_science) -"ayZ" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/almayer/medical/medical_science) "azb" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -8407,40 +8211,12 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/north2) -"azV" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/window/reinforced/toughened{ - dir = 8 - }, -/obj/structure/machinery/computer/shuttle/dropship/flight/remote_control{ - dir = 4; - name = "Normandy Remote Control Console"; - shuttleId = "dropship_normandy" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/cic) "azW" = ( /obj/structure/machinery/door/window/westright{ dir = 2 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/command/cic) -"azX" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/window/reinforced/toughened{ - dir = 4 - }, -/obj/structure/machinery/computer/shuttle/dropship/flight/remote_control{ - dir = 8; - name = "Alamo Remote Control Console"; - shuttleId = "dropship_alamo" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/cic) "azY" = ( /obj/effect/step_trigger/clone_cleaner, /turf/open/floor/plating/plating_catwalk, @@ -8587,70 +8363,6 @@ dir = 4 }, /area/almayer/command/cic) -"aAB" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/computer/groundside_operations{ - dir = 4; - pixel_y = 8 - }, -/obj/structure/machinery/door/window/westright, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/cic) -"aAC" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8; - layer = 3.25 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/cic) -"aAD" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/door_control{ - id = "CIC Lockdown"; - name = "CIC Lockdown"; - pixel_x = -7; - pixel_y = 9; - req_access_txt = "1" - }, -/obj/structure/machinery/door_control{ - id = "Hangar Lockdown"; - name = "Hangar Lockdown"; - pixel_x = -7; - pixel_y = 2; - req_access_txt = "1" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4; - icon_state = "exposed01-supply" - }, -/obj/structure/machinery/door_control{ - id = "bot_armory"; - name = "Armory Lockdown"; - pixel_x = -7; - pixel_y = -5; - req_one_access_txt = "1;4" - }, -/obj/structure/transmitter/rotary{ - name = "Combat Information Center Telephone"; - phone_category = "Command"; - phone_id = "Combat Information Center"; - pixel_x = 5; - pixel_y = 4 - }, -/obj/structure/machinery/door/window/westright{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/cic) "aAE" = ( /obj/structure/pipes/vents/scrubber{ dir = 8 @@ -9061,13 +8773,6 @@ icon_state = "test_floor4" }, /area/almayer/living/synthcloset) -"aBR" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/ashtray/glass, -/obj/item/storage/fancy/cigarettes/kpack, -/obj/item/device/whistle, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/command/cic) "aBS" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_10" @@ -9077,30 +8782,6 @@ icon_state = "silver" }, /area/almayer/command/cic) -"aBV" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/computer/overwatch/almayer{ - dir = 8; - layer = 3.2; - pixel_x = -17; - pixel_y = -17 - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/transmitter/rotary{ - name = "Charlie Overwatch Telephone"; - phone_category = "Command"; - phone_id = "Charlie Overwatch" - }, -/obj/structure/sign/safety/terminal{ - pixel_x = -17; - pixel_y = 7 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/cic) "aBW" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -9119,49 +8800,6 @@ icon_state = "silver" }, /area/almayer/command/cichallway) -"aBZ" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/window/reinforced/toughened{ - dir = 8 - }, -/obj/structure/window/reinforced/toughened, -/obj/structure/machinery/computer/cameras/almayer_network/vehicle{ - dir = 4; - layer = 2.99; - pixel_y = 4 - }, -/obj/structure/machinery/computer/almayer_control{ - dir = 4; - layer = 2.99; - pixel_y = 26 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/cic) -"aCa" = ( -/obj/structure/machinery/door/window/westright{ - dir = 2 - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/cic) -"aCb" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/window/reinforced/toughened{ - dir = 4 - }, -/obj/structure/window/reinforced/toughened, -/obj/structure/machinery/computer/crew/alt{ - dir = 8; - pixel_y = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/cic) "aCd" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -9274,6 +8912,10 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) +"aCJ" = ( +/obj/structure/bed/chair/wheelchair, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "aCR" = ( /obj/structure/machinery/door_control{ id = "containmentlockdown_S"; @@ -9562,6 +9204,17 @@ icon_state = "silver" }, /area/almayer/command/cic) +"aDN" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/tankerbunks) "aDO" = ( /turf/open/floor/almayer{ dir = 8; @@ -9785,6 +9438,24 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/morgue) +"aEP" = ( +/obj/structure/machinery/door_control{ + id = "ARES StairsLower"; + name = "ARES Core Lockdown"; + pixel_x = -24; + pixel_y = 8; + req_one_access_txt = "90;91;92" + }, +/obj/structure/machinery/camera/autoname/almayer/containment/ares{ + dir = 4; + pixel_y = -8 + }, +/obj/effect/step_trigger/clone_cleaner, +/turf/open/floor/almayer/no_build{ + dir = 8; + icon_state = "silver" + }, +/area/almayer/command/airoom) "aEQ" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -9812,28 +9483,6 @@ icon_state = "bluecorner" }, /area/almayer/hallways/aft_hallway) -"aEZ" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/box/gloves{ - pixel_x = -4; - pixel_y = 13 - }, -/obj/item/storage/box/masks{ - pixel_x = -6; - pixel_y = 4 - }, -/obj/item/tool/hand_labeler{ - pixel_x = 5; - pixel_y = 3 - }, -/obj/item/reagent_container/glass/beaker/cryoxadone{ - pixel_x = -6; - pixel_y = 8 - }, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/medical/medical_science) "aFa" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -10169,6 +9818,18 @@ "aGt" = ( /turf/open/floor/almayer, /area/almayer/command/corporateliason) +"aGu" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/machinery/status_display{ + pixel_y = 30 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "bluecorner" + }, +/area/almayer/squads/delta) "aGv" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 1 @@ -10285,11 +9946,6 @@ icon_state = "plate" }, /area/almayer/living/numbertwobunks) -"aGZ" = ( -/turf/open/floor/almayer{ - icon_state = "bluefull" - }, -/area/almayer/living/numbertwobunks) "aHa" = ( /obj/structure/surface/table/almayer, /obj/item/clipboard, @@ -10479,6 +10135,22 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/north1) +"aHW" = ( +/obj/structure/machinery/door_control/railings{ + pixel_y = -6; + id = "mechdoor"; + pixel_x = -31 + }, +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = 28 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/port_hallway) "aHX" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out" @@ -10557,12 +10229,6 @@ }, /turf/open/floor/plating, /area/almayer/medical/medical_science) -"aIq" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) "aIr" = ( /obj/structure/platform_decoration{ dir = 4 @@ -10572,6 +10238,15 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/north1) +"aIs" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "bluecorner" + }, +/area/almayer/squads/delta) "aIv" = ( /obj/structure/platform_decoration{ dir = 8 @@ -10852,16 +10527,6 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/containment) -"aJp" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22"; - pixel_y = 8 - }, -/turf/open/floor/almayer{ - dir = 6; - icon_state = "blue" - }, -/area/almayer/command/cichallway) "aJq" = ( /obj/structure/machinery/vending/snack, /obj/structure/sign/safety/galley{ @@ -11030,47 +10695,6 @@ }, /turf/open/floor/almayer, /area/almayer/command/cichallway) -"aKs" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S"; - layer = 3.3 - }, -/obj/structure/machinery/door_control{ - id = "ARES Interior"; - indestructible = 1; - name = "ARES Chamber Lockdown"; - pixel_x = 24; - pixel_y = -8; - req_one_access_txt = "90;91;92" - }, -/obj/structure/machinery/door_control{ - id = "ARES Railing"; - indestructible = 1; - name = "ARES Chamber Railings"; - needs_power = 0; - pixel_x = 24; - req_one_access_txt = "91;92" - }, -/obj/structure/machinery/door/poddoor/railing{ - closed_layer = 4.1; - density = 0; - dir = 2; - id = "ARES Railing"; - layer = 2.1; - open_layer = 2.1; - pixel_x = -1; - pixel_y = -1; - unacidable = 0; - unslashable = 0 - }, -/turf/open/floor/almayer/no_build{ - icon_state = "ai_floors" - }, -/area/almayer/command/airoom) "aKu" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -11283,6 +10907,14 @@ /obj/docking_port/stationary/escape_pod/south, /turf/open/floor/plating, /area/almayer/hull/upper_hull/u_m_s) +"aLD" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/donut_box{ + pixel_x = 6; + pixel_y = 6 + }, +/turf/open/floor/almayer, +/area/almayer/squads/delta) "aLE" = ( /obj/docking_port/stationary/emergency_response/external/hangar_starboard{ dwidth = 8 @@ -11486,21 +11118,6 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering) -"aMx" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad{ - req_access = null; - req_one_access = null; - req_one_access_txt = "15;16;21"; - vend_x_offset = 0; - vend_y_offset = 0 - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha_bravo_shared) "aMz" = ( /turf/open/floor/almayer, /area/almayer/squads/alpha) @@ -11513,15 +11130,6 @@ icon_state = "red" }, /area/almayer/squads/alpha) -"aMC" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "red" - }, -/area/almayer/squads/alpha) "aMD" = ( /obj/structure/surface/table/almayer, /obj/item/clipboard, @@ -11544,48 +11152,6 @@ icon_state = "kitchen" }, /area/almayer/engineering/upper_engineering) -"aMH" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/effect/landmark/start/marine/smartgunner/alpha, -/obj/effect/landmark/late_join/alpha, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/alpha) -"aMI" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/landmark/start/marine/spec/delta, -/obj/effect/landmark/late_join/delta, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/delta) -"aMM" = ( -/obj/structure/machinery/door_control{ - id = "laddernortheast"; - name = "North East Ladders Shutters"; - pixel_x = 25; - req_one_access_txt = "2;3;12;19"; - throw_range = 15 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "red" - }, -/area/almayer/hallways/starboard_hallway) -"aMO" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 26 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "cargo_arrow" - }, -/area/almayer/squads/alpha_bravo_shared) -"aMP" = ( -/turf/open/floor/almayer{ - icon_state = "redcorner" - }, -/area/almayer/squads/alpha) "aMQ" = ( /obj/structure/machinery/cm_vending/clothing/tl/alpha{ density = 0; @@ -11603,27 +11169,12 @@ icon_state = "red" }, /area/almayer/command/lifeboat) -"aMV" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "red" - }, -/area/almayer/hallways/starboard_hallway) "aMY" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/almayer{ icon_state = "test_floor4" }, /area/almayer/hallways/hangar) -"aNc" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/squads/alpha) "aNe" = ( /obj/structure/closet/firecloset, /obj/item/clothing/mask/gas, @@ -11694,54 +11245,9 @@ icon_state = "plating" }, /area/almayer/hull/lower_hull/l_f_s) -"aNx" = ( -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "cargo_arrow" - }, -/area/almayer/squads/alpha_bravo_shared) -"aNG" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "redcorner" - }, -/area/almayer/hallways/starboard_hallway) -"aNI" = ( -/obj/structure/machinery/door/airlock/almayer/marine/alpha/tl, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/alpha) "aNO" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/starboard_hallway) -"aNQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 - }, -/obj/structure/surface/table/almayer, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/alpha) -"aNT" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/alpha) "aNY" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -11816,18 +11322,6 @@ icon_state = "cargo" }, /area/almayer/command/telecomms) -"aOy" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "redcorner" - }, -/area/almayer/squads/alpha) "aOz" = ( /turf/open/floor/almayer{ dir = 8; @@ -11888,28 +11382,6 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering) -"aOK" = ( -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" - }, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "red" - }, -/area/almayer/squads/alpha) -"aOL" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/obj/structure/surface/table/almayer, -/obj/item/facepaint/green, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/alpha) "aOM" = ( /obj/structure/machinery/power/port_gen/pacman, /turf/open/floor/almayer{ @@ -12015,60 +11487,12 @@ icon_state = "red" }, /area/almayer/hallways/stern_hallway) -"aPf" = ( -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) -"aPi" = ( -/obj/structure/machinery/vending/cola, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha) -"aPj" = ( -/obj/structure/pipes/vents/pump{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "red" - }, -/area/almayer/squads/alpha) -"aPl" = ( -/obj/structure/machinery/cm_vending/clothing/marine/alpha{ - density = 0; - layer = 4.1; - pixel_y = -29 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha) "aPm" = ( /obj/structure/closet/firecloset, /turf/open/floor/almayer{ icon_state = "mono" }, /area/almayer/hallways/aft_hallway) -"aPn" = ( -/obj/structure/machinery/cm_vending/clothing/marine/bravo{ - density = 0; - pixel_y = 16 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) -"aPo" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/alpha{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/alpha) "aPr" = ( /turf/open/floor/almayer{ icon_state = "silverfull" @@ -12095,11 +11519,6 @@ icon_state = "test_floor4" }, /area/almayer/command/lifeboat) -"aPB" = ( -/turf/open/floor/almayer{ - icon_state = "emerald" - }, -/area/almayer/command/cic) "aPD" = ( /obj/structure/machinery/photocopier, /turf/open/floor/almayer{ @@ -12175,16 +11594,27 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) -"aQg" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8; - layer = 3.25 +"aQc" = ( +/obj/structure/machinery/cryopod, +/obj/structure/machinery/light{ + dir = 8 }, /turf/open/floor/almayer{ - dir = 9; - icon_state = "emerald" + icon_state = "cargo" }, -/area/almayer/command/cic) +/area/almayer/hallways/port_hallway) +"aQl" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "cargo_arrow" + }, +/area/almayer/hallways/port_hallway) "aQo" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -12300,34 +11730,6 @@ /obj/effect/landmark/start/researcher, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/offices) -"aQL" = ( -/turf/closed/wall/almayer, -/area/almayer/squads/bravo) -"aQM" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/book/manual/engineering_guide{ - pixel_x = 6; - pixel_y = 6 - }, -/obj/item/prop/helmetgarb/gunoil{ - pixel_x = -8 - }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) -"aQN" = ( -/obj/structure/sign/nosmoking_1, -/turf/closed/wall/almayer, -/area/almayer/squads/bravo) -"aQT" = ( -/obj/structure/machinery/cm_vending/clothing/marine/alpha{ - density = 0; - layer = 4.1; - pixel_y = -29 - }, -/turf/open/floor/almayer{ - icon_state = "cargo_arrow" - }, -/area/almayer/squads/alpha) "aQW" = ( /obj/structure/machinery/vending/cola{ pixel_x = -6; @@ -12395,14 +11797,6 @@ icon_state = "sterile" }, /area/almayer/hull/upper_hull/u_a_s) -"aRo" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/bravo) "aRp" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer{ @@ -12428,16 +11822,6 @@ icon_state = "orange" }, /area/almayer/hull/upper_hull/u_f_p) -"aRt" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "emeraldcorner" - }, -/area/almayer/command/cic) -"aRu" = ( -/obj/structure/foamed_metal, -/turf/open/floor/plating, -/area/almayer/hallways/hangar) "aRv" = ( /obj/structure/machinery/light{ dir = 8 @@ -12446,14 +11830,6 @@ icon_state = "plate" }, /area/almayer/living/captain_mess) -"aRx" = ( -/obj/structure/bed/chair/comfy{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "bluefull" - }, -/area/almayer/living/captain_mess) "aRy" = ( /turf/open/floor/almayer, /area/almayer/living/offices) @@ -12549,12 +11925,16 @@ }, /turf/open/floor/plating/almayer, /area/almayer/medical/upper_medical) -"aRP" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orangecorner" +"aRO" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 }, -/area/almayer/squads/bravo) +/obj/structure/window/framed/almayer, +/obj/structure/curtain/open/shower{ + name = "cryo curtain" + }, +/turf/open/floor/plating, +/area/almayer/hallways/port_hallway) "aRS" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -12564,16 +11944,6 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/upper_medical) -"aRT" = ( -/turf/open/floor/almayer, -/area/almayer/squads/bravo) -"aRU" = ( -/obj/structure/pipes/vents/pump/on, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orange" - }, -/area/almayer/squads/bravo) "aRV" = ( /obj/structure/platform{ dir = 4 @@ -12582,31 +11952,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_s) -"aRX" = ( -/obj/structure/pipes/vents/scrubber{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orange" - }, -/area/almayer/squads/bravo) -"aRZ" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orangecorner" - }, -/area/almayer/squads/bravo) -"aSa" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/bravo) "aSb" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 @@ -12667,24 +12012,6 @@ icon_state = "kitchen" }, /area/almayer/living/captain_mess) -"aSr" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 8; - name = "ship-grade camera" - }, -/obj/structure/sign/safety/one{ - pixel_x = 32; - pixel_y = -8 - }, -/obj/structure/sign/safety/ammunition{ - pixel_x = 32; - pixel_y = 7 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "red" - }, -/area/almayer/hallways/starboard_hallway) "aSt" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/chem_dispenser/soda/beer, @@ -12749,31 +12076,6 @@ icon_state = "orange" }, /area/almayer/hallways/stern_hallway) -"aSE" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/squads/bravo) -"aSH" = ( -/obj/structure/machinery/light, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "orangecorner" - }, -/area/almayer/squads/bravo) -"aSI" = ( -/obj/structure/machinery/firealarm{ - pixel_y = -28 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/squads/bravo) "aSJ" = ( /turf/open/floor/almayer{ icon_state = "red" @@ -12831,6 +12133,21 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/command/cichallway) +"aTc" = ( +/obj/structure/machinery/cm_vending/sorted/medical/blood{ + density = 0; + pixel_y = 16 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "sterile_green_side" + }, +/area/almayer/medical/medical_science) "aTf" = ( /obj/structure/platform{ dir = 8 @@ -12897,31 +12214,6 @@ icon_state = "green" }, /area/almayer/living/offices) -"aTv" = ( -/obj/structure/machinery/cm_vending/clothing/marine/bravo{ - density = 0; - pixel_y = 16 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "cargo_arrow" - }, -/area/almayer/squads/bravo) -"aTw" = ( -/obj/structure/machinery/door/airlock/almayer/marine/bravo/tl, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/bravo) -"aTx" = ( -/obj/structure/machinery/power/apc/almayer, -/obj/structure/surface/table/almayer, -/obj/item/tool/hand_labeler, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orange" - }, -/area/almayer/squads/bravo) "aTy" = ( /obj/structure/bed/chair/comfy/black{ dir = 1 @@ -12958,15 +12250,6 @@ icon_state = "plate" }, /area/almayer/living/captain_mess) -"aTB" = ( -/obj/structure/bed/chair/comfy{ - dir = 8 - }, -/obj/structure/pipes/vents/scrubber, -/turf/open/floor/almayer{ - icon_state = "bluefull" - }, -/area/almayer/living/captain_mess) "aTE" = ( /turf/open/floor/prison{ icon_state = "kitchen" @@ -13047,12 +12330,6 @@ icon_state = "dark_sterile" }, /area/almayer/shipboard/brig/cells) -"aTW" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) "aTY" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -13103,21 +12380,6 @@ icon_state = "silver" }, /area/almayer/command/cichallway) -"aUi" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 26 - }, -/turf/open/floor/almayer{ - icon_state = "cargo_arrow" - }, -/area/almayer/squads/alpha_bravo_shared) -"aUj" = ( -/obj/structure/machinery/cm_vending/clothing/tl/bravo{ - density = 0; - pixel_x = 32 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/bravo) "aUk" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = 25 @@ -13149,21 +12411,6 @@ icon_state = "plate" }, /area/almayer/living/captain_mess) -"aUo" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/structure/bed/chair/comfy{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "bluefull" - }, -/area/almayer/living/captain_mess) "aUp" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -13174,17 +12421,6 @@ icon_state = "plate" }, /area/almayer/living/captain_mess) -"aUq" = ( -/obj/structure/bed/chair/comfy{ - dir = 8 - }, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "bluefull" - }, -/area/almayer/living/captain_mess) "aUw" = ( /turf/open/floor/almayer{ icon_state = "plate" @@ -13193,6 +12429,26 @@ "aUx" = ( /turf/closed/wall/almayer/outer, /area/almayer/engineering/lower_engineering) +"aUB" = ( +/obj/structure/bed/chair{ + dir = 8; + pixel_y = 3 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + icon_state = "bluecorner" + }, +/area/almayer/squads/delta) "aUC" = ( /obj/structure/machinery/light{ dir = 4 @@ -13231,35 +12487,12 @@ icon_state = "green" }, /area/almayer/living/offices) -"aUY" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orange" - }, -/area/almayer/squads/bravo) -"aUZ" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "orange" - }, -/area/almayer/squads/bravo) -"aVd" = ( -/turf/open/floor/almayer{ - dir = 9; - icon_state = "orange" - }, -/area/almayer/squads/bravo) -"aVf" = ( +"aUS" = ( +/obj/structure/surface/table/almayer, /turf/open/floor/almayer{ - icon_state = "orange" + icon_state = "plate" }, -/area/almayer/squads/bravo) +/area/almayer/hallways/port_hallway) "aVg" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -13274,27 +12507,16 @@ icon_state = "test_floor4" }, /area/almayer/living/bridgebunks) -"aVi" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/bed/chair/comfy{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "bluefull" - }, -/area/almayer/living/captain_mess) -"aVk" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/bed/chair/comfy{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "bluefull" - }, -/area/almayer/living/captain_mess) "aVl" = ( /turf/closed/wall/almayer, /area/almayer/engineering/lower_engineering) +"aVm" = ( +/obj/structure/pipes/vents/scrubber, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/port_hallway) "aVo" = ( /obj/structure/machinery/light{ dir = 1 @@ -13352,15 +12574,6 @@ icon_state = "silver" }, /area/almayer/command/cichallway) -"aVI" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/chem_dispenser/soda{ - pixel_y = 5 - }, -/turf/open/floor/almayer{ - icon_state = "bluefull" - }, -/area/almayer/command/cichallway) "aVL" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 8; @@ -13549,6 +12762,21 @@ /obj/structure/window/framed/almayer, /turf/open/floor/plating, /area/almayer/living/gym) +"aWy" = ( +/obj/structure/pipes/vents/pump{ + dir = 4 + }, +/obj/structure/machinery/status_display{ + pixel_y = 30 + }, +/obj/structure/platform{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/port_hallway) "aWz" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/door/poddoor/almayer/open{ @@ -13993,25 +13221,18 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/starboard_hallway) +"aZb" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "aZe" = ( /obj/structure/machinery/alarm/almayer{ dir = 1 }, /turf/open/floor/wood/ship, /area/almayer/living/chapel) -"aZf" = ( -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha) "aZg" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -14613,31 +13834,12 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/north2) -"bbY" = ( -/obj/structure/machinery/cm_vending/clothing/smartgun/alpha, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha) "bbZ" = ( /obj/structure/machinery/constructable_frame, /turf/open/floor/almayer{ icon_state = "mono" }, /area/almayer/lifeboat_pumps/north2) -"bca" = ( -/obj/structure/machinery/cm_vending/gear/smartgun, -/obj/structure/sign/safety/hazard{ - pixel_y = 32 - }, -/obj/structure/sign/safety/ammunition{ - pixel_x = 15; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha) "bcb" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -14674,12 +13876,6 @@ "bcm" = ( /turf/closed/wall/almayer, /area/almayer/hallways/hangar) -"bco" = ( -/obj/structure/machinery/cm_vending/gear/medic, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha) "bcp" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -14827,14 +14023,6 @@ icon_state = "dark_sterile" }, /area/almayer/medical/operating_room_two) -"bcZ" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/box/masks, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/squads/alpha) "bda" = ( /obj/structure/machinery/door_control{ id = "or02"; @@ -14930,25 +14118,6 @@ "bdr" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/alpha) -"bds" = ( -/obj/structure/machinery/cm_vending/clothing/specialist/alpha, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha) -"bdv" = ( -/obj/structure/machinery/cm_vending/clothing/leader/alpha, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha) -"bdw" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "red" - }, -/area/almayer/living/cryo_cells) "bdy" = ( /obj/structure/machinery/door/airlock/almayer/secure/reinforced{ dir = 2; @@ -14965,12 +14134,6 @@ icon_state = "test_floor4" }, /area/almayer/squads/alpha) -"bdA" = ( -/obj/structure/machinery/cm_vending/clothing/medic/alpha, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha) "bdC" = ( /turf/open/floor/almayer{ icon_state = "plate" @@ -14995,19 +14158,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/hangar) -"bdJ" = ( -/obj/structure/machinery/cm_vending/gear/spec, -/obj/structure/sign/safety/hazard{ - pixel_y = 32 - }, -/obj/structure/sign/safety/ammunition{ - pixel_x = 15; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha) "bdK" = ( /obj/structure/largecrate/random/case/small, /turf/open/floor/almayer, @@ -15160,13 +14310,6 @@ icon_state = "dark_sterile" }, /area/almayer/medical/operating_room_one) -"bew" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/box/masks, -/turf/open/floor/almayer{ - icon_state = "orange" - }, -/area/almayer/squads/bravo) "bez" = ( /obj/structure/closet/secure_closet/medical2, /turf/open/floor/almayer{ @@ -15210,13 +14353,6 @@ icon_state = "orange" }, /area/almayer/hull/lower_hull/l_m_s) -"beP" = ( -/obj/item/stack/catwalk, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating/almayer, -/area/almayer/squads/alpha_bravo_shared) "beQ" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer, @@ -15234,27 +14370,6 @@ icon_state = "test_floor4" }, /area/almayer/squads/alpha) -"beT" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/squads/alpha) -"beU" = ( -/obj/structure/machinery/cm_vending/gear/leader, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha) -"beV" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/landmark/start/marine/leader/alpha, -/obj/effect/landmark/late_join/alpha, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/alpha) "beW" = ( /obj/structure/machinery/light{ dir = 8 @@ -15301,86 +14416,18 @@ icon_state = "silver" }, /area/almayer/living/cryo_cells) -"bfm" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "silver" - }, -/area/almayer/living/cryo_cells) -"bfn" = ( -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha_bravo_shared) -"bfo" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "redcorner" - }, -/area/almayer/living/cryo_cells) "bfs" = ( /turf/open/floor/almayer{ dir = 1; icon_state = "orangecorner" }, /area/almayer/engineering/lower_engineering) -"bft" = ( -/obj/structure/disposalpipe/junction{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/alpha) -"bfu" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "redcorner" - }, -/area/almayer/squads/alpha) -"bfw" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = 28 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/squads/alpha) -"bfx" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/squads/alpha) "bfy" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/alpha) -"bfz" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/squads/alpha) "bfA" = ( /obj/structure/surface/table/almayer, /obj/item/storage/toolbox/electrical, @@ -15392,42 +14439,6 @@ icon_state = "cargo" }, /area/almayer/engineering/engine_core) -"bfC" = ( -/obj/structure/machinery/alarm/almayer{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/squads/alpha) -"bfD" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/squads/alpha) -"bfE" = ( -/obj/structure/pipes/vents/scrubber{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "redcorner" - }, -/area/almayer/squads/alpha) "bfJ" = ( /obj/structure/surface/table/almayer, /obj/item/prop/almayer/handheld1, @@ -15467,11 +14478,6 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"bga" = ( -/turf/open/floor/almayer{ - icon_state = "redcorner" - }, -/area/almayer/hallways/starboard_hallway) "bgc" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -15681,30 +14687,17 @@ icon_state = "test_floor5" }, /area/almayer/squads/req) -"bgU" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer{ - icon_state = "red" - }, -/area/almayer/squads/alpha) -"bgW" = ( -/obj/structure/machinery/cm_vending/clothing/marine/charlie{ +"bhb" = ( +/obj/structure/machinery/cm_vending/gear/tl{ density = 0; - layer = 4.1; - pixel_y = -29 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) -"bgY" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 + pixel_x = -32; + vend_x_offset = 1 }, /turf/open/floor/almayer{ - icon_state = "red" + dir = 8; + icon_state = "blue" }, -/area/almayer/squads/alpha) +/area/almayer/squads/delta) "bhf" = ( /obj/structure/machinery/light{ dir = 4 @@ -15717,15 +14710,6 @@ icon_state = "tcomms" }, /area/almayer/command/telecomms) -"bhg" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "silver" - }, -/area/almayer/living/cryo_cells) "bhh" = ( /obj/structure/machinery/door/poddoor/almayer{ id = "n_umbilical"; @@ -15795,24 +14779,6 @@ icon_state = "plating" }, /area/almayer/hull/lower_hull/l_a_s) -"bhG" = ( -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha) -"bhJ" = ( -/obj/structure/machinery/cm_vending/clothing/staff_officer{ - density = 0; - pixel_x = -30 - }, -/turf/open/floor/almayer{ - icon_state = "bluefull" - }, -/area/almayer/living/bridgebunks) "bhM" = ( /obj/structure/safe, /obj/item/coin/platinum, @@ -15825,6 +14791,12 @@ /obj/item/clothing/suit/armor/bulletproof, /turf/open/floor/wood/ship, /area/almayer/command/corporateliason) +"bhO" = ( +/turf/open/floor/almayer{ + dir = 5; + icon_state = "silver" + }, +/area/almayer/living/port_emb) "bhT" = ( /obj/structure/cargo_container/lockmart/mid{ layer = 3.1; @@ -15969,6 +14941,20 @@ "bjg" = ( /turf/open/floor/almayer, /area/almayer/engineering/lower_engineering) +"bjh" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha) "bjl" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -15984,13 +14970,6 @@ icon_state = "test_floor4" }, /area/almayer/engineering/engine_core) -"bjs" = ( -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) "bju" = ( /turf/open/floor/almayer{ dir = 1; @@ -16022,6 +15001,12 @@ icon_state = "cargo_arrow" }, /area/almayer/living/offices) +"bjE" = ( +/obj/structure/machinery/cm_vending/clothing/marine/bravo, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/cryo_cells) "bjI" = ( /obj/structure/machinery/portable_atmospherics/powered/scrubber, /turf/open/floor/almayer{ @@ -16241,18 +15226,6 @@ icon_state = "mono" }, /area/almayer/medical/hydroponics) -"bkU" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/effect/landmark/late_join, -/obj/effect/landmark/ert_spawns/distress_cryo, -/obj/effect/landmark/start/senior, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "silver" - }, -/area/almayer/living/cryo_cells) "bkY" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 1; @@ -16351,21 +15324,6 @@ icon_state = "plate" }, /area/almayer/living/offices) -"blq" = ( -/obj/structure/machinery/door/airlock/almayer/security/glass{ - dir = 2; - name = "Firing Range"; - req_access = null; - req_one_access_txt = "2;4;7;9;21"; - access_modified = 1 - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/living/cryo_cells) "bls" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/almayer, @@ -16381,19 +15339,6 @@ icon_state = "plate" }, /area/almayer/living/offices) -"blA" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orange" - }, -/area/almayer/squads/bravo) -"blB" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orange" - }, -/area/almayer/squads/bravo) "blJ" = ( /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -16442,32 +15387,6 @@ icon_state = "test_floor4" }, /area/almayer/medical/operating_room_four) -"bmh" = ( -/obj/structure/machinery/vending/cigarette{ - density = 0; - pixel_x = -5; - pixel_y = 16 - }, -/obj/structure/reagent_dispensers/water_cooler/stacks{ - density = 0; - pixel_x = 13; - pixel_y = 15 - }, -/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 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orange" - }, -/area/almayer/squads/bravo) "bmi" = ( /obj/structure/closet/secure_closet/medical2, /turf/open/floor/almayer{ @@ -16511,18 +15430,16 @@ icon_state = "greenfull" }, /area/almayer/living/offices) +"bmm" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/alpha) "bmn" = ( /obj/structure/machinery/vending/snack, /turf/open/floor/almayer{ icon_state = "sterile_green_corner" }, /area/almayer/medical/lower_medical_lobby) -"bmr" = ( -/obj/structure/pipes/vents/pump{ - dir = 1 - }, -/turf/open/floor/almayer, -/area/almayer/living/briefing) "bmu" = ( /obj/structure/machinery/suit_storage_unit/compression_suit/uscm, /turf/open/floor/almayer{ @@ -16721,82 +15638,6 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/chemistry) -"bno" = ( -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/bravo) -"bnp" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "orangecorner" - }, -/area/almayer/squads/bravo) -"bnr" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 1; - name = "ship-grade camera" - }, -/turf/open/floor/almayer{ - icon_state = "orange" - }, -/area/almayer/squads/bravo) -"bnt" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/bravo) -"bnu" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "orange" - }, -/area/almayer/squads/bravo) -"bnA" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/bravo{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/bravo) -"bnB" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "cargo_arrow" - }, -/area/almayer/squads/bravo) "bnD" = ( /obj/structure/disposalpipe/junction{ dir = 4 @@ -16853,21 +15694,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/operating_room_three) -"bnX" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) "bob" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -17159,21 +15985,6 @@ icon_state = "dark_sterile" }, /area/almayer/medical/chemistry) -"bpC" = ( -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/bravo) -"bpG" = ( -/obj/structure/machinery/door/airlock/almayer/marine/bravo/medic, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/bravo) -"bpH" = ( -/obj/structure/machinery/door/airlock/almayer/marine/bravo/engineer, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/bravo) "bpJ" = ( /obj/structure/surface/rack, /obj/effect/spawner/random/tool, @@ -17188,18 +15999,6 @@ icon_state = "test_floor4" }, /area/almayer/squads/alpha) -"bpL" = ( -/obj/structure/sign/poster{ - pixel_y = 32 - }, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "red" - }, -/area/almayer/squads/alpha) "bpQ" = ( /obj/structure/machinery/door/poddoor/railing{ dir = 4; @@ -17285,6 +16084,13 @@ icon_state = "plate" }, /area/almayer/engineering/engineering_workshop) +"bqg" = ( +/obj/structure/surface/rack, +/obj/effect/spawner/random/gun/rifle/midchance, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/squads/req) "bqm" = ( /obj/structure/closet/boxinggloves, /turf/open/floor/almayer{ @@ -17306,6 +16112,19 @@ icon_state = "redcorner" }, /area/almayer/shipboard/brig/processing) +"bqv" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22"; + pixel_y = 8 + }, +/obj/structure/machinery/power/apc/almayer/hardened{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "silver" + }, +/area/almayer/command/cic) "bqw" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/wood/ship, @@ -17381,22 +16200,6 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/port_missiles) -"bqW" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/clothing/head/cmcap{ - pixel_x = 8; - pixel_y = -1 - }, -/obj/item/ammo_box/magazine/misc/mre{ - pixel_x = -6; - pixel_y = 7 - }, -/obj/item/prop/helmetgarb/helmet_nvg/cosmetic{ - pixel_x = 5; - pixel_y = 7 - }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) "bqZ" = ( /turf/open/floor/almayer{ icon_state = "plate" @@ -17430,39 +16233,6 @@ icon_state = "test_floor5" }, /area/almayer/squads/req) -"brn" = ( -/obj/structure/machinery/door/airlock/almayer/marine/bravo/smart, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/bravo) -"brp" = ( -/obj/structure/supply_drop/bravo, -/turf/open/floor/plating, -/area/almayer/squads/req) -"brr" = ( -/obj/structure/machinery/cm_vending/clothing/medic/bravo, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) -"brs" = ( -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) -"brt" = ( -/obj/structure/machinery/cm_vending/clothing/engi/bravo, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) -"brv" = ( -/obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera" - }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha) "brw" = ( /obj/structure/surface/table/almayer, /obj/item/device/flashlight/lamp, @@ -17475,28 +16245,6 @@ icon_state = "orange" }, /area/almayer/engineering/engineering_workshop) -"bry" = ( -/obj/structure/sign/poster{ - pixel_y = 32 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "red" - }, -/area/almayer/squads/alpha) -"brA" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/bravo) "brC" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/atmos_alert{ @@ -17506,17 +16254,6 @@ icon_state = "plate" }, /area/almayer/engineering/engineering_workshop) -"brH" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) "brI" = ( /obj/structure/machinery/camera/autoname/almayer{ name = "ship-grade camera" @@ -17660,6 +16397,32 @@ "bst" = ( /turf/closed/wall/almayer/white, /area/almayer/medical/operating_room_one) +"bsv" = ( +/obj/structure/sign/safety/rewire{ + pixel_y = 38 + }, +/obj/structure/sign/safety/fibre_optics{ + pixel_x = 14; + pixel_y = 38 + }, +/obj/structure/sign/safety/laser{ + pixel_y = 24 + }, +/obj/structure/sign/safety/terminal{ + pixel_x = 14; + pixel_y = 24 + }, +/obj/structure/machinery/door_control{ + id = "ARES Operations Left"; + name = "ARES Operations Shutter"; + pixel_x = 24; + pixel_y = -8; + req_one_access_txt = "90;91;92" + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) "bsw" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -17715,20 +16478,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_s) -"bsG" = ( -/obj/structure/machinery/disposal{ - density = 0; - layer = 3.2; - pixel_y = 16 - }, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "redcorner" - }, -/area/almayer/living/cryo_cells) "bsJ" = ( /obj/structure/machinery/door/poddoor/railing{ dir = 4; @@ -17796,12 +16545,6 @@ icon_state = "plate" }, /area/almayer/living/offices) -"bsS" = ( -/obj/structure/machinery/cm_vending/clothing/specialist/bravo, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) "bsT" = ( /obj/structure/pipes/vents/scrubber{ dir = 1 @@ -17811,16 +16554,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/starboard_hallway) -"bsU" = ( -/obj/structure/surface/table/almayer, -/obj/item/trash/USCMtray{ - pixel_y = 7 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "red" - }, -/area/almayer/squads/alpha) "bsV" = ( /obj/structure/pipes/vents/pump{ dir = 8 @@ -17828,18 +16561,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, /area/almayer/hallways/starboard_hallway) -"bsW" = ( -/obj/structure/machinery/cm_vending/clothing/leader/bravo, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) -"bsX" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orangecorner" - }, -/area/almayer/hallways/starboard_hallway) "bsZ" = ( /obj/structure/machinery/power/monitor{ name = "Main Power Grid Monitoring" @@ -17848,19 +16569,6 @@ icon_state = "plate" }, /area/almayer/engineering/engineering_workshop) -"btc" = ( -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/squads/alpha) "bti" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/intel{ @@ -17973,6 +16681,10 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, /turf/open/floor/almayer, /area/almayer/hallways/hangar) "btO" = ( @@ -18094,10 +16806,6 @@ icon_state = "cargo_arrow" }, /area/almayer/living/offices) -"buz" = ( -/obj/structure/supply_drop/charlie, -/turf/open/floor/plating, -/area/almayer/squads/req) "buB" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -18134,31 +16842,6 @@ icon_state = "plate" }, /area/almayer/engineering/engineering_workshop) -"buM" = ( -/obj/structure/machinery/cm_vending/clothing/smartgun/bravo, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) -"buN" = ( -/obj/structure/machinery/cm_vending/gear/smartgun, -/obj/structure/sign/safety/hazard{ - pixel_x = 15; - pixel_y = -32 - }, -/obj/structure/sign/safety/ammunition{ - pixel_y = -32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) -"buO" = ( -/obj/structure/machinery/cm_vending/gear/medic, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) "buQ" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/working_joe{ @@ -18168,12 +16851,6 @@ icon_state = "plate" }, /area/almayer/engineering/engineering_workshop) -"buS" = ( -/obj/structure/machinery/cm_vending/gear/engi, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) "buU" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -18246,6 +16923,17 @@ }, /turf/open/floor/almayer, /area/almayer/command/corporateliason) +"bvn" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_ammo/squad{ + req_access = null; + req_one_access = null; + req_one_access_txt = "17;18;21"; + vend_x_offset = 0 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "bvr" = ( /obj/structure/bed/chair/office/dark, /obj/effect/decal/warning_stripes{ @@ -18357,6 +17045,19 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_m_p) +"bwb" = ( +/obj/vehicle/powerloader/ft, +/obj/structure/platform{ + dir = 8; + layer = 2.7 + }, +/obj/structure/platform{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/hallways/port_hallway) "bwc" = ( /obj/structure/barricade/handrail{ dir = 8 @@ -18379,51 +17080,6 @@ icon_state = "plate" }, /area/almayer/squads/alpha) -"bwf" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/alpha) -"bwg" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/surface/table/almayer, -/obj/item/trash/USCMtray{ - pixel_y = 7 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "red" - }, -/area/almayer/squads/alpha) -"bwh" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "cargo_arrow" - }, -/area/almayer/squads/alpha) "bwj" = ( /obj/structure/pipes/standard/simple/visible, /obj/structure/sign/safety/nonpress_0g{ @@ -18588,12 +17244,6 @@ icon_state = "silver" }, /area/almayer/living/cryo_cells) -"bxn" = ( -/obj/structure/target, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/living/cryo_cells) "bxo" = ( /obj/structure/machinery/cm_vending/sorted/tech/comp_storage, /obj/structure/machinery/light{ @@ -18625,18 +17275,6 @@ icon_state = "test_floor4" }, /area/almayer/hallways/starboard_hallway) -"bxB" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/obj/effect/landmark/start/marine/alpha, -/obj/effect/landmark/late_join/alpha, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/alpha) "bxD" = ( /obj/structure/machinery/status_display{ pixel_y = 30 @@ -18791,11 +17429,6 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"byn" = ( -/obj/effect/landmark/start/marine/leader/bravo, -/obj/effect/landmark/late_join/bravo, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/bravo) "byp" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -18979,6 +17612,13 @@ icon_state = "plate" }, /area/almayer/engineering/lower_engineering) +"bzm" = ( +/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer, +/area/almayer/squads/alpha) "bzo" = ( /obj/structure/machinery/power/apc/almayer, /turf/open/floor/almayer{ @@ -19050,17 +17690,6 @@ icon_state = "plate" }, /area/almayer/hallways/vehiclehangar) -"bzI" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/effect/landmark/ert_spawns/distress_cryo, -/obj/effect/landmark/late_join, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "silver" - }, -/area/almayer/living/cryo_cells) "bzK" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, @@ -19139,23 +17768,6 @@ icon_state = "plate" }, /area/almayer/hallways/starboard_hallway) -"bAa" = ( -/turf/open/floor/almayer{ - icon_state = "orangecorner" - }, -/area/almayer/hallways/starboard_hallway) -"bAd" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "redcorner" - }, -/area/almayer/squads/alpha) "bAe" = ( /turf/open/floor/almayer/uscm/directional{ dir = 1 @@ -19321,15 +17933,6 @@ icon_state = "silver" }, /area/almayer/living/cryo_cells) -"bAZ" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 8; - name = "ship-grade camera" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/auxiliary_officer_office) "bBa" = ( /turf/open/floor/almayer{ dir = 4; @@ -19509,32 +18112,6 @@ icon_state = "green" }, /area/almayer/hallways/aft_hallway) -"bBD" = ( -/obj/structure/machinery/firealarm{ - pixel_y = 28 - }, -/obj/structure/sign/safety/maint{ - pixel_x = -17 - }, -/obj/structure/surface/table/almayer, -/obj/structure/transmitter/rotary{ - name = "Telephone"; - phone_category = "Almayer"; - phone_id = "Auxiliary Support Office Second Line"; - pixel_x = -5; - pixel_y = 3 - }, -/obj/structure/transmitter/rotary{ - name = "Telephone"; - phone_category = "Almayer"; - phone_id = "Auxiliary Support Office"; - pixel_x = 8; - pixel_y = 8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/auxiliary_officer_office) "bBN" = ( /obj/structure/machinery/light, /turf/open/floor/plating/plating_catwalk, @@ -19719,13 +18296,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/port_hallway) -"bCG" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/turf/open/floor/almayer, -/area/almayer/living/cryo_cells) "bCH" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -19772,15 +18342,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) -"bCP" = ( -/obj/structure/bed/chair{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 6; - icon_state = "red" - }, -/area/almayer/squads/alpha) "bCQ" = ( /obj/structure/machinery/light/small, /turf/open/floor/almayer{ @@ -19794,14 +18355,6 @@ icon_state = "plating" }, /area/almayer/hull/lower_hull/l_a_p) -"bCS" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/turf/open/floor/almayer{ - icon_state = "red" - }, -/area/almayer/squads/alpha) "bCW" = ( /obj/structure/machinery/power/apc/almayer{ dir = 1 @@ -20011,25 +18564,12 @@ icon_state = "silver" }, /area/almayer/living/cryo_cells) -"bEb" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "silver" - }, -/area/almayer/living/cryo_cells) "bEc" = ( /obj/structure/machinery/computer/supplycomp, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/squads/req) -"bEd" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "redcorner" - }, -/area/almayer/living/cryo_cells) "bEg" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -20048,13 +18588,6 @@ icon_state = "green" }, /area/almayer/squads/req) -"bEi" = ( -/obj/structure/supply_drop/alpha, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/plating, -/area/almayer/squads/req) "bEj" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -20065,13 +18598,6 @@ /obj/structure/machinery/computer/supply_drop_console/limited, /turf/closed/wall/almayer, /area/almayer/squads/req) -"bEm" = ( -/obj/structure/supply_drop/delta, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/plating, -/area/almayer/squads/req) "bEn" = ( /obj/structure/stairs/perspective{ dir = 4; @@ -20329,12 +18855,6 @@ icon_state = "sterile_green" }, /area/almayer/medical/lockerroom) -"bES" = ( -/obj/structure/machinery/cm_vending/sorted/marine_food, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) "bET" = ( /obj/structure/machinery/cm_vending/sorted/medical, /turf/open/floor/almayer{ @@ -20432,17 +18952,6 @@ icon_state = "silverfull" }, /area/almayer/living/cryo_cells) -"bFr" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/auxiliary_officer_office) -"bFs" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "red" - }, -/area/almayer/living/cryo_cells) "bFt" = ( /obj/structure/machinery/power/apc/almayer{ dir = 4 @@ -20553,12 +19062,6 @@ icon_state = "cargo_arrow" }, /area/almayer/hallways/port_hallway) -"bGn" = ( -/obj/structure/barricade/plasteel/metal, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/living/cryo_cells) "bGo" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 4; @@ -20779,23 +19282,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull) -"bHp" = ( -/obj/structure/disposalpipe/trunk{ - dir = 2 - }, -/obj/structure/machinery/disposal, -/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 = "plate" - }, -/area/almayer/squads/bravo) "bHq" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -21120,22 +19606,6 @@ }, /turf/open/floor/carpet, /area/almayer/living/commandbunks) -"bIA" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 11 - }, -/obj/structure/mirror{ - pixel_x = 29 - }, -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/auxiliary_officer_office) "bII" = ( /obj/structure/sign/safety/distribution_pipes{ pixel_x = 8; @@ -21193,22 +19663,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/port_hallway) -"bIU" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_x = -1; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "orange" - }, -/area/almayer/squads/bravo) "bIX" = ( /obj/structure/machinery/light, /obj/structure/disposalpipe/segment{ @@ -21221,30 +19675,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/hallways/port_hallway) -"bJe" = ( -/obj/structure/surface/table/reinforced/black, -/obj/item/explosive/grenade/high_explosive/training, -/obj/item/explosive/grenade/high_explosive/training, -/obj/item/explosive/grenade/high_explosive/training, -/obj/structure/machinery/door_control{ - id = "Firing_Range_2"; - name = "range shutters"; - pixel_x = 9; - pixel_y = 10 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/cryo_cells) -"bJf" = ( -/obj/structure/window/framed/almayer/hull/hijack_bustable, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 4; - id = "Firing_Range_2"; - name = "range shutters" - }, -/turf/open/floor/plating, -/area/almayer/living/cryo_cells) "bJh" = ( /turf/closed/wall/almayer, /area/almayer/hallways/port_umbilical) @@ -21272,25 +19702,6 @@ icon_state = "orange" }, /area/almayer/engineering/lower_engineering) -"bJl" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - dir = 1; - name = "\improper Auxiliary Support Officers Quarters"; - req_one_access_txt = "37"; - access_modified = 1 - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 - }, -/obj/structure/machinery/door/poddoor/almayer/open{ - id = "Hangar Lockdown"; - name = "\improper Hangar Lockdown Blast Door" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/living/auxiliary_officer_office) "bJo" = ( /turf/closed/wall/almayer, /area/almayer/hallways/repair_bay) @@ -21315,34 +19726,12 @@ icon_state = "plate" }, /area/almayer/hallways/port_hallway) -"bJC" = ( -/turf/closed/wall/almayer, -/area/almayer/squads/charlie) -"bJD" = ( -/turf/open/floor/almayer, -/area/almayer/squads/charlie) -"bJE" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orangecorner" - }, -/area/almayer/squads/bravo) "bJF" = ( /obj/structure/pipes/vents/scrubber, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/engineering/engine_core) -"bJH" = ( -/obj/structure/surface/table/almayer, -/obj/item/facepaint/black{ - pixel_x = -4 - }, -/turf/open/floor/almayer, -/area/almayer/squads/bravo) "bJI" = ( /obj/structure/pipes/vents/pump/on, /turf/open/floor/almayer{ @@ -21599,11 +19988,6 @@ icon_state = "plate" }, /area/almayer/squads/req) -"bKC" = ( -/obj/structure/surface/table/almayer, -/obj/item/facepaint/green, -/turf/open/floor/almayer, -/area/almayer/squads/bravo) "bKD" = ( /obj/structure/machinery/cm_vending/sorted/cargo_guns/pilot_officer{ density = 0; @@ -21622,11 +20006,6 @@ icon_state = "orange" }, /area/almayer/hallways/starboard_hallway) -"bKM" = ( -/obj/effect/landmark/start/marine/medic/charlie, -/obj/effect/landmark/late_join/charlie, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/charlie) "bKO" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -21671,14 +20050,6 @@ /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/engine_core) -"bKX" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/box/masks, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "emerald" - }, -/area/almayer/squads/charlie) "bLb" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1 @@ -21857,23 +20228,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/vehiclehangar) -"bLv" = ( -/obj/structure/machinery/door_control{ - id = "ARES StairsLower"; - name = "ARES Core Lockdown"; - pixel_x = 24; - pixel_y = -8; - req_one_access_txt = "90;91;92" - }, -/obj/structure/machinery/camera/autoname/almayer/containment/ares{ - dir = 8; - pixel_y = 2 - }, -/turf/open/floor/almayer/no_build{ - dir = 4; - icon_state = "silver" - }, -/area/almayer/command/airoom) "bLw" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/light{ @@ -21994,63 +20348,65 @@ icon_state = "green" }, /area/almayer/squads/req) -"bMq" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie_delta_shared) -"bMt" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "emerald" - }, -/area/almayer/hallways/port_hallway) -"bMu" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad{ - req_access = null; - req_one_access = null; - req_one_access_txt = "17;18;21"; - vend_x_offset = 0; - vend_y_offset = 0 +"bMk" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 }, -/obj/structure/machinery/light{ - dir = 1 +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 }, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/structure/machinery/door_control{ + id = "ARES Interior"; + indestructible = 1; + name = "ARES Chamber Lockdown"; + pixel_x = 24; + pixel_y = -8; + req_one_access_txt = "90;91;92" }, -/area/almayer/squads/charlie_delta_shared) -"bMx" = ( -/obj/structure/machinery/light{ - dir = 8 +/obj/structure/machinery/door_control{ + id = "ARES Railing"; + indestructible = 1; + name = "ARES Chamber Railings"; + needs_power = 0; + pixel_x = 24; + req_one_access_txt = "91;92" }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "emerald" +/obj/structure/machinery/door/poddoor/railing{ + closed_layer = 4.1; + density = 0; + dir = 2; + id = "ARES Railing"; + layer = 2.1; + open_layer = 2.1; + pixel_x = -1; + pixel_y = -1; + unacidable = 0; + unslashable = 0 }, -/area/almayer/squads/charlie) -"bMy" = ( -/obj/structure/machinery/light{ - dir = 4 +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "emerald" +/area/almayer/command/airoom) +"bMm" = ( +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera" }, -/area/almayer/squads/charlie) -"bMA" = ( -/obj/structure/machinery/light{ - dir = 1 +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) +"bMo" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/airlock/multi_tile/almayer/almayer{ + dir = 1; + name = "\improper Auxiliary Combat Support Secondary Preparations"; + req_one_access = "19;27;22"; + welded = 1 }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "emerald" + icon_state = "test_floor4" }, -/area/almayer/squads/charlie) +/area/almayer/living/cryo_cells) "bMB" = ( /obj/structure/machinery/firealarm{ dir = 8; @@ -22060,22 +20416,6 @@ icon_state = "plate" }, /area/almayer/engineering/engine_core) -"bMC" = ( -/turf/open/floor/almayer{ - dir = 9; - icon_state = "emerald" - }, -/area/almayer/squads/charlie) -"bMD" = ( -/obj/structure/machinery/vending/cigarette{ - density = 0; - pixel_y = 16 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "emerald" - }, -/area/almayer/squads/charlie) "bMF" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_full" @@ -22245,15 +20585,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/navigation) -"bNh" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "orange" - }, -/area/almayer/living/port_emb) "bNi" = ( /obj/structure/surface/table/almayer, /obj/item/paper, @@ -22379,40 +20710,10 @@ icon_state = "plate" }, /area/almayer/squads/req) -"bNC" = ( -/obj/structure/machinery/cm_vending/sorted/marine_food{ - density = 0; - pixel_y = 16 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/delta) "bND" = ( /obj/structure/bed/chair, /turf/open/floor/almayer, /area/almayer/shipboard/brig/perma) -"bNE" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 26 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "cargo_arrow" - }, -/area/almayer/squads/charlie_delta_shared) -"bNF" = ( -/turf/open/floor/almayer{ - icon_state = "emeraldcorner" - }, -/area/almayer/squads/charlie) -"bNG" = ( -/obj/structure/machinery/cm_vending/clothing/tl/charlie{ - density = 0; - pixel_x = 32 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/charlie) "bNL" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -22455,15 +20756,6 @@ icon_state = "red" }, /area/almayer/shipboard/navigation) -"bNT" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/lower_hull/l_a_s) "bNW" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -22591,18 +20883,16 @@ icon_state = "redcorner" }, /area/almayer/shipboard/weapon_room) -"bOv" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "emeraldcorner" +"bOu" = ( +/obj/structure/bed/chair/comfy{ + dir = 8 }, -/area/almayer/hallways/port_hallway) -"bOx" = ( -/obj/structure/machinery/door/airlock/almayer/marine/charlie/tl, +/obj/structure/pipes/vents/scrubber, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 5; + icon_state = "plating" }, -/area/almayer/squads/charlie) +/area/almayer/living/captain_mess) "bOC" = ( /obj/structure/sign/safety/maint{ pixel_x = 8; @@ -22612,19 +20902,6 @@ icon_state = "orange" }, /area/almayer/hallways/hangar) -"bOG" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/surface/table/almayer, -/obj/item/trash/USCMtray{ - pixel_y = 7 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/bravo) "bOJ" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ dir = 1; @@ -22690,14 +20967,6 @@ icon_state = "red" }, /area/almayer/shipboard/weapon_room) -"bOQ" = ( -/obj/structure/surface/table/almayer, -/obj/item/reagent_container/food/condiment/hotsauce/sriracha{ - pixel_x = 7; - pixel_y = 7 - }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie) "bOR" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -22724,29 +20993,6 @@ icon_state = "plating" }, /area/almayer/shipboard/sea_office) -"bOX" = ( -/turf/open/floor/almayer{ - icon_state = "emeraldcorner" - }, -/area/almayer/hallways/port_hallway) -"bOZ" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "emeraldcorner" - }, -/area/almayer/squads/charlie) -"bPa" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "emeraldcorner" - }, -/area/almayer/squads/charlie) "bPd" = ( /obj/structure/machinery/power/fusion_engine{ name = "\improper S-52 fusion reactor 3" @@ -22911,25 +21157,6 @@ icon_state = "plate" }, /area/almayer/shipboard/weapon_room) -"bPL" = ( -/obj/structure/machinery/firealarm{ - dir = 8; - pixel_x = -24 - }, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 4; - name = "ship-grade camera" - }, -/obj/effect/landmark/ert_spawns/distress_cryo, -/obj/effect/landmark/late_join, -/turf/open/floor/almayer, -/area/almayer/living/cryo_cells) -"bPM" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "silvercorner" - }, -/area/almayer/living/cryo_cells) "bPO" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -23055,29 +21282,6 @@ icon_state = "red" }, /area/almayer/shipboard/weapon_room) -"bQA" = ( -/obj/structure/pipes/vents/pump{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "emerald" - }, -/area/almayer/squads/charlie) -"bQD" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/charlie{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/charlie) "bQE" = ( /obj/structure/surface/rack, /obj/structure/ob_ammo/ob_fuel, @@ -23152,48 +21356,12 @@ /obj/item/tool/pen, /turf/open/floor/wood/ship, /area/almayer/shipboard/sea_office) -"bQZ" = ( -/obj/structure/sign/nosmoking_1, -/turf/closed/wall/almayer, -/area/almayer/squads/charlie) -"bRa" = ( -/turf/open/floor/almayer{ - icon_state = "silvercorner" - }, -/area/almayer/living/cryo_cells) -"bRc" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/cryo_cells) "bRe" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 }, /turf/open/floor/wood/ship, /area/almayer/shipboard/sea_office) -"bRf" = ( -/obj/structure/surface/table/almayer, -/obj/item/reagent_container/food/condiment/hotsauce/sriracha{ - pixel_x = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) -"bRg" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/surface/table/almayer, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) "bRi" = ( /obj/effect/decal/warning_stripes{ icon_state = "E" @@ -23382,29 +21550,6 @@ icon_state = "test_floor4" }, /area/almayer/hallways/vehiclehangar) -"bRV" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "orange" - }, -/area/almayer/squads/bravo) -"bSa" = ( -/obj/structure/target, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "plating_striped" - }, -/area/almayer/living/cryo_cells) "bSb" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -23421,12 +21566,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/port_hallway) -"bSe" = ( -/turf/open/floor/almayer{ - dir = 6; - icon_state = "orange" - }, -/area/almayer/squads/bravo) "bSf" = ( /turf/closed/wall/almayer, /area/almayer/shipboard/port_point_defense) @@ -23474,17 +21613,6 @@ icon_state = "orangefull" }, /area/almayer/engineering/engineering_workshop) -"bSn" = ( -/obj/structure/machinery/cm_vending/gear/tl{ - density = 0; - pixel_x = -32; - vend_x_offset = 1 - }, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "orange" - }, -/area/almayer/squads/bravo) "bSt" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -23538,15 +21666,6 @@ "bSJ" = ( /turf/closed/wall/almayer, /area/almayer/squads/delta) -"bSK" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/toolbox/mechanical{ - pixel_x = 1; - pixel_y = 7 - }, -/obj/item/tool/wrench, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) "bSL" = ( /obj/structure/sign/nosmoking_1, /turf/closed/wall/almayer, @@ -23579,43 +21698,6 @@ icon_state = "mono" }, /area/almayer/medical/hydroponics) -"bSY" = ( -/obj/structure/disposalpipe/junction{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) -"bSZ" = ( -/obj/structure/machinery/vending/coffee{ - density = 0; - pixel_y = 16 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/delta) -"bTa" = ( -/obj/structure/machinery/vending/cola{ - density = 0; - pixel_y = 16 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/delta) -"bTb" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/window/framed/almayer, -/obj/structure/curtain/open/shower{ - name = "cryo curtain" - }, -/turf/open/floor/plating, -/area/almayer/squads/bravo) "bTg" = ( /obj/docking_port/stationary/emergency_response/external/hangar_port{ dwidth = 8 @@ -23714,21 +21796,6 @@ "bTA" = ( /turf/open/floor/almayer, /area/almayer/squads/delta) -"bTC" = ( -/obj/structure/pipes/vents/scrubber{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "blue" - }, -/area/almayer/squads/delta) -"bTE" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "bluecorner" - }, -/area/almayer/squads/delta) "bTG" = ( /obj/structure/surface/table/almayer, /obj/effect/spawner/random/toolbox, @@ -23747,34 +21814,6 @@ /obj/structure/largecrate/random/case/double, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_m_s) -"bTJ" = ( -/obj/structure/machinery/vending/cigarette{ - density = 0; - pixel_y = 16 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "blue" - }, -/area/almayer/squads/delta) -"bTM" = ( -/obj/structure/reagent_dispensers/water_cooler/stacks{ - density = 0; - pixel_y = 16 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "blue" - }, -/area/almayer/squads/delta) -"bTN" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/delta) "bTO" = ( /turf/open/floor/almayer, /area/almayer/shipboard/port_point_defense) @@ -23784,14 +21823,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_s) -"bTR" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/auxiliary_officer_office) "bTS" = ( /turf/open/floor/almayer{ icon_state = "plate" @@ -23801,17 +21832,6 @@ /obj/structure/window/framed/almayer/hull, /turf/open/floor/plating, /area/almayer/shipboard/weapon_room) -"bTU" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/toolbox/mechanical, -/obj/item/dogtag{ - desc = "A blank marine's information dog tag. The word ranger and a pawprint is scratched into it." - }, -/obj/item/device/megaphone, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/auxiliary_officer_office) "bTV" = ( /obj/item/bedsheet/brown{ pixel_y = 13 @@ -23848,27 +21868,10 @@ icon_state = "silver" }, /area/almayer/command/computerlab) -"bUb" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 4 - }, -/obj/structure/bed/chair/comfy/bravo{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "orangefull" - }, -/area/almayer/living/briefing) "bUc" = ( /obj/structure/foamed_metal, /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_m_s) -"bUd" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "bluecorner" - }, -/area/almayer/hallways/port_hallway) "bUe" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -23885,24 +21888,6 @@ icon_state = "plate" }, /area/almayer/hallways/port_hallway) -"bUf" = ( -/obj/structure/machinery/light, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "bluecorner" - }, -/area/almayer/squads/delta) -"bUi" = ( -/obj/structure/sign/poster{ - pixel_x = 32 - }, -/turf/open/floor/almayer{ - icon_state = "blue" - }, -/area/almayer/squads/charlie_delta_shared) "bUo" = ( /obj/structure/closet/secure_closet/guncabinet/red, /obj/item/weapon/gun/shotgun/combat, @@ -23922,49 +21907,6 @@ icon_state = "redfull" }, /area/almayer/squads/req) -"bUp" = ( -/obj/structure/surface/table/almayer, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/item/reagent_container/food/condiment/hotsauce/franks{ - pixel_x = 2; - pixel_y = 10 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/delta) -"bUq" = ( -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/squads/delta) -"bUr" = ( -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "blue" - }, -/area/almayer/squads/delta) "bUx" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -24002,11 +21944,6 @@ icon_state = "red" }, /area/almayer/hallways/aft_hallway) -"bUF" = ( -/turf/open/floor/almayer{ - icon_state = "bluecorner" - }, -/area/almayer/hallways/port_hallway) "bUG" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ @@ -24038,20 +21975,6 @@ icon_state = "plating" }, /area/almayer/engineering/engine_core) -"bUM" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "blue" - }, -/area/almayer/hallways/port_hallway) -"bUN" = ( -/obj/structure/surface/table/almayer, -/obj/item/trash/USCMtray{ - pixel_x = 6; - pixel_y = 7 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/delta) "bUO" = ( /obj/structure/machinery/portable_atmospherics/canister/air, /turf/open/floor/almayer{ @@ -24068,27 +21991,6 @@ icon_state = "test_floor4" }, /area/almayer/hull/lower_hull/l_m_s) -"bUR" = ( -/obj/structure/machinery/door_control{ - id = "laddersoutheast"; - name = "South East Ladders Shutters"; - pixel_x = 25; - req_one_access_txt = "2;3;12;19"; - throw_range = 15 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "blue" - }, -/area/almayer/hallways/port_hallway) -"bUT" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 26 - }, -/turf/open/floor/almayer{ - icon_state = "cargo_arrow" - }, -/area/almayer/squads/charlie_delta_shared) "bUU" = ( /obj/structure/machinery/cm_vending/clothing/tl/delta{ density = 0; @@ -24160,30 +22062,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_p) -"bVn" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "blue" - }, -/area/almayer/squads/delta) -"bVo" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "blue" - }, -/area/almayer/squads/delta) -"bVq" = ( -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - icon_state = "blue" - }, -/area/almayer/squads/delta) "bVt" = ( /obj/structure/machinery/door_control{ id = "laddersoutheast"; @@ -24202,13 +22080,6 @@ icon_state = "bluecorner" }, /area/almayer/living/briefing) -"bVy" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/box/masks, -/turf/open/floor/almayer{ - icon_state = "blue" - }, -/area/almayer/squads/delta) "bVB" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -24435,14 +22306,6 @@ icon_state = "red" }, /area/almayer/hallways/aft_hallway) -"bWJ" = ( -/obj/structure/machinery/shower{ - dir = 4 - }, -/obj/structure/machinery/door/window/eastright, -/obj/structure/window/reinforced/tinted/frosted, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/auxiliary_officer_office) "bWK" = ( /obj/structure/bed/chair{ dir = 1 @@ -24650,6 +22513,10 @@ icon_state = "plate" }, /area/almayer/squads/req) +"bXO" = ( +/obj/effect/landmark/start/tank_crew, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/tankerbunks) "bXP" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/disposalpipe/segment{ @@ -25115,12 +22982,6 @@ icon_state = "orange" }, /area/almayer/hull/upper_hull/u_f_p) -"bZJ" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/effect/landmark/map_item, -/obj/item/device/binoculars, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/command/cic) "bZK" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -25164,19 +23025,6 @@ icon_state = "plate" }, /area/almayer/command/lifeboat) -"bZU" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/shared/charlie_delta/blue, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/delta) "cab" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -25255,22 +23103,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/vehiclehangar) -"cau" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/machinery/door/airlock/almayer/security/glass{ - dir = 2; - name = "Firing Range"; - req_access = null; - req_one_access_txt = "2;4;7;9;21"; - access_modified = 1 - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/living/cryo_cells) "cav" = ( /obj/structure/machinery/light{ dir = 4 @@ -25668,13 +23500,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_a_s) -"ccb" = ( -/obj/structure/surface/table/reinforced/black, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/living/cryo_cells) "ccc" = ( /obj/structure/sign/safety/bathunisex{ pixel_x = 8; @@ -25686,13 +23511,6 @@ }, /turf/open/floor/almayer, /area/almayer/living/pilotbunks) -"ccd" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "red" - }, -/area/almayer/living/cryo_cells) "cce" = ( /obj/structure/machinery/door/airlock/almayer/engineering{ dir = 2; @@ -25888,12 +23706,6 @@ icon_state = "silvercorner" }, /area/almayer/hallways/repair_bay) -"ccN" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "redcorner" - }, -/area/almayer/living/cryo_cells) "ccO" = ( /obj/structure/machinery/light, /obj/structure/disposalpipe/segment{ @@ -25999,12 +23811,6 @@ icon_state = "test_floor4" }, /area/almayer/hallways/port_umbilical) -"cdf" = ( -/obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera" - }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie) "cdk" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -26014,14 +23820,6 @@ icon_state = "redcorner" }, /area/almayer/shipboard/brig/main_office) -"cdm" = ( -/obj/effect/landmark/ert_spawns/distress_cryo, -/obj/effect/landmark/late_join, -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/cryo_cells) "cdn" = ( /obj/effect/landmark/ert_spawns/distress_cryo, /obj/effect/landmark/late_join, @@ -26038,16 +23836,6 @@ icon_state = "silver" }, /area/almayer/living/cryo_cells) -"cdp" = ( -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 4; - id = "Firing_Range_2"; - name = "range shutters" - }, -/turf/open/floor/plating, -/area/almayer/living/cryo_cells) "cdr" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -26128,47 +23916,6 @@ }, /turf/open/floor/almayer, /area/almayer/living/grunt_rnr) -"cdP" = ( -/obj/structure/machinery/cm_vending/clothing/marine/charlie{ - density = 0; - layer = 4.1; - pixel_y = -29 - }, -/turf/open/floor/almayer{ - icon_state = "cargo_arrow" - }, -/area/almayer/squads/charlie) -"cdT" = ( -/obj/structure/machinery/cm_vending/clothing/smartgun/charlie, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) -"cdU" = ( -/obj/structure/machinery/cm_vending/gear/smartgun, -/obj/structure/sign/safety/ammunition{ - pixel_x = 15; - pixel_y = 32 - }, -/obj/structure/sign/safety/hazard{ - pixel_y = 32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) -"cdV" = ( -/obj/structure/machinery/cm_vending/gear/medic, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) -"cdX" = ( -/obj/structure/machinery/cm_vending/gear/engi, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) "cdZ" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -26186,15 +23933,12 @@ /obj/effect/spawner/random/tool, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_a_p) -"ceg" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, +"cem" = ( +/obj/structure/machinery/cm_vending/clothing/engi/delta, /turf/open/floor/almayer{ - dir = 8; - icon_state = "cargo_arrow" + icon_state = "plate" }, -/area/almayer/squads/alpha) +/area/almayer/hallways/port_hallway) "ceo" = ( /obj/structure/machinery/status_display{ pixel_y = 30 @@ -26314,34 +24058,6 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) -"cfo" = ( -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/charlie) -"cfp" = ( -/obj/structure/machinery/cm_vending/gear/spec, -/obj/structure/sign/safety/ammunition{ - pixel_x = 15; - pixel_y = 32 - }, -/obj/structure/sign/safety/hazard{ - pixel_y = 32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) -"cfq" = ( -/obj/structure/machinery/cm_vending/gear/leader, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) -"cft" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/charlie) "cfx" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/light{ @@ -26413,70 +24129,6 @@ 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{ - dir = 2 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/charlie_delta_shared) -"cgo" = ( -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/charlie_delta_shared) -"cgq" = ( -/obj/structure/machinery/door/airlock/almayer/marine/charlie/smart, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/charlie) -"cgr" = ( -/obj/structure/machinery/cm_vending/clothing/medic/charlie, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) -"cgs" = ( -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) -"cgt" = ( -/obj/structure/machinery/cm_vending/clothing/engi/charlie, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) -"cgu" = ( -/obj/structure/machinery/cm_vending/clothing/specialist/charlie, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) -"cgv" = ( -/obj/structure/machinery/cm_vending/clothing/leader/charlie, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) -"cgy" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie) -"cgA" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) "cgE" = ( /turf/open/floor/almayer, /area/almayer/living/cryo_cells) @@ -26530,53 +24182,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cic_hallway) -"chf" = ( -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "cargo_arrow" - }, -/area/almayer/squads/charlie_delta_shared) -"chk" = ( -/obj/structure/machinery/door/airlock/almayer/marine/charlie/medic, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/charlie) -"chl" = ( -/obj/structure/machinery/door/airlock/almayer/marine/charlie/engineer, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/charlie) -"chm" = ( -/obj/structure/machinery/door/airlock/almayer/marine/charlie/spec, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/charlie) -"chn" = ( -/obj/structure/machinery/door/airlock/almayer/marine/charlie/sl, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/charlie) -"chp" = ( -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 - }, -/turf/open/floor/almayer, -/area/almayer/squads/bravo) -"chq" = ( -/obj/structure/surface/table/almayer, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) "chu" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ @@ -26600,128 +24205,6 @@ icon_state = "test_floor4" }, /area/almayer/hallways/port_hallway) -"chL" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "orangecorner" - }, -/area/almayer/squads/bravo) -"chM" = ( -/obj/structure/disposalpipe/junction{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/charlie) -"chN" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "emeraldcorner" - }, -/area/almayer/squads/charlie) -"chO" = ( -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = 28 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "emerald" - }, -/area/almayer/squads/charlie) -"chP" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/camera/autoname/almayer, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "emerald" - }, -/area/almayer/squads/charlie) -"chQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "emeraldcorner" - }, -/area/almayer/squads/charlie) -"chR" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/charlie) -"chS" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "emerald" - }, -/area/almayer/squads/charlie) -"chV" = ( -/obj/structure/machinery/alarm/almayer{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "emeraldcorner" - }, -/area/almayer/squads/charlie) -"chW" = ( -/obj/structure/pipes/vents/scrubber{ - dir = 4 - }, -/obj/structure/machinery/status_display{ - pixel_y = 30 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "emerald" - }, -/area/almayer/squads/charlie) -"cib" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/charlie) -"cic" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "cargo_arrow" - }, -/area/almayer/squads/alpha) "cil" = ( /obj/structure/machinery/light, /obj/structure/sign/safety/waterhazard{ @@ -26848,54 +24331,11 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/port_hallway) -"ciU" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 8; - name = "ship-grade camera" - }, -/obj/structure/sign/safety/four{ - pixel_x = 31; - pixel_y = -8 - }, -/obj/structure/sign/safety/ammunition{ - pixel_x = 32; - pixel_y = 7 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "blue" - }, -/area/almayer/hallways/port_hallway) "cjc" = ( /obj/effect/landmark/start/marine/alpha, /obj/effect/landmark/late_join/alpha, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/alpha) -"cjd" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer{ - icon_state = "emerald" - }, -/area/almayer/squads/charlie) -"cjf" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "emerald" - }, -/area/almayer/squads/charlie) -"cjg" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer{ - icon_state = "emerald" - }, -/area/almayer/squads/charlie) "cjh" = ( /obj/structure/machinery/vending/snack, /turf/open/floor/almayer, @@ -26954,45 +24394,6 @@ icon_state = "red" }, /area/almayer/hallways/port_hallway) -"cjA" = ( -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) -"cjC" = ( -/obj/structure/machinery/vending/cola{ - density = 0; - pixel_y = 16 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) -"cjE" = ( -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 1 - }, -/obj/structure/disposalpipe/junction{ - dir = 1; - icon_state = "pipe-j2" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "emerald" - }, -/area/almayer/squads/charlie) "cjK" = ( /obj/structure/machinery/door/airlock/almayer/maint, /obj/structure/disposalpipe/segment{ @@ -27093,13 +24494,6 @@ icon_state = "red" }, /area/almayer/hallways/port_hallway) -"ckr" = ( -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/delta) "ckB" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1; @@ -27145,22 +24539,6 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) -"ckQ" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "blue" - }, -/area/almayer/squads/delta) -"ckR" = ( -/obj/structure/machinery/cm_vending/clothing/marine/delta{ - density = 0; - pixel_y = 16 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/delta) "ckS" = ( /obj/structure/machinery/door/poddoor/shutters/almayer/open{ id = "Interrogation Shutters"; @@ -27215,120 +24593,6 @@ "clg" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/delta) -"clh" = ( -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/delta) -"cli" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "bluecorner" - }, -/area/almayer/squads/delta) -"clj" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "blue" - }, -/area/almayer/squads/delta) -"clk" = ( -/obj/structure/pipes/vents/pump{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = -29 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "bluecorner" - }, -/area/almayer/squads/delta) -"cll" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/delta) -"clm" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "bluecorner" - }, -/area/almayer/squads/delta) -"cln" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/alarm/almayer{ - dir = 1; - pixel_y = -29 - }, -/turf/open/floor/almayer{ - icon_state = "blue" - }, -/area/almayer/squads/delta) -"clo" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "bluecorner" - }, -/area/almayer/squads/delta) -"clp" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/delta{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/delta) -"clr" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "blue" - }, -/area/almayer/squads/delta) "cls" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/port_point_defense) @@ -27406,18 +24670,6 @@ icon_state = "test_floor4" }, /area/almayer/squads/delta) -"clI" = ( -/obj/structure/machinery/door/airlock/almayer/marine/delta/smart, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/delta) -"clJ" = ( -/obj/structure/machinery/cm_vending/clothing/medic/delta, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/delta) "clK" = ( /turf/open/floor/almayer{ icon_state = "plate" @@ -27429,18 +24681,6 @@ icon_state = "plate" }, /area/almayer/squads/delta) -"clM" = ( -/obj/structure/machinery/cm_vending/clothing/specialist/delta, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/delta) -"clN" = ( -/obj/structure/machinery/cm_vending/clothing/leader/delta, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/delta) "clO" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -27476,25 +24716,6 @@ icon_state = "test_floor4" }, /area/almayer/hallways/port_hallway) -"clS" = ( -/obj/structure/machinery/cm_vending/gear/spec, -/obj/structure/sign/safety/hazard{ - pixel_x = 15; - pixel_y = -32 - }, -/obj/structure/sign/safety/ammunition{ - pixel_y = -32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/delta) -"clT" = ( -/obj/structure/machinery/cm_vending/gear/leader, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/delta) "clV" = ( /obj/structure/machinery/computer/arcade, /obj/structure/disposalpipe/segment, @@ -27503,31 +24724,6 @@ icon_state = "green" }, /area/almayer/squads/req) -"clW" = ( -/obj/structure/machinery/cm_vending/clothing/smartgun/delta, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/delta) -"clX" = ( -/obj/structure/machinery/cm_vending/gear/smartgun, -/obj/structure/sign/safety/hazard{ - pixel_x = 15; - pixel_y = -32 - }, -/obj/structure/sign/safety/ammunition{ - pixel_y = -32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/delta) -"clY" = ( -/obj/structure/machinery/cm_vending/gear/medic, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/delta) "clZ" = ( /obj/structure/machinery/cm_vending/gear/engi, /turf/open/floor/almayer{ @@ -27632,6 +24828,22 @@ /obj/effect/landmark/yautja_teleport, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_s) +"cmw" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 2 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "cmC" = ( /obj/structure/machinery/door/airlock/almayer/secure/reinforced{ dir = 2; @@ -27805,35 +25017,6 @@ icon_state = "test_floor4" }, /area/almayer/command/computerlab) -"cnM" = ( -/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/yellow{ - layer = 3.2 - }, -/obj/item/bedsheet/yellow{ - pixel_y = 13 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/port_emb) "cnR" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -27936,23 +25119,6 @@ icon_state = "cargo" }, /area/almayer/command/cic) -"cog" = ( -/obj/structure/surface/table/almayer, -/obj/item/tool/hand_labeler, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "emerald" - }, -/area/almayer/squads/charlie) -"coj" = ( -/obj/structure/machinery/power/apc/almayer, -/obj/structure/surface/table/almayer, -/obj/item/tool/hand_labeler, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "blue" - }, -/area/almayer/squads/delta) "cop" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/living/tankerbunks) @@ -27966,14 +25132,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_f_s) -"coB" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha_bravo_shared) "coG" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/almayer{ @@ -28041,6 +25199,22 @@ }, /turf/open/floor/almayer, /area/almayer/living/offices) +"cpu" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/light, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) "cpw" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ @@ -28099,11 +25273,6 @@ }, /turf/open/floor/plating, /area/almayer/shipboard/brig/armory) -"cqz" = ( -/obj/structure/surface/table/almayer, -/obj/item/facepaint/black, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/delta) "cqJ" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -28178,6 +25347,11 @@ icon_state = "plate" }, /area/almayer/hallways/starboard_hallway) +"csj" = ( +/obj/structure/surface/table/almayer, +/obj/item/facepaint/green, +/turf/open/floor/almayer, +/area/almayer/squads/delta) "csl" = ( /obj/structure/pipes/vents/scrubber, /turf/open/floor/almayer{ @@ -28209,31 +25383,15 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) -"csZ" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_x = -1; - pixel_y = 1 +"csQ" = ( +/obj/structure/sign/poster{ + pixel_x = -32 }, /turf/open/floor/almayer{ - dir = 8; - icon_state = "cargo_arrow" + dir = 10; + icon_state = "red" }, -/area/almayer/squads/bravo) +/area/almayer/squads/alpha) "ctn" = ( /turf/open/floor/almayer{ icon_state = "redcorner" @@ -28281,6 +25439,18 @@ icon_state = "orange" }, /area/almayer/hallways/stern_hallway) +"ctG" = ( +/obj/structure/machinery/light{ + dir = 8; + invisibility = 101; + unacidable = 1; + unslashable = 1 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "plating_striped" + }, +/area/almayer/hallways/port_hallway) "cuk" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -28292,6 +25462,18 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/cryo) +"cuq" = ( +/obj/structure/machinery/cm_vending/sorted/marine_food{ + density = 0; + pixel_y = 16 + }, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "cus" = ( /obj/docking_port/stationary/lifeboat_dock/starboard, /turf/open/floor/almayer_hull{ @@ -28313,14 +25495,16 @@ "cuC" = ( /turf/closed/wall/almayer/outer, /area/almayer/engineering/upper_engineering/starboard) -"cuY" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +"cuM" = ( +/obj/structure/machinery/cm_vending/clothing/tl/delta{ + density = 0; + pixel_x = 32 }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 1; + icon_state = "blue" }, -/area/almayer/squads/alpha) +/area/almayer/squads/delta) "cvb" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -28376,6 +25560,21 @@ icon_state = "blue" }, /area/almayer/hallways/aft_hallway) +"cwM" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper Cryogenics Bay" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/port_hallway) "cwS" = ( /obj/structure/blocker/invisible_wall, /turf/open/floor/almayer/no_build{ @@ -28408,6 +25607,38 @@ /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/lower_engineering) +"cxf" = ( +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = 28 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blue" + }, +/area/almayer/squads/delta) +"cxi" = ( +/obj/structure/surface/table/almayer, +/obj/item/roller, +/obj/item/roller, +/obj/item/roller, +/obj/item/roller, +/obj/item/roller, +/obj/structure/machinery/light{ + dir = 4; + invisibility = 101 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha) "cxk" = ( /obj/structure/machinery/light, /turf/open/floor/almayer, @@ -28423,6 +25654,14 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/main_office) +"cxS" = ( +/obj/structure/surface/table/almayer, +/obj/item/reagent_container/food/condiment/hotsauce/sriracha{ + pixel_x = 7; + pixel_y = 7 + }, +/turf/open/floor/almayer, +/area/almayer/squads/delta) "cyo" = ( /obj/structure/machinery/vending/cigarette, /turf/open/floor/almayer{ @@ -28430,6 +25669,15 @@ icon_state = "green" }, /area/almayer/squads/req) +"cyt" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/disposalpipe/junction{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/starboard_hallway) "cyE" = ( /obj/structure/platform_decoration{ dir = 8 @@ -28459,6 +25707,19 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cells) +"czk" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper Pilot's Office"; + req_one_access_txt = "3;22;19"; + access_modified = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/offices/flight) "czu" = ( /turf/closed/wall/almayer/outer, /area/almayer/hull/upper_hull/u_m_p) @@ -28514,6 +25775,14 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_a_p) +"cAL" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/box/masks, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) "cBb" = ( /obj/structure/machinery/light{ dir = 1 @@ -28582,16 +25851,6 @@ icon_state = "silver" }, /area/almayer/command/airoom) -"cBs" = ( -/obj/structure/bed/chair, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "cargo_arrow" - }, -/area/almayer/squads/alpha) "cBA" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -28694,15 +25953,6 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) -"cDs" = ( -/obj/structure/machinery/cryopod, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/squads/charlie) "cDC" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -28721,13 +25971,6 @@ icon_state = "red" }, /area/almayer/hull/upper_hull/u_a_p) -"cDZ" = ( -/obj/structure/surface/table/almayer, -/obj/item/paper, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/tankerbunks) "cEg" = ( /obj/structure/surface/table/almayer, /obj/item/device/flashlight/lamp{ @@ -28758,37 +26001,27 @@ icon_state = "plating" }, /area/almayer/command/cic) -"cEx" = ( -/obj/structure/machinery/vending/cola, +"cEp" = ( /obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" + dir = 1 }, -/area/almayer/engineering/engineering_workshop) -"cEC" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/machinery/light, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" +/turf/open/floor/almayer{ + dir = 1; + icon_state = "bluecorner" }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1; - pixel_y = 2 +/area/almayer/squads/delta) +"cEx" = ( +/obj/structure/machinery/vending/cola, +/obj/structure/machinery/light{ + dir = 8 }, /turf/open/floor/almayer{ - dir = 8; - icon_state = "cargo_arrow" + icon_state = "plate" }, -/area/almayer/squads/charlie) +/area/almayer/engineering/engineering_workshop) "cEO" = ( /obj/structure/largecrate/supply/floodlights, /turf/open/floor/almayer{ @@ -28861,11 +26094,6 @@ icon_state = "plate" }, /area/almayer/hallways/aft_hallway) -"cGV" = ( -/turf/open/floor/almayer{ - icon_state = "cargo_arrow" - }, -/area/almayer/squads/alpha_bravo_shared) "cHc" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/sign/safety/ladder{ @@ -28876,18 +26104,6 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering) -"cHl" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) "cHq" = ( /obj/item/stack/sheet/metal, /turf/open/floor/plating/plating_catwalk, @@ -28895,15 +26111,6 @@ "cHu" = ( /turf/closed/wall/almayer/research/containment/wall/south, /area/almayer/medical/containment/cell/cl) -"cHE" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "blue" - }, -/area/almayer/command/cichallway) "cHO" = ( /obj/structure/sign/safety/nonpress_0g{ pixel_x = 32 @@ -28932,12 +26139,33 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_f_s) +"cIn" = ( +/obj/structure/pipes/vents/pump{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/living/tankerbunks) "cIr" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/delta) +"cIy" = ( +/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 = "plate" + }, +/area/almayer/hallways/port_hallway) "cIG" = ( /obj/structure/closet/emcloset, /obj/item/clothing/mask/gas, @@ -29121,10 +26349,6 @@ icon_state = "cargo" }, /area/almayer/medical/lower_medical_medbay) -"cLC" = ( -/obj/structure/bed/chair, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) "cLN" = ( /obj/structure/machinery/cryopod{ layer = 3.1; @@ -29152,14 +26376,6 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/starboard) -"cMV" = ( -/obj/structure/sign/prop1{ - pixel_x = -32; - pixel_y = 2 - }, -/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) "cMW" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -29185,11 +26401,6 @@ }, /turf/open/floor/almayer, /area/almayer/hull/upper_hull/u_f_p) -"cNf" = ( -/turf/open/floor/almayer{ - icon_state = "orange" - }, -/area/almayer/living/briefing) "cNH" = ( /obj/structure/machinery/door/poddoor/shutters/almayer/containment{ id = "Containment Cell 4"; @@ -29205,6 +26416,14 @@ icon_state = "test_floor4" }, /area/almayer/medical/containment/cell/cl) +"cNT" = ( +/obj/structure/machinery/door/airlock/almayer/marine{ + dir = 2 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/living/cryo_cells) "cNX" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -29247,6 +26466,17 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/starboard_hallway) +"cOY" = ( +/obj/structure/sign/safety/maint{ + pixel_x = -17 + }, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/lower_hull) "cPg" = ( /obj/structure/sign/safety/north{ pixel_x = 32; @@ -29261,6 +26491,19 @@ icon_state = "silver" }, /area/almayer/command/cichallway) +"cPB" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/squads/alpha) +"cPG" = ( +/obj/structure/surface/rack, +/obj/effect/spawner/random/gun/shotgun/midchance, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/squads/req) "cQc" = ( /turf/open/floor/almayer{ dir = 1; @@ -29268,15 +26511,19 @@ }, /area/almayer/living/briefing) "cQg" = ( -/obj/structure/surface/rack, -/obj/effect/decal/warning_stripes{ - icon_state = "W" +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, +/turf/open/floor/almayer, +/area/almayer/engineering/upper_engineering/port) +"cQj" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper Tanker's Room" }, -/obj/item/clothing/ears/earmuffs, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "test_floor4" }, -/area/almayer/engineering/upper_engineering/starboard) +/area/almayer/living/tankerbunks) "cQo" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -29307,6 +26554,10 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_p) +"cQQ" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, +/turf/open/floor/wood/ship, +/area/almayer/living/auxiliary_officer_office) "cRb" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -29391,15 +26642,6 @@ icon_state = "orange" }, /area/almayer/engineering/engineering_workshop/hangar) -"cSQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/manifold/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "orange" - }, -/area/almayer/squads/bravo) "cST" = ( /obj/structure/bookcase{ icon_state = "book-5" @@ -29417,6 +26659,22 @@ icon_state = "cargo" }, /area/almayer/squads/req) +"cTq" = ( +/obj/structure/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, +/obj/structure/machinery/camera/autoname/almayer{ + dir = 4; + name = "ship-grade camera" + }, +/obj/effect/landmark/ert_spawns/distress_cryo, +/obj/effect/landmark/late_join, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/cryo_cells) +"cTB" = ( +/turf/open/floor/wood/ship, +/area/almayer/living/auxiliary_officer_office) "cTC" = ( /obj/structure/machinery/vending/walkman, /turf/open/floor/almayer{ @@ -29424,6 +26682,12 @@ icon_state = "green" }, /area/almayer/living/offices) +"cTS" = ( +/turf/open/floor/almayer{ + dir = 8; + icon_state = "bluecorner" + }, +/area/almayer/squads/delta) "cUb" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 1; @@ -29447,6 +26711,15 @@ icon_state = "test_floor4" }, /area/almayer/hull/upper_hull/u_f_p) +"cVo" = ( +/obj/structure/machinery/vending/cola{ + density = 0; + pixel_y = 16 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "cVs" = ( /obj/structure/platform_decoration{ dir = 8 @@ -29456,14 +26729,22 @@ }, /area/almayer/hull/upper_hull/u_a_p) "cVw" = ( -/obj/structure/machinery/light/small{ - dir = 4 +/obj/structure/surface/rack, +/obj/item/cell/high/empty, +/obj/item/cell/high/empty, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_a_s) +"cVH" = ( +/obj/structure/machinery/light{ + dir = 1 }, /turf/open/floor/almayer{ - dir = 4; - icon_state = "orange" + dir = 1; + icon_state = "green" }, -/area/almayer/engineering/upper_engineering/starboard) +/area/almayer/squads/req) "cVJ" = ( /obj/structure/largecrate/supply, /turf/open/floor/almayer{ @@ -29481,6 +26762,16 @@ icon_state = "plate" }, /area/almayer/living/gym) +"cWn" = ( +/obj/structure/machinery/door/window/westright{ + dir = 2 + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/command/cic) "cWr" = ( /obj/structure/machinery/photocopier{ density = 0; @@ -29537,6 +26828,15 @@ icon_state = "orange" }, /area/almayer/engineering/lower_engineering) +"cWw" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) "cWy" = ( /obj/structure/closet/secure_closet/freezer/fridge, /obj/item/reagent_container/food/snacks/packaged_burger, @@ -29560,6 +26860,15 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_a_s) +"cWM" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha) "cWN" = ( /obj/structure/filingcabinet{ density = 0; @@ -29759,6 +27068,23 @@ "daz" = ( /turf/closed/wall/almayer/white/hull, /area/almayer/command/airoom) +"daK" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/squads/alpha) +"daY" = ( +/obj/structure/machinery/cm_vending/clothing/smartgun/bravo, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/cryo_cells) "dbe" = ( /obj/structure/largecrate/random/case/double, /obj/structure/machinery/camera/autoname/almayer{ @@ -29785,6 +27111,11 @@ }, /turf/open/floor/plating, /area/almayer/living/port_emb) +"dbo" = ( +/obj/effect/landmark/start/marine/spec/delta, +/obj/effect/landmark/late_join/delta, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/delta) "dbq" = ( /turf/open/floor/almayer{ dir = 1; @@ -29828,6 +27159,31 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering/starboard) +"dbM" = ( +/obj/structure/surface/rack, +/obj/item/reagent_container/food/drinks/bottle/sake{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/reagent_container/food/drinks/bottle/sake{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/reagent_container/food/drinks/bottle/sake, +/obj/item/reagent_container/food/drinks/bottle/sake{ + pixel_x = -4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/corporateliason) +"dbQ" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/window/framed/almayer/hull, +/turf/open/floor/plating, +/area/almayer/hull/lower_hull/l_a_s) "dcd" = ( /obj/structure/bed/chair/comfy{ dir = 8 @@ -29852,6 +27208,50 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south2) +"dcr" = ( +/obj/structure/largecrate/random/barrel/white, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/lower_hull/l_f_p) +"dcy" = ( +/obj/structure/machinery/faxmachine/uscm/command{ + density = 0; + department = "AI Core"; + pixel_y = 32 + }, +/obj/structure/surface/rack{ + density = 0; + pixel_y = 16 + }, +/obj/structure/machinery/computer/working_joe{ + dir = 8; + pixel_x = 17; + pixel_y = -6 + }, +/obj/item/storage/box/ids{ + pixel_x = -4 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) +"dcI" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/disposalpipe/segment, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1 + }, +/turf/open/floor/almayer{ + dir = 6; + icon_state = "blue" + }, +/area/almayer/squads/delta) "dcP" = ( /obj/structure/machinery/body_scanconsole{ dir = 8 @@ -30074,6 +27474,12 @@ icon_state = "redfull" }, /area/almayer/living/briefing) +"dhS" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "cargo_arrow" + }, +/area/almayer/squads/delta) "dhU" = ( /obj/structure/closet/emcloset, /turf/open/floor/almayer{ @@ -30096,6 +27502,15 @@ icon_state = "test_floor4" }, /area/almayer/hallways/starboard_umbilical) +"diy" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "blue" + }, +/area/almayer/squads/delta) "diz" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat/blastdoor{ id_tag = "Boat1-D4"; @@ -30121,19 +27536,6 @@ icon_state = "orange" }, /area/almayer/engineering/lower_engineering) -"diJ" = ( -/obj/structure/window/reinforced{ - dir = 8; - health = 80 - }, -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, -/turf/open/floor/almayer{ - icon_state = "cargo_arrow" - }, -/area/almayer/squads/alpha_bravo_shared) "djm" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -30271,12 +27673,32 @@ icon_state = "kitchen" }, /area/almayer/engineering/upper_engineering/port) -"dll" = ( -/obj/structure/surface/table/almayer, -/turf/open/floor/almayer{ - icon_state = "orangefull" +"dlf" = ( +/obj/structure/sign/safety/terminal{ + pixel_x = 14; + pixel_y = 24 }, -/area/almayer/living/briefing) +/obj/structure/sign/safety/laser{ + pixel_y = 24 + }, +/obj/structure/sign/safety/fibre_optics{ + pixel_x = 14; + pixel_y = 38 + }, +/obj/structure/sign/safety/rewire{ + pixel_y = 38 + }, +/obj/structure/machinery/door_control{ + id = "ARES Operations Right"; + name = "ARES Operations Shutter"; + pixel_x = -24; + pixel_y = -8; + req_one_access_txt = "90;91;92" + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) "dlp" = ( /obj/structure/largecrate/supply/supplies/water, /obj/item/toy/deck{ @@ -30303,12 +27725,6 @@ icon_state = "silver" }, /area/almayer/command/cichallway) -"dmv" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "blue" - }, -/area/almayer/command/cichallway) "dmA" = ( /turf/open/floor/almayer, /area/almayer/living/synthcloset) @@ -30343,6 +27759,15 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/port_emb) +"dnf" = ( +/obj/structure/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "dnk" = ( /obj/structure/largecrate/supply/generator, /obj/item/reagent_container/food/drinks/bottle/whiskey{ @@ -30375,12 +27800,6 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/hydroponics) -"dnE" = ( -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - icon_state = "orange" - }, -/area/almayer/squads/bravo) "dnH" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -30462,6 +27881,18 @@ icon_state = "cargo" }, /area/almayer/squads/req) +"doV" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/bed/chair/comfy{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/living/bridgebunks) "dpn" = ( /obj/structure/closet/secure_closet/freezer/fridge/full, /obj/structure/machinery/light{ @@ -30491,16 +27922,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_s) -"dpO" = ( -/obj/structure/machinery/cm_vending/clothing/marine/delta{ - density = 0; - pixel_y = 16 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "cargo_arrow" - }, -/area/almayer/squads/delta) "dpV" = ( /obj/structure/machinery/firealarm{ dir = 4; @@ -30527,15 +27948,6 @@ "dqw" = ( /turf/closed/wall/almayer/outer, /area/almayer/shipboard/weapon_room/notunnel) -"dqD" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/bed/chair/comfy/bravo{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "orangefull" - }, -/area/almayer/living/briefing) "dqE" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -30569,6 +27981,36 @@ icon_state = "green" }, /area/almayer/hallways/aft_hallway) +"dqO" = ( +/obj/structure/bed{ + can_buckle = 0 + }, +/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{ + buckling_y = 13; + layer = 3.5; + pixel_y = 13 + }, +/obj/item/bedsheet/blue{ + layer = 3.2 + }, +/obj/item/bedsheet/blue{ + pixel_y = 13 + }, +/turf/open/floor/almayer{ + dir = 9; + icon_state = "red" + }, +/area/almayer/living/port_emb) "dqV" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -30591,19 +28033,6 @@ icon_state = "red" }, /area/almayer/shipboard/brig/perma) -"drj" = ( -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "cargo_arrow" - }, -/area/almayer/squads/charlie_delta_shared) "drk" = ( /obj/structure/closet, /turf/open/floor/almayer{ @@ -30737,15 +28166,6 @@ }, /turf/open/floor/almayer, /area/almayer/living/briefing) -"duw" = ( -/obj/structure/surface/table/almayer, -/obj/item/trash/USCMtray{ - pixel_x = 5 - }, -/turf/open/floor/almayer{ - icon_state = "emeraldfull" - }, -/area/almayer/living/briefing) "dux" = ( /obj/structure/surface/table/almayer, /obj/item/pizzabox{ @@ -30755,6 +28175,22 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_m_p) +"duB" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "red" + }, +/area/almayer/squads/alpha) "duF" = ( /obj/structure/closet/secure_closet/personal, /turf/open/floor/almayer{ @@ -30762,6 +28198,23 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) +"duK" = ( +/obj/structure/machinery/cm_vending/gear/spec, +/obj/structure/sign/safety/ammunition{ + pixel_x = 15; + pixel_y = 32 + }, +/obj/structure/sign/safety/hazard{ + pixel_y = 32 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) +"duM" = ( +/obj/structure/machinery/computer/ordercomp, +/turf/open/floor/almayer, +/area/almayer/squads/delta) "duT" = ( /obj/structure/bed, /obj/structure/machinery/flasher{ @@ -30773,15 +28226,15 @@ icon_state = "red" }, /area/almayer/shipboard/brig/cells) -"duV" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 +"dve" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 }, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/area/almayer/squads/alpha) +/turf/open/floor/almayer, +/area/almayer/living/cryo_cells) "dvg" = ( /obj/structure/reagent_dispensers/fueltank/custom, /obj/structure/sign/safety/chem_lab{ @@ -30818,6 +28271,21 @@ }, /turf/open/floor/almayer, /area/almayer/engineering/engineering_workshop/hangar) +"dvL" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/storage/belt/medical/full, +/obj/item/storage/belt/medical/full, +/obj/item/storage/belt/medical/full, +/obj/item/storage/belt/medical/full, +/obj/structure/machinery/computer/working_joe{ + dir = 8; + pixel_x = 17 + }, +/obj/item/device/binoculars, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/cic) "dvT" = ( /turf/closed/wall/almayer, /area/almayer/shipboard/brig/general_equipment) @@ -30997,36 +28465,30 @@ icon_state = "orange" }, /area/almayer/engineering/ce_room) -"dAb" = ( -/obj/structure/largecrate/random/barrel/blue, -/turf/open/floor/almayer{ - icon_state = "plate" +"dzX" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/area/almayer/hull/upper_hull/u_f_p) -"dAq" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/bravo{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/area/almayer/squads/bravo) -"dAX" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 4; - name = "ship-grade camera" +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/obj/structure/sign/safety/commline_connection{ - pixel_x = -17 +/turf/open/floor/almayer{ + icon_state = "plate" }, +/area/almayer/squads/alpha) +"dAb" = ( +/obj/structure/largecrate/random/barrel/blue, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/command/cic) +/area/almayer/hull/upper_hull/u_f_p) "dBj" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -31050,6 +28512,15 @@ icon_state = "cargo" }, /area/almayer/command/cic) +"dBz" = ( +/obj/structure/machinery/light{ + dir = 4; + invisibility = 101; + unacidable = 1; + unslashable = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/lower_hull/l_a_p) "dBG" = ( /obj/structure/machinery/vending/snack, /turf/open/floor/almayer{ @@ -31267,6 +28738,17 @@ icon_state = "redfull" }, /area/almayer/living/briefing) +"dES" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "dEV" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -31280,6 +28762,39 @@ icon_state = "redcorner" }, /area/almayer/command/lifeboat) +"dFw" = ( +/obj/structure/disposalpipe/junction, +/obj/structure/pipes/standard/simple/hidden/supply, +/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/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 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) +"dFz" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/port_hallway) "dFC" = ( /obj/structure/machinery/light{ dir = 1 @@ -31422,6 +28937,14 @@ icon_state = "red" }, /area/almayer/hallways/aft_hallway) +"dHt" = ( +/obj/structure/surface/table/almayer, +/obj/item/reagent_container/food/condiment/hotsauce/sriracha{ + pixel_x = 7; + pixel_y = 7 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "dHu" = ( /obj/structure/desertdam/decals/road_edge{ pixel_x = 2; @@ -31489,18 +29012,6 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) -"dII" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/shared/alpha_bravo, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/alpha) "dIR" = ( /obj/structure/surface/rack, /obj/effect/spawner/random/tool, @@ -31511,6 +29022,12 @@ icon_state = "cargo" }, /area/almayer/hull/lower_hull/l_m_s) +"dKa" = ( +/obj/structure/machinery/cryopod, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/hallways/port_hallway) "dKm" = ( /obj/structure/machinery/power/apc/almayer{ dir = 4 @@ -31578,17 +29095,27 @@ icon_state = "silver" }, /area/almayer/hallways/aft_hallway) -"dMB" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "plating_striped" +"dMJ" = ( +/obj/structure/machinery/light{ + dir = 4; + invisibility = 101; + unacidable = 1; + unslashable = 1 }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer, /area/almayer/living/cryo_cells) "dMK" = ( /turf/closed/wall/almayer/research/containment/wall/corner{ dir = 8 }, /area/almayer/medical/containment/cell) +"dNc" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/auxiliary_officer_office) "dNe" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -31609,15 +29136,6 @@ 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{ - dir = 4; - id = "Firing_Range_1"; - name = "range shutters" - }, -/turf/open/floor/plating, -/area/almayer/living/cryo_cells) "dNx" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/almayer, @@ -31647,6 +29165,13 @@ icon_state = "redfull" }, /area/almayer/command/cic) +"dOa" = ( +/obj/structure/bed/chair{ + dir = 8; + pixel_y = 3 + }, +/turf/open/floor/almayer, +/area/almayer/squads/delta) "dOl" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/storage/fancy/cigar, @@ -31721,6 +29246,17 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_f_p) +"dQJ" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "dRh" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -31731,15 +29267,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/hydroponics) -"dRv" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "red" - }, -/area/almayer/squads/alpha) "dRw" = ( /obj/structure/surface/rack, /obj/item/tool/crowbar, @@ -31764,15 +29291,23 @@ icon_state = "test_floor4" }, /area/almayer/living/offices/flight) -"dRG" = ( -/obj/structure/machinery/light{ - dir = 8 +"dRQ" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + req_one_access_txt = "2;7;200" }, /turf/open/floor/almayer{ - dir = 8; - icon_state = "red" + icon_state = "plate" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hull/lower_hull/l_a_s) +"dRR" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) "dRT" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -31826,6 +29361,18 @@ /obj/structure/largecrate/random/case/small, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_s) +"dSI" = ( +/obj/structure/flora/pottedplant{ + desc = "It is made of Fiberbush(tm). It contains asbestos."; + icon_state = "pottedplant_22"; + name = "synthetic potted plant"; + pixel_y = 8 + }, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) "dSJ" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -31876,11 +29423,28 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) +"dTJ" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/living/port_emb) "dTZ" = ( /turf/open/floor/almayer{ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) +"dUf" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 2 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "dUE" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -31948,6 +29512,12 @@ /obj/structure/machinery/light, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/req) +"dWi" = ( +/obj/structure/machinery/cm_vending/sorted/tech/comtech_tools, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha) "dWk" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/door_control{ @@ -31993,6 +29563,14 @@ }, /turf/open/floor/wood/ship, /area/almayer/command/corporateliason) +"dWN" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/squads/alpha) "dWX" = ( /obj/structure/machinery/light{ dir = 8 @@ -32011,6 +29589,15 @@ icon_state = "dark_sterile" }, /area/almayer/engineering/laundry) +"dXg" = ( +/obj/structure/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/delta) "dXo" = ( /obj/structure/machinery/photocopier, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -32034,6 +29621,14 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, /area/almayer/shipboard/brig/main_office) +"dXE" = ( +/obj/structure/platform_decoration{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "dXG" = ( /obj/structure/pipes/vents/scrubber{ dir = 1 @@ -32042,6 +29637,13 @@ icon_state = "plate" }, /area/almayer/squads/req) +"dXI" = ( +/obj/structure/pipes/vents/scrubber, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "green" + }, +/area/almayer/command/cichallway) "dXV" = ( /obj/structure/desertdam/decals/road_edge{ pixel_x = 16 @@ -32180,6 +29782,12 @@ icon_state = "plate" }, /area/almayer/command/lifeboat) +"ebs" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 + }, +/turf/open/floor/almayer, +/area/almayer/living/cryo_cells) "ebD" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -32253,6 +29861,13 @@ icon_state = "orange" }, /area/almayer/engineering/engineering_workshop) +"ecK" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/lower_hull) "ecM" = ( /obj/structure/bed/chair{ dir = 4 @@ -32328,20 +29943,6 @@ icon_state = "mono" }, /area/almayer/command/computerlab) -"eei" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/storage/box/cups{ - pixel_x = -6; - pixel_y = 8 - }, -/obj/item/reagent_container/spray/cleaner{ - pixel_x = 7; - pixel_y = 14 - }, -/turf/open/floor/almayer{ - icon_state = "bluefull" - }, -/area/almayer/command/cichallway) "eem" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/tool/kitchen/tray, @@ -32362,15 +29963,23 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_p) -"eet" = ( -/obj/structure/machinery/power/terminal{ - dir = 1 +"eer" = ( +/obj/structure/surface/table/almayer, +/obj/item/prop/helmetgarb/helmet_nvg/cosmetic{ + pixel_x = 5; + pixel_y = 7 }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "orange" + icon_state = "plate" }, -/area/almayer/engineering/upper_engineering/starboard) +/area/almayer/hallways/port_hallway) +"eet" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/hangar) "eeu" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -32386,6 +29995,31 @@ icon_state = "kitchen" }, /area/almayer/living/grunt_rnr) +"eeL" = ( +/obj/structure/bed/chair{ + dir = 8; + pixel_y = 3 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/port_hallway) +"eeM" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/device/camera_film{ + pixel_x = 4; + pixel_y = -2 + }, +/obj/item/device/camera/siliconcam{ + pixel_x = -6; + pixel_y = 11 + }, +/turf/open/floor/almayer{ + dir = 6; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) "eeN" = ( /obj/structure/bed/chair, /turf/open/floor/almayer{ @@ -32441,17 +30075,6 @@ icon_state = "plate" }, /area/almayer/shipboard/brig/main_office) -"efK" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha) "efU" = ( /obj/structure/machinery/power/apc/almayer{ dir = 1 @@ -32576,15 +30199,6 @@ icon_state = "plate" }, /area/almayer/living/port_emb) -"ehZ" = ( -/obj/structure/sign/safety/water{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/tankerbunks) "eim" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -32593,11 +30207,6 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) -"eiq" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/prop/magazine/dirty, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) "eiw" = ( /obj/structure/machinery/light{ dir = 4 @@ -32668,19 +30277,6 @@ icon_state = "plate" }, /area/almayer/living/gym) -"ejo" = ( -/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 = "plate" - }, -/area/almayer/squads/charlie) "ejp" = ( /obj/structure/closet/emcloset, /turf/open/floor/almayer{ @@ -32696,6 +30292,9 @@ /obj/structure/window/framed/almayer, /turf/open/floor/plating, /area/almayer/living/grunt_rnr) +"ejH" = ( +/turf/closed/wall/almayer/reinforced, +/area/almayer/hull/lower_hull/l_a_s) "ejK" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/clothing/glasses/welding{ @@ -32790,6 +30389,49 @@ icon_state = "dark_sterile" }, /area/almayer/medical/operating_room_one) +"elJ" = ( +/obj/effect/projector{ + name = "Almayer_AresDown"; + vector_x = 97; + vector_y = -65 + }, +/obj/structure/platform{ + dir = 8 + }, +/obj/structure/stairs{ + dir = 1; + icon_state = "ramptop" + }, +/obj/structure/machinery/door_control{ + id = "ARES StairsUpper"; + name = "ARES Core Access"; + pixel_x = -24; + req_one_access_txt = "90;91;92" + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) +"elN" = ( +/turf/open/floor/almayer{ + dir = 8; + icon_state = "plating_striped" + }, +/area/almayer/hallways/port_hallway) +"elO" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/vehicle_crew, +/obj/structure/sign/safety/hazard{ + pixel_x = -17; + pixel_y = -8 + }, +/obj/structure/sign/safety/ammunition{ + pixel_x = -17; + pixel_y = 7 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/tankerbunks) "elR" = ( /turf/closed/wall/almayer/research/containment/wall/corner{ dir = 1 @@ -32864,6 +30506,19 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_s) +"enh" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/door/airlock/almayer/maint{ + req_access = null; + req_one_access = null; + req_one_access_txt = "19;29" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/sea_office) "eni" = ( /obj/structure/surface/table/almayer, /obj/item/prop/magazine/book/spacebeast, @@ -32891,6 +30546,19 @@ icon_state = "red" }, /area/almayer/shipboard/brig/main_office) +"enN" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer, +/area/almayer/living/cryo_cells) +"enO" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "green" + }, +/area/almayer/hallways/starboard_hallway) "eoG" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -32932,42 +30600,10 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/lobby) -"epA" = ( -/obj/structure/largecrate/random/barrel/yellow, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/lower_hull/l_a_s) -"eqb" = ( -/obj/structure/surface/table/almayer, -/obj/item/tool/stamp/denied{ - pixel_x = 2; - pixel_y = 10 - }, -/obj/item/device/eftpos{ - eftpos_name = "Cargo Bay EFTPOS scanner"; - pixel_x = -10 - }, -/obj/item/tool/stamp/ro{ - pixel_x = -8; - pixel_y = 10 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/item/storage/fancy/cigar{ - pixel_x = 6 - }, -/obj/item/ashtray/glass{ - pixel_x = 11; - pixel_y = 9 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/req) +"eqi" = ( +/obj/structure/machinery/camera/autoname/almayer, +/turf/open/floor/plating, +/area/almayer/hallways/hangar) "eqk" = ( /mob/living/simple_animal/mouse/brown, /turf/open/floor/almayer{ @@ -33028,29 +30664,6 @@ dir = 1 }, /area/almayer/medical/containment/cell/cl) -"erh" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_x = -1; - pixel_y = 1 - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/delta) "erx" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -33064,15 +30677,6 @@ icon_state = "plate" }, /area/almayer/shipboard/brig/cryo) -"erG" = ( -/obj/structure/disposalpipe/junction{ - dir = 2; - icon_state = "pipe-j2" - }, -/obj/effect/landmark/start/marine/smartgunner/delta, -/obj/effect/landmark/late_join/delta, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/delta) "erN" = ( /obj/structure/machinery/light{ dir = 8 @@ -33303,18 +30907,6 @@ icon_state = "greencorner" }, /area/almayer/hallways/starboard_hallway) -"ewO" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - dir = 1 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/delta) "ewS" = ( /turf/open/floor/almayer{ dir = 8; @@ -33384,6 +30976,11 @@ icon_state = "cargo" }, /area/almayer/shipboard/brig/cryo) +"eyh" = ( +/obj/effect/landmark/start/marine/leader/delta, +/obj/effect/landmark/late_join/delta, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/delta) "eyG" = ( /obj/structure/platform, /turf/open/floor/almayer{ @@ -33423,6 +31020,17 @@ icon_state = "green" }, /area/almayer/shipboard/brig/cells) +"ezA" = ( +/obj/structure/surface/table/almayer, +/obj/item/trash/USCMtray{ + pixel_x = 5 + }, +/obj/item/reagent_container/food/condiment/hotsauce/cholula{ + pixel_x = -8; + pixel_y = 22 + }, +/turf/open/floor/almayer, +/area/almayer/squads/alpha) "ezG" = ( /obj/structure/pipes/vents/scrubber{ dir = 4 @@ -33457,18 +31065,6 @@ /obj/structure/bed/chair/wood/normal, /turf/open/floor/wood/ship, /area/almayer/shipboard/brig/cells) -"eAg" = ( -/obj/structure/flora/pottedplant{ - desc = "It is made of Fiberbush(tm). It contains asbestos."; - icon_state = "pottedplant_22"; - name = "synthetic potted plant"; - pixel_y = 8 - }, -/turf/open/floor/almayer{ - dir = 6; - icon_state = "red" - }, -/area/almayer/squads/alpha) "eAC" = ( /obj/structure/machinery/light{ dir = 4 @@ -33497,6 +31093,12 @@ icon_state = "blue" }, /area/almayer/living/basketball) +"eBc" = ( +/obj/structure/machinery/cm_vending/gear/engi, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "eBd" = ( /obj/structure/closet/secure_closet/personal/cabinet{ req_access = null @@ -33517,15 +31119,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/living/briefing) -"eBj" = ( -/obj/structure/sign/safety/distribution_pipes{ - pixel_x = 32 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orange" - }, -/area/almayer/hallways/starboard_hallway) "eBo" = ( /obj/structure/machinery/cm_vending/gear/commanding_officer, /turf/open/floor/wood/ship, @@ -33542,19 +31135,6 @@ icon_state = "mono" }, /area/almayer/medical/medical_science) -"eBV" = ( -/obj/structure/window/reinforced{ - dir = 8; - health = 80 - }, -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, -/turf/open/floor/almayer{ - icon_state = "cargo_arrow" - }, -/area/almayer/squads/charlie_delta_shared) "eBW" = ( /obj/structure/machinery/firealarm{ dir = 4; @@ -33596,6 +31176,12 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south2) +"eCy" = ( +/obj/structure/machinery/firealarm{ + pixel_y = -28 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "eDo" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -33606,12 +31192,6 @@ icon_state = "plating" }, /area/almayer/medical/upper_medical) -"eDu" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer, -/area/almayer/living/bridgebunks) "eDG" = ( /obj/structure/barricade/handrail{ dir = 1; @@ -33656,23 +31236,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cic_hallway) -"eFj" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 4 - }, -/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 = "plate" - }, -/area/almayer/squads/charlie) "eFp" = ( /obj/structure/surface/rack, /obj/item/clothing/head/headband/red{ @@ -33730,15 +31293,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/vehiclehangar) -"eGh" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/tool/surgery/scalpel{ - pixel_x = -1; - pixel_y = 10 - }, -/obj/item/stack/cable_coil, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) "eGl" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -33773,6 +31327,15 @@ icon_state = "cargo_arrow" }, /area/almayer/engineering/engineering_workshop/hangar) +"eGu" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + req_one_access = null; + req_one_access_txt = "19;27" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/living/tankerbunks) "eGz" = ( /obj/structure/sign/safety/storage{ pixel_x = -17 @@ -33809,6 +31372,16 @@ icon_state = "plate" }, /area/almayer/squads/req) +"eHd" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "cargo_arrow" + }, +/area/almayer/squads/alpha) "eHf" = ( /obj/structure/machinery/light/small, /obj/structure/prop/invuln/overhead_pipe{ @@ -33853,6 +31426,20 @@ icon_state = "silver" }, /area/almayer/command/computerlab) +"eIh" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/closed/wall/almayer, +/area/almayer/hull/lower_hull) +"eIk" = ( +/obj/structure/surface/table/almayer, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/item/facepaint/black, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/delta) "eIA" = ( /obj/structure/sign/safety/water{ pixel_x = 8; @@ -33992,6 +31579,18 @@ icon_state = "test_floor4" }, /area/almayer/engineering/laundry) +"eMt" = ( +/obj/structure/machinery/cm_vending/clothing/marine/delta, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) +"eMx" = ( +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = 22 + }, +/turf/open/floor/almayer, +/area/almayer/living/auxiliary_officer_office) "eMP" = ( /obj/structure/machinery/door/poddoor/almayer/open{ dir = 4; @@ -34008,6 +31607,16 @@ icon_state = "test_floor4" }, /area/almayer/command/cichallway) +"eNe" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "cargo_arrow" + }, +/area/almayer/squads/alpha) "eNi" = ( /turf/closed/wall/almayer, /area/almayer/engineering/ce_room) @@ -34045,6 +31654,17 @@ icon_state = "redcorner" }, /area/almayer/shipboard/brig/evidence_storage) +"eOj" = ( +/obj/structure/flora/pottedplant{ + desc = "It is made of Fiberbush(tm). It contains asbestos."; + icon_state = "pottedplant_22"; + name = "synthetic potted plant"; + pixel_y = 8 + }, +/turf/open/floor/almayer{ + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) "eOk" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -34134,6 +31754,27 @@ icon_state = "test_floor4" }, /area/almayer/hallways/aft_hallway) +"eQT" = ( +/obj/structure/bed/chair{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blue" + }, +/area/almayer/hallways/hangar) +"eQZ" = ( +/obj/structure/flora/pottedplant{ + desc = "It is made of Fiberbush(tm). It contains asbestos."; + icon_state = "pottedplant_22"; + name = "synthetic potted plant"; + pixel_y = 8 + }, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "blue" + }, +/area/almayer/squads/delta) "eRe" = ( /obj/structure/bed/chair/comfy/orange{ dir = 8 @@ -34170,6 +31811,13 @@ icon_state = "test_floor4" }, /area/almayer/medical/lower_medical_medbay) +"eRF" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/delta) "eRL" = ( /turf/open/floor/almayer, /area/almayer/shipboard/brig/main_office) @@ -34190,6 +31838,21 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) +"eSs" = ( +/obj/structure/pipes/vents/scrubber{ + dir = 4 + }, +/obj/structure/machinery/status_display{ + pixel_y = 30 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) "eSJ" = ( /obj/structure/surface/table/woodentable/fancy, /obj/structure/transmitter/rotary{ @@ -34261,26 +31924,6 @@ icon_state = "red" }, /area/almayer/hallways/stern_hallway) -"eUh" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera" - }, -/obj/structure/sign/safety/ammunition{ - pixel_x = 15; - pixel_y = 32 - }, -/obj/structure/sign/safety/hazard{ - pixel_y = 32 - }, -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie_delta_shared) "eUn" = ( /obj/structure/machinery/chem_master, /turf/open/floor/almayer{ @@ -34298,16 +31941,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/port_hallway) -"eUA" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_x = -1; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha) "eUR" = ( /obj/structure/bed/chair/comfy/orange, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -34335,6 +31968,14 @@ icon_state = "red" }, /area/almayer/shipboard/brig/processing) +"eUW" = ( +/obj/structure/bed/chair/comfy{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/medical/medical_science) "eVj" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -34352,6 +31993,16 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) +"eVp" = ( +/obj/structure/machinery/vending/cigarette{ + density = 0; + pixel_y = 16 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) "eVv" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -34372,24 +32023,6 @@ }, /turf/open/floor/almayer, /area/almayer/living/chapel) -"eVT" = ( -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/structure/machinery/disposal, -/turf/open/floor/almayer{ - icon_state = "sterile_green_side" - }, -/area/almayer/medical/medical_science) -"eWp" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/bed/chair/comfy/charlie{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "emeraldfull" - }, -/area/almayer/living/briefing) "eWF" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -34468,18 +32101,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/port_emb) -"eYz" = ( -/obj/structure/machinery/camera/autoname/almayer/containment/ares{ - dir = 1 - }, -/obj/structure/machinery/computer/working_joe{ - dir = 8; - pixel_x = 29 - }, -/turf/open/floor/almayer/no_build{ - icon_state = "ai_floors" - }, -/area/almayer/command/airoom) "eYC" = ( /obj/structure/machinery/vending/cigarette, /turf/open/floor/wood/ship, @@ -34493,6 +32114,12 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_p) +"eYI" = ( +/obj/structure/bed/chair{ + dir = 1 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "eYM" = ( /obj/structure/desertdam/decals/road_edge{ pixel_x = 2; @@ -34589,24 +32216,6 @@ icon_state = "test_floor4" }, /area/almayer/command/cichallway) -"fbb" = ( -/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/firealarm{ - pixel_y = 28 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha) "fbo" = ( /obj/structure/machinery/door_control{ id = "kitchen2"; @@ -34691,12 +32300,6 @@ icon_state = "test_floor4" }, /area/almayer/medical/hydroponics) -"fcB" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "emerald" - }, -/area/almayer/squads/charlie) "fcE" = ( /turf/open/floor/almayer{ dir = 1; @@ -34798,6 +32401,20 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) +"feA" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/obj/item/tool/warning_cone{ + pixel_x = -20; + pixel_y = 18 + }, +/mob/living/simple_animal/corgi/Ian{ + name = "Запойный Фрай"; + real_name = "Запойный Фрай" + }, +/turf/open/floor/almayer, +/area/almayer/living/port_emb) "feC" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -34936,21 +32553,6 @@ /obj/item/storage/toolbox/mechanical, /turf/open/floor/almayer, /area/almayer/engineering/upper_engineering) -"fhA" = ( -/obj/structure/machinery/light/small{ - dir = 1 - }, -/obj/structure/surface/rack, -/obj/item/storage/belt/utility/full{ - pixel_y = 8 - }, -/obj/item/storage/belt/utility/full, -/obj/item/clothing/suit/storage/hazardvest/black, -/obj/item/tool/crowbar, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/lower_hull/l_a_s) "fhH" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -34979,6 +32581,15 @@ icon_state = "orange" }, /area/almayer/engineering/engine_core) +"fjB" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "silvercorner" + }, +/area/almayer/hallways/port_hallway) "fjO" = ( /obj/item/tool/wet_sign, /obj/effect/decal/cleanable/blood, @@ -35024,6 +32635,12 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_f_p) +"flV" = ( +/obj/structure/machinery/cm_vending/clothing/medic/delta, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "flW" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/light{ @@ -35035,6 +32652,20 @@ icon_state = "silver" }, /area/almayer/living/briefing) +"fme" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep{ + req_one_access = list() + }, +/obj/structure/machinery/light{ + dir = 8; + invisibility = 101; + unacidable = 1; + unslashable = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha) "fmf" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/almayer/glass{ dir = 2; @@ -35072,6 +32703,15 @@ }, /turf/open/floor/almayer, /area/almayer/living/pilotbunks) +"fmJ" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 9; + icon_state = "green" + }, +/area/almayer/hallways/starboard_hallway) "fmS" = ( /obj/structure/closet/secure_closet/engineering_electrical, /turf/open/floor/almayer{ @@ -35120,19 +32760,13 @@ }, /area/almayer/squads/req) "fnQ" = ( -/obj/structure/toilet{ - dir = 1 - }, -/obj/structure/window/reinforced/tinted{ - dir = 8 - }, -/obj/structure/machinery/door/window/tinted{ - dir = 1 - }, -/turf/open/floor/prison{ - icon_state = "kitchen" +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/obj/structure/closet/firecloset, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/area/almayer/engineering/upper_engineering/port) +/area/almayer/hull/upper_hull/u_a_p) "fnZ" = ( /obj/structure/machinery/portable_atmospherics/canister/air, /obj/structure/machinery/light/small{ @@ -35142,22 +32776,6 @@ icon_state = "cargo" }, /area/almayer/hull/upper_hull/u_a_s) -"foL" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "emeraldcorner" - }, -/area/almayer/squads/charlie) -"foN" = ( -/obj/structure/bed/chair, -/turf/open/floor/almayer, -/area/almayer/living/tankerbunks) "foP" = ( /obj/structure/machinery/shower{ pixel_y = 16 @@ -35183,6 +32801,13 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_f_s) +"fpk" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/microwave{ + pixel_y = 6 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "fps" = ( /obj/structure/machinery/chem_master/industry_mixer, /turf/open/floor/almayer{ @@ -35205,12 +32830,6 @@ icon_state = "plate" }, /area/almayer/engineering/starboard_atmos) -"fpT" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/almayer/medical/medical_science) "fpW" = ( /obj/structure/sign/safety/bulkhead_door{ pixel_x = 32 @@ -35220,13 +32839,6 @@ icon_state = "orange" }, /area/almayer/hallways/hangar) -"fqc" = ( -/obj/structure/machinery/vending/cigarette, -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - icon_state = "bluefull" - }, -/area/almayer/command/cichallway) "fqe" = ( /obj/structure/surface/table/almayer, /obj/item/tool/pen/blue/clicky{ @@ -35337,6 +32949,15 @@ icon_state = "plating" }, /area/almayer/hallways/vehiclehangar) +"fsi" = ( +/obj/structure/sign/safety/water{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/lower_hull/l_f_p) "fso" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -35361,6 +32982,12 @@ icon_state = "plate" }, /area/almayer/living/gym) +"fsw" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/living/auxiliary_officer_office) "fsz" = ( /obj/structure/machinery/firealarm{ dir = 1; @@ -35393,13 +33020,6 @@ icon_state = "plating" }, /area/almayer/shipboard/brig/armory) -"fsV" = ( -/obj/structure/target, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "plating_striped" - }, -/area/almayer/living/cryo_cells) "fti" = ( /obj/structure/machinery/door/poddoor/railing{ dir = 2; @@ -35442,6 +33062,12 @@ /obj/structure/largecrate/random/barrel/green, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_s) +"fuP" = ( +/obj/effect/landmark/ert_spawns/distress_cryo, +/obj/effect/landmark/late_join, +/obj/effect/landmark/start/auxiliary_officer, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/cryo_cells) "fuS" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -35484,6 +33110,16 @@ icon_state = "silver" }, /area/almayer/living/briefing) +"fvn" = ( +/obj/structure/machinery/door/airlock/almayer/command{ + name = "\improper Senior Enlisted Advisor's Office"; + req_access = null; + req_access_txt = "19;29" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/sea_office) "fvu" = ( /obj/item/tool/crowbar, /turf/open/floor/almayer{ @@ -35520,6 +33156,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/port_point_defense) +"fvU" = ( +/obj/structure/machinery/vending/cola, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "fwD" = ( /obj/structure/surface/table/almayer, /obj/item/trash/plate{ @@ -35540,12 +33182,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_f_p) -"fwY" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/charlie_delta_shared) "fxu" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8 @@ -35579,6 +33215,15 @@ icon_state = "plating" }, /area/almayer/engineering/upper_engineering) +"fxL" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 2.5 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "fxO" = ( /obj/structure/machinery/vending/coffee{ density = 0; @@ -35618,6 +33263,11 @@ icon_state = "plate" }, /area/almayer/shipboard/weapon_room) +"fyC" = ( +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/squads/delta) "fyD" = ( /obj/structure/machinery/light, /obj/structure/ladder{ @@ -35626,18 +33276,6 @@ }, /turf/open/floor/plating/almayer, /area/almayer/living/briefing) -"fzq" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/shared/charlie_delta, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/charlie) "fzP" = ( /obj/structure/surface/table/almayer, /obj/item/paper_bin/uscm, @@ -35686,6 +33324,18 @@ }, /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_f_p) +"fAG" = ( +/obj/structure/machinery/cm_vending/gear/leader, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/cryo_cells) +"fAI" = ( +/obj/structure/machinery/cm_vending/gear/smartgun, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/cryo_cells) "fAS" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -35702,6 +33352,15 @@ icon_state = "test_floor4" }, /area/almayer/hull/upper_hull/u_a_s) +"fBk" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blue" + }, +/area/almayer/living/briefing) "fBx" = ( /obj/structure/closet/firecloset, /turf/open/floor/almayer{ @@ -35753,25 +33412,19 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/command/lifeboat) +"fCB" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) "fCL" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/port) -"fDh" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - pixel_x = -1 - }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/delta) "fDj" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/device/defibrillator, @@ -35790,6 +33443,23 @@ icon_state = "plating" }, /area/almayer/shipboard/brig/armory) +"fDx" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_x = -1; + pixel_y = 2 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "fDG" = ( /obj/structure/machinery/vending/coffee, /obj/structure/machinery/light{ @@ -35799,13 +33469,6 @@ icon_state = "orangefull" }, /area/almayer/engineering/upper_engineering) -"fDJ" = ( -/obj/effect/landmark/start/marine/engineer/charlie, -/obj/effect/landmark/late_join/charlie, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) "fDS" = ( /obj/structure/platform_decoration, /turf/open/floor/almayer{ @@ -35865,6 +33528,23 @@ icon_state = "test_floor4" }, /area/almayer/living/grunt_rnr) +"fEp" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/turf/open/floor/almayer, +/area/almayer/living/auxiliary_officer_office) +"fEs" = ( +/obj/structure/machinery/cm_vending/sorted/tech/comtech_tools, +/obj/structure/platform{ + dir = 8; + layer = 2.7 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/port_hallway) "fEC" = ( /obj/structure/machinery/power/apc/almayer, /turf/open/floor/almayer{ @@ -35892,6 +33572,33 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_f_s) +"fFb" = ( +/obj/structure/surface/table/almayer, +/obj/item/ashtray/bronze{ + pixel_x = 7; + pixel_y = 9 + }, +/obj/item/trash/semki{ + layer = 2; + pixel_x = -13; + pixel_y = 14 + }, +/obj/item/prop/magazine/boots/n054{ + pixel_x = 29 + }, +/obj/item/prop/magazine/dirty/torn{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/clothing/glasses/disco_fever{ + pixel_x = 5; + pixel_y = 4 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "silver" + }, +/area/almayer/living/port_emb) "fFe" = ( /obj/structure/sign/safety/maint{ pixel_x = 32 @@ -35918,18 +33625,28 @@ icon_state = "test_floor4" }, /area/almayer/hull/lower_hull/l_m_p) -"fFD" = ( -/obj/structure/window/reinforced{ - dir = 4; - health = 80 +"fFF" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" }, -/obj/structure/window/reinforced{ - dir = 8 +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_x = -1; + pixel_y = 1 }, /turf/open/floor/almayer{ + dir = 8; icon_state = "cargo_arrow" }, -/area/almayer/squads/alpha_bravo_shared) +/area/almayer/squads/alpha) "fFL" = ( /obj/structure/disposalpipe/junction{ dir = 8; @@ -35953,36 +33670,27 @@ icon_state = "plate" }, /area/almayer/medical/morgue) -"fGg" = ( -/obj/effect/decal/cleanable/blood/oil/streak, -/turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/south1) -"fGu" = ( -/obj/structure/machinery/door_control{ - dir = 1; - id = "researchlockdownext"; - name = "Window Shutters"; - pixel_x = -26; - pixel_y = 6; - req_access_txt = "28" - }, -/obj/structure/machinery/door_control{ - dir = 1; - id = "researchlockdownext_door"; - name = "Door Shutters"; - pixel_x = -26; - pixel_y = 1; - req_access_txt = "28" - }, +"fGa" = ( +/obj/structure/pipes/standard/manifold/hidden/supply, /obj/structure/disposalpipe/junction{ dir = 2; icon_state = "pipe-j2" }, /turf/open/floor/almayer{ dir = 8; - icon_state = "sterile_green_side" + icon_state = "silver" }, -/area/almayer/medical/medical_science) +/area/almayer/living/cryo_cells) +"fGg" = ( +/obj/effect/decal/cleanable/blood/oil/streak, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/south1) +"fGy" = ( +/turf/open/floor/almayer{ + dir = 1; + icon_state = "cargo_arrow" + }, +/area/almayer/squads/delta) "fGN" = ( /obj/structure/closet/firecloset, /turf/open/floor/almayer{ @@ -36087,11 +33795,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_p) -"fIM" = ( -/obj/effect/landmark/start/marine/tl/bravo, -/obj/effect/landmark/late_join/bravo, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/bravo) "fIX" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/almayer{ name = "\improper Requisitions Auxiliary Storage Room"; @@ -36102,16 +33805,21 @@ icon_state = "plate" }, /area/almayer/squads/req) -"fIZ" = ( -/obj/structure/surface/table/almayer, -/obj/item/prop/magazine/boots/n117{ - pixel_x = -4; - pixel_y = 6 +"fJh" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 2 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/platform_decoration{ + dir = 4 }, /turf/open/floor/almayer{ - icon_state = "emeraldfull" + icon_state = "plate" }, -/area/almayer/living/briefing) +/area/almayer/hallways/port_hallway) "fJm" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22"; @@ -36124,6 +33832,12 @@ icon_state = "plate" }, /area/almayer/command/cichallway) +"fJw" = ( +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/closed/wall/almayer/reinforced, +/area/almayer/hull/lower_hull/l_a_s) "fJy" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/toy/deck{ @@ -36144,16 +33858,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_s) -"fJO" = ( -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 4; - id = "Firing_Range_1"; - name = "range shutters" - }, -/turf/open/floor/plating, -/area/almayer/living/cryo_cells) "fJT" = ( /obj/structure/surface/rack, /obj/item/reagent_container/glass/bucket{ @@ -36275,6 +33979,12 @@ icon_state = "red" }, /area/almayer/shipboard/brig/general_equipment) +"fLO" = ( +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera" + }, +/turf/open/floor/almayer, +/area/almayer/squads/delta) "fLX" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -36286,19 +33996,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/lower_engineering) -"fMl" = ( -/obj/structure/machinery/door_control{ - id = "ARES Operations Right"; - name = "ARES Operations Shutter"; - pixel_x = 24; - pixel_y = -8; - req_one_access_txt = "90;91;92" - }, -/turf/open/floor/almayer/no_build{ - dir = 4; - icon_state = "silver" - }, -/area/almayer/command/airoom) "fMt" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ id = "ARES Interior"; @@ -36340,6 +34037,10 @@ icon_state = "green" }, /area/almayer/hallways/aft_hallway) +"fMW" = ( +/obj/structure/machinery/cm_vending/sorted/attachments, +/turf/open/floor/wood/ship, +/area/almayer/living/auxiliary_officer_office) "fNb" = ( /obj/structure/surface/table/woodentable/fancy, /obj/structure/machinery/computer/card{ @@ -36382,6 +34083,36 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/aft_hallway) +"fNF" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/light{ + dir = 8; + invisibility = 101; + unacidable = 1; + unslashable = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha) +"fNK" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad{ + req_access = null; + req_one_access = null; + req_one_access_txt = "15;16;18;21"; + vend_x_offset = 0; + vend_y_offset = 0 + }, +/obj/structure/machinery/light{ + dir = 4; + invisibility = 101; + unacidable = 1; + unslashable = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha) "fOk" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -36425,36 +34156,6 @@ icon_state = "test_floor4" }, /area/almayer/hallways/hangar) -"fPp" = ( -/obj/structure/bed{ - can_buckle = 0 - }, -/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{ - buckling_y = 13; - layer = 3.5; - pixel_y = 13 - }, -/obj/item/bedsheet/yellow{ - layer = 3.2 - }, -/obj/item/bedsheet/yellow{ - pixel_y = 13 - }, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "orange" - }, -/area/almayer/living/port_emb) "fPu" = ( /obj/structure/bed/chair{ dir = 1 @@ -36484,6 +34185,13 @@ }, /turf/open/floor/plating, /area/almayer/medical/upper_medical) +"fQA" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/window/framed/almayer, +/turf/open/floor/plating, +/area/almayer/squads/delta) "fQF" = ( /obj/structure/surface/rack, /obj/item/storage/firstaid/regular, @@ -36501,15 +34209,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_f_p) -"fRr" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "blue" - }, -/area/almayer/command/cichallway) "fRC" = ( /obj/structure/bed/chair/comfy{ dir = 4 @@ -36523,6 +34222,21 @@ }, /turf/open/floor/almayer, /area/almayer/hull/upper_hull/u_f_s) +"fRY" = ( +/obj/structure/flora/pottedplant{ + desc = "It is made of Fiberbush(tm). It contains asbestos."; + icon_state = "pottedplant_22"; + name = "synthetic potted plant"; + pixel_y = 8 + }, +/obj/structure/machinery/alarm/almayer{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 9; + icon_state = "red" + }, +/area/almayer/squads/alpha) "fSl" = ( /obj/structure/machinery/line_nexter{ id = "line2"; @@ -36639,6 +34353,14 @@ "fUA" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/living/briefing) +"fVq" = ( +/obj/structure/machinery/cm_vending/sorted/medical{ + req_access = list(10) + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha) "fVz" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -36762,6 +34484,25 @@ icon_state = "redcorner" }, /area/almayer/shipboard/brig/processing) +"fYB" = ( +/turf/open/floor/almayer{ + dir = 8; + icon_state = "blue" + }, +/area/almayer/living/briefing) +"fYE" = ( +/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 = "plate" + }, +/area/almayer/squads/delta) "fYG" = ( /turf/open/floor/almayer{ dir = 10; @@ -36802,17 +34543,22 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_m_s) -"fZZ" = ( -/obj/effect/landmark/start/marine/medic/bravo, -/obj/effect/landmark/late_join/bravo, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/bravo) "gai" = ( /obj/structure/closet/firecloset, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_a_p) +"gaj" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "silver" + }, +/area/almayer/living/cryo_cells) "gaJ" = ( /turf/closed/wall/almayer, /area/almayer/shipboard/brig/cryo) @@ -36854,32 +34600,19 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) -"gbg" = ( -/obj/structure/sign/safety/terminal{ - pixel_x = 14; - pixel_y = 24 - }, -/obj/structure/sign/safety/laser{ - pixel_y = 24 - }, -/obj/structure/sign/safety/fibre_optics{ - pixel_x = 14; - pixel_y = 38 - }, -/obj/structure/sign/safety/rewire{ - pixel_y = 38 +"gbd" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/structure/machinery/door_control{ - id = "ARES Operations Right"; - name = "ARES Operations Shutter"; - pixel_x = -24; - pixel_y = -8; - req_one_access_txt = "90;91;92" +/obj/structure/sign/safety/hvac_old{ + pixel_x = 8; + pixel_y = 32 }, -/turf/open/floor/almayer/no_build{ - icon_state = "ai_floors" +/turf/open/floor/almayer{ + dir = 1; + icon_state = "silver" }, -/area/almayer/command/airoom) +/area/almayer/hallways/port_hallway) "gbs" = ( /obj/structure/surface/table/reinforced/black, /obj/item/ashtray/plastic{ @@ -36923,17 +34656,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_a_s) -"gcN" = ( -/obj/structure/machinery/door/airlock/almayer/command{ - name = "\improper Senior Enlisted Advisor's Office"; - req_access = null; - req_access_txt = "19;29"; - access_modified = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/shipboard/sea_office) "gcT" = ( /turf/open/floor/almayer{ dir = 4; @@ -37021,25 +34743,6 @@ "gel" = ( /turf/closed/wall/almayer/research/containment/wall/west, /area/almayer/medical/containment/cell/cl) -"ger" = ( -/obj/structure/surface/table/almayer, -/obj/item/paper_bin/wy{ - pixel_x = 6; - pixel_y = 5 - }, -/obj/item/tool/pen{ - pixel_x = 8 - }, -/obj/item/clipboard{ - pixel_x = -8 - }, -/obj/item/folder/white{ - pixel_x = -8 - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/almayer/medical/medical_science) "geH" = ( /obj/structure/machinery/camera/autoname/almayer{ name = "ship-grade camera" @@ -37085,19 +34788,18 @@ icon_state = "red" }, /area/almayer/shipboard/brig/general_equipment) +"gfe" = ( +/turf/open/floor/almayer{ + dir = 8; + icon_state = "cargo_arrow" + }, +/area/almayer/living/cryo_cells) "gfk" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_s) -"gfo" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 1; - name = "ship-grade camera" - }, -/turf/open/floor/almayer, -/area/almayer/squads/delta) "gfu" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -37139,6 +34841,15 @@ icon_state = "mono" }, /area/almayer/medical/medical_science) +"ggp" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N" + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "cargo_arrow" + }, +/area/almayer/hallways/port_hallway) "ggt" = ( /turf/open/floor/almayer{ dir = 5; @@ -37151,6 +34862,13 @@ icon_state = "dark_sterile" }, /area/almayer/medical/operating_room_four) +"ggC" = ( +/obj/structure/foamed_metal, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "cargo_arrow" + }, +/area/almayer/hallways/port_hallway) "ggJ" = ( /obj/structure/machinery/door_control{ dir = 1; @@ -37168,6 +34886,20 @@ /obj/structure/window/framed/almayer, /turf/open/floor/plating, /area/almayer/engineering/airmix) +"ghu" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/box/cups{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/box/donkpockets, +/obj/structure/machinery/power/apc/almayer{ + dir = 1 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/almayer/living/tankerbunks) "ghD" = ( /obj/structure/sign/safety/autoopenclose{ pixel_x = 7; @@ -37201,16 +34933,6 @@ icon_state = "silver" }, /area/almayer/command/cichallway) -"gip" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orange" - }, -/area/almayer/squads/bravo) "gir" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/engineering/engineering_workshop) @@ -37223,6 +34945,19 @@ icon_state = "blue" }, /area/almayer/hallways/aft_hallway) +"giK" = ( +/obj/structure/bed/chair/office/dark{ + dir = 8; + layer = 3.25 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/command/cic) "giZ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -37281,28 +35016,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_s) -"gjw" = ( -/obj/structure/machinery/faxmachine/uscm/command{ - density = 0; - department = "AI Core"; - pixel_y = 32 - }, -/obj/structure/surface/rack{ - density = 0; - pixel_y = 16 - }, -/obj/structure/machinery/computer/working_joe{ - dir = 8; - pixel_x = 17; - pixel_y = -6 - }, -/obj/item/storage/box/ids{ - pixel_x = -4 - }, -/turf/open/floor/almayer/no_build{ - icon_state = "ai_floors" - }, -/area/almayer/command/airoom) "gjB" = ( /obj/structure/machinery/light{ dir = 1 @@ -37351,6 +35064,17 @@ /obj/structure/largecrate/random/secure, /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_f_p) +"gkz" = ( +/obj/structure/filingcabinet{ + pixel_x = 8 + }, +/obj/structure/filingcabinet{ + pixel_x = -8 + }, +/turf/open/floor/almayer{ + icon_state = "greenfull" + }, +/area/almayer/command/cichallway) "gkK" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/surface/table/reinforced/almayer_B, @@ -37361,12 +35085,6 @@ icon_state = "plate" }, /area/almayer/command/cic) -"gll" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) "glr" = ( /obj/item/tool/warning_cone{ pixel_x = -20; @@ -37390,16 +35108,6 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/lower_medical_medbay) -"glB" = ( -/obj/structure/sign/safety/chem_lab{ - pixel_x = 5; - pixel_y = 29 - }, -/obj/structure/machinery/chem_master, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/medical/medical_science) "glM" = ( /obj/structure/window/reinforced{ dir = 8; @@ -37426,11 +35134,14 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) -"gnu" = ( -/obj/structure/surface/table/almayer, -/obj/item/facepaint/green, -/turf/open/floor/almayer, -/area/almayer/squads/charlie) +"gmu" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/hallways/port_hallway) "gnv" = ( /turf/open/floor/almayer{ dir = 5; @@ -37450,6 +35161,22 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_a_s) +"gnQ" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/firstaid/toxin{ + pixel_x = 8; + pixel_y = -2 + }, +/obj/item/storage/box/drinkingglasses{ + pixel_x = -7 + }, +/obj/item/storage/xeno_tag_case/full{ + pixel_y = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/corporateliason) "goj" = ( /obj/structure/machinery/door/poddoor/almayer/open{ dir = 2; @@ -37488,6 +35215,25 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) +"goP" = ( +/obj/structure/surface/table/almayer, +/obj/item/paper_bin/wy{ + pixel_x = 6; + pixel_y = 5 + }, +/obj/item/tool/pen{ + pixel_x = 8 + }, +/obj/item/clipboard{ + pixel_x = -8 + }, +/obj/item/folder/white{ + pixel_x = -8 + }, +/turf/open/floor/almayer{ + icon_state = "sterile_green_side" + }, +/area/almayer/medical/medical_science) "gpc" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/door/airlock/almayer/engineering{ @@ -37507,6 +35253,15 @@ icon_state = "test_floor4" }, /area/almayer/hallways/hangar) +"gpv" = ( +/obj/structure/surface/rack, +/obj/item/tool/weldingtool, +/obj/item/tool/wrench, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/port_hallway) "gpE" = ( /obj/structure/disposalpipe/segment, /obj/structure/sign/safety/distribution_pipes{ @@ -37527,6 +35282,21 @@ "gpY" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/lifeboat_pumps/north1) +"gqG" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/window/reinforced/toughened{ + dir = 4 + }, +/obj/structure/machinery/computer/shuttle/dropship/flight/remote_control{ + dir = 8; + name = "Alamo Remote Control Console"; + shuttleId = "dropship_alamo" + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/command/cic) "gqK" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -37556,6 +35326,12 @@ icon_state = "red" }, /area/almayer/shipboard/brig/main_office) +"grw" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer{ + icon_state = "blue" + }, +/area/almayer/squads/delta) "grG" = ( /obj/structure/sign/safety/restrictedarea{ pixel_x = -17 @@ -37565,12 +35341,6 @@ icon_state = "red" }, /area/almayer/shipboard/navigation) -"grR" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orangecorner" - }, -/area/almayer/living/briefing) "grX" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -37580,6 +35350,12 @@ icon_state = "plating" }, /area/almayer/hull/lower_hull/l_a_p) +"gsj" = ( +/obj/structure/machinery/cm_vending/clothing/medic/bravo, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/cryo_cells) "gsm" = ( /obj/structure/machinery/status_display{ pixel_x = -32 @@ -37588,6 +35364,20 @@ /obj/effect/landmark/late_join, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/cryo_cells) +"gsu" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "silverfull" + }, +/area/almayer/hallways/port_hallway) +"gsy" = ( +/turf/open/floor/almayer{ + dir = 8; + icon_state = "cargo_arrow" + }, +/area/almayer/squads/alpha) "gsH" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ dir = 1; @@ -37690,26 +35480,6 @@ icon_state = "plate" }, /area/almayer/shipboard/starboard_point_defense) -"guW" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/sign/prop3{ - pixel_x = 28 - }, -/obj/structure/machinery/light{ - dir = 4 - }, -/obj/item/clothing/mask/gas{ - pixel_y = 7 - }, -/obj/item/clothing/mask/gas{ - pixel_y = 3 - }, -/obj/item/storage/fancy/candle_box{ - pixel_x = 6; - pixel_y = -2 - }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) "gvq" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = -25 @@ -37804,6 +35574,17 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_a_s) +"gwM" = ( +/obj/structure/surface/table/almayer, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/item/toy/deck{ + pixel_x = 8; + pixel_y = 8 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/delta) "gwO" = ( /obj/structure/pipes/vents/pump, /obj/structure/mirror{ @@ -37935,24 +35716,12 @@ icon_state = "green" }, /area/almayer/hallways/aft_hallway) -"gyC" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 8; - name = "ship-grade camera" - }, -/obj/structure/sign/safety/two{ - pixel_x = 32; - pixel_y = -8 - }, -/obj/structure/sign/safety/ammunition{ - pixel_x = 32; - pixel_y = 7 - }, +"gyA" = ( /turf/open/floor/almayer{ - dir = 4; - icon_state = "orange" + dir = 1; + icon_state = "cargo_arrow" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/living/cryo_cells) "gyN" = ( /obj/structure/machinery/prop{ desc = "It's a server box..."; @@ -37972,6 +35741,15 @@ icon_state = "orange" }, /area/almayer/engineering/ce_room) +"gyU" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "silvercorner" + }, +/area/almayer/hallways/port_hallway) "gzn" = ( /obj/structure/machinery/landinglight/ds2/delaytwo{ dir = 8 @@ -38033,6 +35811,15 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/morgue) +"gzO" = ( +/obj/structure/machinery/cryopod{ + layer = 3.1; + pixel_y = 13 + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/hallways/port_hallway) "gzV" = ( /obj/structure/sink{ dir = 1; @@ -38048,26 +35835,6 @@ }, /turf/open/floor/almayer, /area/almayer/hull/upper_hull/u_f_p) -"gAe" = ( -/obj/structure/machinery/door_control{ - id = "ARES JoeCryo"; - name = "Working Joe Cryogenics Lockdown"; - pixel_x = 24; - pixel_y = 8; - req_one_access_txt = "91;92" - }, -/turf/open/floor/almayer/no_build{ - icon_state = "ai_floors" - }, -/area/almayer/command/airoom) -"gAj" = ( -/obj/structure/bed/chair/comfy/charlie{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "emeraldfull" - }, -/area/almayer/living/briefing) "gAl" = ( /obj/structure/machinery/light{ dir = 8 @@ -38091,30 +35858,18 @@ icon_state = "plate" }, /area/almayer/living/grunt_rnr) -"gAA" = ( -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/alpha_bravo_shared) +"gAR" = ( +/obj/structure/machinery/vending/cola, +/turf/open/floor/almayer{ + icon_state = "greenfull" + }, +/area/almayer/command/cichallway) "gAS" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ icon_state = "dark_sterile" }, /area/almayer/medical/medical_science) -"gBc" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/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 = "plate" - }, -/area/almayer/squads/bravo) "gBi" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -38130,6 +35885,15 @@ }, /turf/open/floor/almayer, /area/almayer/living/briefing) +"gBB" = ( +/obj/structure/surface/table/almayer, +/obj/item/reagent_container/food/condiment/hotsauce/sriracha{ + pixel_x = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "gCd" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -38151,6 +35915,15 @@ icon_state = "plate" }, /area/almayer/hallways/vehiclehangar) +"gCq" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/port_hallway) "gCw" = ( /obj/item/reagent_container/food/drinks/cans/beer{ pixel_x = 10 @@ -38194,19 +35967,14 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) +"gEd" = ( +/obj/effect/landmark/start/auxiliary_officer, +/turf/open/floor/wood/ship, +/area/almayer/living/auxiliary_officer_office) "gEg" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/offices/flight) -"gEo" = ( -/obj/structure/machinery/cryopod/right, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/squads/delta) "gEv" = ( /obj/structure/machinery/light{ dir = 1 @@ -38246,6 +36014,33 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_s) +"gFy" = ( +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/structure/machinery/disposal, +/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 = "plate" + }, +/area/almayer/hallways/port_hallway) +"gFF" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/delta{ + dir = 1; + req_one_access = list(18,19) + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/squads/delta) "gFG" = ( /obj/structure/surface/rack, /obj/effect/spawner/random/tool, @@ -38254,14 +36049,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_p) -"gGf" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/delta) "gGr" = ( /obj/structure/machinery/vending/cigarette, /turf/open/floor/almayer{ @@ -38321,6 +36108,20 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_lobby) +"gGN" = ( +/obj/structure/machinery/door_control{ + id = "ARES JoeCryo"; + name = "Working Joe Cryogenics Lockdown"; + pixel_x = -24; + pixel_y = -8; + req_one_access_txt = "91;92" + }, +/obj/effect/landmark/late_join/working_joe, +/obj/effect/landmark/start/working_joe, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) "gHg" = ( /obj/structure/machinery/light/small, /turf/open/floor/almayer{ @@ -38348,12 +36149,6 @@ icon_state = "plate" }, /area/almayer/command/cic) -"gHo" = ( -/obj/structure/machinery/door/airlock/almayer/marine/delta/tl, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/delta) "gHZ" = ( /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -38399,6 +36194,24 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_f_p) +"gJh" = ( +/obj/structure/machinery/camera/autoname/almayer{ + dir = 8; + name = "ship-grade camera" + }, +/obj/structure/sign/safety/ammunition{ + pixel_x = 32; + pixel_y = 7 + }, +/obj/structure/sign/safety/one{ + pixel_x = 32; + pixel_y = -8 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "green" + }, +/area/almayer/hallways/starboard_hallway) "gJq" = ( /obj/structure/surface/table/almayer, /obj/item/storage/box/mousetraps, @@ -38491,6 +36304,18 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/hydroponics) +"gLp" = ( +/obj/structure/bed/chair/comfy{ + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/living/bridgebunks) "gLu" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -38577,39 +36402,6 @@ icon_state = "test_floor4" }, /area/almayer/hull/upper_hull/u_m_p) -"gMN" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S"; - layer = 3.3 - }, -/obj/structure/machinery/door_control{ - id = "ARES Interior"; - indestructible = 1; - name = "ARES Chamber Lockdown"; - pixel_x = -24; - pixel_y = -8; - req_one_access_txt = "90;91;92" - }, -/obj/structure/machinery/door/poddoor/railing{ - closed_layer = 4.1; - density = 0; - dir = 2; - id = "ARES Railing"; - layer = 2.1; - open_layer = 2.1; - pixel_x = -1; - pixel_y = -1; - unacidable = 0; - unslashable = 0 - }, -/turf/open/floor/almayer/no_build{ - icon_state = "ai_floors" - }, -/area/almayer/command/airoom) "gMU" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -38631,17 +36423,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) -"gNq" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_ammo/squad{ - req_access = null; - req_one_access = null; - req_one_access_txt = "17;18;21"; - vend_x_offset = 0 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie_delta_shared) "gNx" = ( /obj/structure/surface/rack, /obj/effect/spawner/random/toolbox, @@ -38650,40 +36431,19 @@ /obj/effect/spawner/random/tool, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_p) -"gOs" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/structure/machinery/door_control{ - id = "ARES Interior"; - indestructible = 1; - name = "ARES Chamber Lockdown"; - pixel_x = 24; - pixel_y = 8; - req_one_access_txt = "90;91;92" - }, -/obj/structure/machinery/door/poddoor/railing{ - closed_layer = 4; - density = 0; - id = "ARES Railing"; - layer = 2.1; - open_layer = 2.1; - unacidable = 0; - unslashable = 0 - }, -/turf/open/floor/almayer/no_build{ - dir = 4; - icon_state = "silver" +"gNz" = ( +/turf/open/floor/almayer{ + dir = 1; + icon_state = "silvercorner" }, -/area/almayer/command/airoom) +/area/almayer/hallways/port_hallway) "gPc" = ( -/obj/structure/machinery/power/terminal{ - dir = 1 +/obj/structure/machinery/power/smes/buildable, +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, /turf/open/floor/almayer{ - dir = 9; - icon_state = "orange" + icon_state = "tcomms" }, /area/almayer/engineering/upper_engineering/starboard) "gPr" = ( @@ -38710,6 +36470,15 @@ icon_state = "orange" }, /area/almayer/hallways/stern_hallway) +"gQa" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "redcorner" + }, +/area/almayer/squads/alpha) "gQl" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/glass/bucket{ @@ -38752,6 +36521,15 @@ icon_state = "plate" }, /area/almayer/command/lifeboat) +"gQZ" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "bluecorner" + }, +/area/almayer/squads/delta) "gRd" = ( /obj/structure/platform, /obj/structure/target{ @@ -38760,6 +36538,18 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/hangar) +"gRl" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha) "gRn" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull) @@ -38942,12 +36732,28 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south1) -"gWE" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/landmark/start/marine/spec/alpha, -/obj/effect/landmark/late_join/alpha, +"gVW" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/alpha) +/area/almayer/hallways/port_hallway) +"gWm" = ( +/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) "gWG" = ( /obj/structure/window/framed/almayer/white, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -38965,6 +36771,44 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_p) +"gWU" = ( +/obj/structure/surface/table/almayer, +/obj/item/trash/USCMtray{ + layer = 3.2; + pixel_x = 4; + pixel_y = 17 + }, +/obj/item/reagent_container/food/drinks/cans/souto{ + pixel_x = -10; + pixel_y = 1 + }, +/obj/item/reagent_container/food/snacks/grown/orange{ + layer = 3.3; + pixel_x = 1; + pixel_y = 13 + }, +/obj/item/prop/magazine/book/starshiptroopers{ + pixel_x = 8; + pixel_y = -3 + }, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "blue" + }, +/area/almayer/living/port_emb) +"gXg" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "cargo_arrow" + }, +/area/almayer/squads/alpha) "gXh" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -39024,6 +36868,12 @@ icon_state = "orange" }, /area/almayer/engineering/lower_engineering) +"gYc" = ( +/obj/structure/target, +/turf/open/floor/almayer{ + icon_state = "bluefull" + }, +/area/almayer/hull/lower_hull/l_a_s) "gYe" = ( /obj/structure/machinery/vending/sea, /turf/open/floor/almayer{ @@ -39084,18 +36934,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_m_p) -"gZr" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/device/camera_film{ - pixel_x = 4; - pixel_y = -2 - }, -/obj/item/device/camera/siliconcam{ - pixel_x = -6; - pixel_y = 11 - }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) "gZw" = ( /obj/structure/bed/sofa/vert/grey/bot, /turf/open/floor/almayer, @@ -39181,20 +37019,24 @@ icon_state = "green" }, /area/almayer/hallways/port_hallway) -"hbu" = ( -/obj/structure/bed/chair{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "silver" - }, -/area/almayer/living/auxiliary_officer_office) "hbx" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/port_hallway) +"hbz" = ( +/obj/structure/pipes/vents/scrubber{ + dir = 8 + }, +/turf/open/floor/almayer, +/area/almayer/living/tankerbunks) +"hbF" = ( +/obj/structure/surface/table/almayer, +/obj/structure/pipes/vents/pump{ + dir = 1 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/auxiliary_officer_office) "hbI" = ( /obj/item/ammo_magazine/shotgun/buckshot, /obj/item/ammo_magazine/shotgun/buckshot, @@ -39264,21 +37106,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/vehiclehangar) -"hcw" = ( -/obj/structure/surface/table/reinforced/black, -/obj/item/explosive/grenade/high_explosive/training, -/obj/item/explosive/grenade/high_explosive/training, -/obj/item/explosive/grenade/high_explosive/training, -/obj/structure/machinery/door_control{ - id = "Firing_Range_1"; - name = "range shutters"; - pixel_x = 9; - pixel_y = 10 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/cryo_cells) "hcC" = ( /obj/structure/disposalpipe/up/almayer{ id = "almayerlink_OT_req" @@ -39293,6 +37120,10 @@ icon_state = "cargo" }, /area/almayer/squads/delta) +"hcY" = ( +/obj/structure/surface/table/almayer, +/turf/open/floor/almayer, +/area/almayer/squads/alpha) "hcZ" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/living/offices) @@ -39387,26 +37218,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_f_s) -"hfa" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera" - }, -/obj/structure/sign/safety/ammunition{ - pixel_x = 15; - pixel_y = 32 - }, -/obj/structure/sign/safety/hazard{ - pixel_y = 32 - }, -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha_bravo_shared) "hfk" = ( /obj/item/trash/crushed_cup, /turf/open/floor/almayer{ @@ -39600,33 +37411,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_p) -"hji" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "blue" - }, -/area/almayer/squads/delta) "hjk" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer{ icon_state = "test_floor4" }, /area/almayer/living/briefing) -"hjs" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "cargo_arrow" - }, -/area/almayer/squads/delta) "hjA" = ( /turf/open/floor/almayer{ dir = 10; @@ -39661,6 +37451,11 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/port_point_defense) +"hkE" = ( +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/tankerbunks) "hkG" = ( /obj/structure/sign/safety/ammunition{ pixel_y = -32 @@ -39746,6 +37541,10 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/hydroponics) +"hmx" = ( +/obj/structure/surface/table/almayer, +/turf/open/floor/almayer, +/area/almayer/squads/delta) "hmy" = ( /obj/structure/machinery/light{ dir = 1 @@ -39754,36 +37553,40 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"hmC" = ( -/obj/structure/machinery/cm_vending/sorted/marine_food{ - density = 0; - pixel_y = 16 +"hmz" = ( +/obj/structure/foamed_metal, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 2.5 }, -/obj/structure/machinery/light{ - dir = 8 +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/port_hallway) +"hmL" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/squads/delta) -"hmF" = ( -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, -/obj/structure/sign/poster{ - pixel_x = -32 +/area/almayer/squads/alpha) +"hmR" = ( +/obj/structure/machinery/cm_vending/gear/smartgun{ + pixel_y = -31; + density = 0 }, -/turf/open/floor/almayer{ - icon_state = "cargo_arrow" +/obj/structure/machinery/cm_vending/clothing/smartgun/delta{ + pixel_x = 31; + density = 0 }, -/area/almayer/squads/alpha_bravo_shared) -"hmS" = ( -/obj/structure/pipes/vents/pump, /turf/open/floor/almayer{ + dir = 4; icon_state = "blue" }, -/area/almayer/command/cichallway) +/area/almayer/squads/delta) "hng" = ( /obj/structure/surface/table/almayer, /obj/item/clothing/accessory/storage/black_vest/acid_harness, @@ -39799,6 +37602,14 @@ icon_state = "sterile_green" }, /area/almayer/medical/hydroponics) +"hnF" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper Mech Ops's Room" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "hnV" = ( /obj/structure/machinery/light, /turf/open/floor/almayer, @@ -39822,6 +37633,33 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/port_hallway) +"hos" = ( +/turf/open/floor/almayer{ + dir = 1; + icon_state = "cargo_arrow" + }, +/area/almayer/hallways/port_hallway) +"hoC" = ( +/obj/structure/machinery/door_control{ + id = "ARES JoeCryo"; + name = "Working Joe Cryogenics Lockdown"; + pixel_x = 24; + pixel_y = 8; + req_one_access_txt = "91;92" + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) +"hoJ" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/machinery/cm_vending/sorted/marine_food, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha) "hoX" = ( /obj/structure/machinery/light/small, /turf/open/floor/almayer{ @@ -39843,6 +37681,14 @@ icon_state = "red" }, /area/almayer/shipboard/weapon_room) +"hpx" = ( +/obj/structure/machinery/cryopod/right{ + pixel_y = 6 + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/hallways/port_hallway) "hpN" = ( /obj/structure/machinery/light, /obj/structure/machinery/computer/crew, @@ -39869,6 +37715,13 @@ }, /turf/open/floor/almayer, /area/almayer/living/chapel) +"hqc" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer{ + icon_state = "silverfull" + }, +/area/almayer/living/cryo_cells) "hqh" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -39910,23 +37763,6 @@ 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/biohazard/white{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/medical/medical_science) "hrF" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -39968,27 +37804,36 @@ "hsr" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/starboard) -"hss" = ( +"htb" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/squads/delta) -"hsW" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 +/area/almayer/engineering/upper_engineering/starboard) +"htd" = ( +/obj/structure/flora/pottedplant{ + desc = "It is made of Fiberbush(tm). It contains asbestos."; + icon_state = "pottedplant_22"; + name = "synthetic potted plant"; + pixel_y = 8 }, /turf/open/floor/almayer{ - dir = 9; - icon_state = "orange" + dir = 5; + icon_state = "red" + }, +/area/almayer/squads/alpha) +"htH" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/area/almayer/squads/bravo) -"htb" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 8; + icon_state = "cargo_arrow" }, -/area/almayer/engineering/upper_engineering/starboard) +/area/almayer/squads/alpha) "htI" = ( /obj/structure/platform_decoration{ dir = 1 @@ -40005,11 +37850,19 @@ icon_state = "greenfull" }, /area/almayer/living/offices) -"huK" = ( +"huA" = ( +/obj/vehicle/walker, +/obj/structure/platform{ + dir = 4 + }, +/obj/structure/platform{ + dir = 8; + layer = 2.7 + }, /turf/open/floor/almayer{ - icon_state = "redcorner" + icon_state = "cargo" }, -/area/almayer/living/cryo_cells) +/area/almayer/hallways/port_hallway) "huO" = ( /obj/structure/machinery/light{ dir = 4 @@ -40032,31 +37885,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, /area/almayer/hallways/port_hallway) -"hvv" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 - }, -/obj/item/clipboard{ - base_pixel_x = 20; - pixel_x = 5 - }, -/obj/item/paper{ - pixel_x = 5 - }, -/obj/item/tool/pen{ - pixel_x = 5 - }, -/obj/structure/surface/table/reinforced/black, -/obj/structure/transmitter/rotary{ - name = "CIC Reception Telephone"; - phone_category = "Command"; - phone_id = "CIC Reception"; - pixel_x = -7; - pixel_y = 4 - }, -/turf/open/floor/almayer, -/area/almayer/command/cic) "hvw" = ( /obj/structure/pipes/standard/simple/hidden/supply/no_boom, /turf/open/floor/plating, @@ -40077,6 +37905,18 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering) +"hwD" = ( +/obj/structure/machinery/cm_vending/gear/tl{ + density = 0; + pixel_x = -32; + vend_x_offset = 1 + }, +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) "hwQ" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -40093,19 +37933,6 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/chief_mp_office) -"hxe" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) -"hxm" = ( -/obj/item/paper_bin/uscm{ - pixel_y = 4 - }, -/obj/structure/surface/table/reinforced/black, -/turf/open/floor/almayer, -/area/almayer/command/cic) "hxp" = ( /obj/structure/surface/table/almayer, /obj/item/fuelCell, @@ -40120,6 +37947,14 @@ icon_state = "cargo" }, /area/almayer/engineering/engine_core) +"hxF" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "redcorner" + }, +/area/almayer/squads/alpha) "hxG" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -40129,6 +37964,14 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/starboard_missiles) +"hxI" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/squads/alpha) "hxZ" = ( /obj/structure/surface/rack, /obj/item/tool/shovel/spade{ @@ -40158,11 +38001,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/aft_hallway) -"hyk" = ( -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie_delta_shared) "hyw" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -40205,6 +38043,20 @@ "hyQ" = ( /turf/closed/wall/almayer, /area/almayer/living/synthcloset) +"hyV" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "cargo_arrow" + }, +/area/almayer/squads/delta) "hzb" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -40254,6 +38106,32 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/chief_mp_office) +"hzA" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/alpha) +"hzD" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + dir = 1; + name = "\improper Tanker Quarters"; + req_one_access_txt = "19;27" + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "Hangar Lockdown"; + name = "\improper Hangar Lockdown Blast Door" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/living/tankerbunks) "hzJ" = ( /obj/structure/machinery/door/airlock/almayer/generic{ dir = 1 @@ -40287,12 +38165,6 @@ icon_state = "test_floor4" }, /area/almayer/command/cic) -"hzM" = ( -/obj/structure/reagent_dispensers/fueltank, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/lower_hull/l_f_s) "hzP" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/power/apc/almayer{ @@ -40348,18 +38220,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) -"hAZ" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - icon_state = "blue" - }, -/area/almayer/squads/delta) "hBc" = ( /obj/structure/pipes/vents/scrubber{ dir = 4 @@ -40389,6 +38249,18 @@ /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) +"hBL" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "silvercorner" + }, +/area/almayer/hallways/port_hallway) "hBU" = ( /obj/structure/largecrate/random/secure, /obj/effect/decal/warning_stripes{ @@ -40437,6 +38309,16 @@ icon_state = "plate" }, /area/almayer/medical/lower_medical_medbay) +"hDj" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 8; + id = "bot_armory"; + name = "\improper Armory Shutters" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/command/cic) "hDw" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/emails{ @@ -40467,13 +38349,20 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_lobby) -"hEb" = ( -/obj/effect/landmark/start/marine/medic/bravo, -/obj/effect/landmark/late_join/bravo, +"hEm" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/storage/box/cups{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/reagent_container/spray/cleaner{ + pixel_x = 7; + pixel_y = 14 + }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "greenfull" }, -/area/almayer/squads/bravo) +/area/almayer/command/cichallway) "hEt" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/glass/bucket/mopbucket{ @@ -40586,6 +38475,16 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) +"hHA" = ( +/obj/structure/machinery/cm_vending/clothing/staff_officer{ + density = 0; + pixel_x = -30 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/living/bridgebunks) "hHJ" = ( /obj/structure/machinery/door/poddoor/shutters/almayer/open{ id = "vehicle1door"; @@ -40615,20 +38514,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_p) -"hII" = ( -/obj/structure/machinery/cm_vending/gear/tl{ - density = 0; - pixel_x = -32; - vend_x_offset = 1 - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "blue" - }, -/area/almayer/squads/delta) "hIL" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 4; @@ -40718,6 +38603,15 @@ icon_state = "red" }, /area/almayer/shipboard/brig/main_office) +"hKO" = ( +/obj/structure/pipes/vents/scrubber{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "silver" + }, +/area/almayer/living/port_emb) "hKQ" = ( /turf/open/floor/almayer{ icon_state = "cargo_arrow" @@ -40729,11 +38623,6 @@ icon_state = "plate" }, /area/almayer/living/grunt_rnr) -"hLI" = ( -/turf/open/floor/almayer{ - icon_state = "red" - }, -/area/almayer/living/cryo_cells) "hLO" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out"; @@ -40744,6 +38633,33 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/aft_hallway) +"hLQ" = ( +/obj/structure/blocker/invisible_wall, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/mob/living/silicon/decoy/ship_ai{ + layer = 2.98; + pixel_y = -16 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) +"hMg" = ( +/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 = "plate" + }, +/area/almayer/squads/alpha) "hMi" = ( /obj/structure/pipes/vents/scrubber, /turf/open/floor/almayer, @@ -40755,6 +38671,16 @@ icon_state = "green" }, /area/almayer/hallways/port_hallway) +"hMx" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "silver" + }, +/area/almayer/living/cryo_cells) "hMI" = ( /obj/structure/surface/table/almayer, /obj/item/device/binoculars, @@ -40771,13 +38697,30 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/operating_room_three) -"hNw" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 +"hMQ" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/bed/chair/comfy/delta{ + dir = 8 }, -/obj/structure/window/framed/almayer, -/turf/open/floor/plating, -/area/almayer/squads/charlie) +/turf/open/floor/almayer{ + icon_state = "bluefull" + }, +/area/almayer/living/briefing) +"hNz" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha) "hND" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 1 @@ -40794,6 +38737,18 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/main_office) +"hNF" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "redcorner" + }, +/area/almayer/squads/alpha) "hNL" = ( /obj/structure/machinery/firealarm{ pixel_y = 28 @@ -40809,15 +38764,18 @@ icon_state = "green" }, /area/almayer/hallways/port_hallway) -"hNM" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/stack/sheet/metal{ - layer = 2.9; - pixel_y = 6 +"hNY" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/device/whistle{ + pixel_y = 4 }, -/obj/item/tool/shovel/etool/folded, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) +/obj/structure/machinery/status_display{ + pixel_y = 30 + }, +/turf/open/floor/almayer{ + icon_state = "greenfull" + }, +/area/almayer/command/cichallway) "hOe" = ( /obj/structure/sign/safety/hazard{ pixel_x = 32; @@ -40831,6 +38789,23 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_a_p) +"hOD" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/medical/medical_science) "hOR" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -40860,13 +38835,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_p) -"hPh" = ( -/obj/structure/bed/chair/comfy, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "silver" - }, -/area/almayer/living/auxiliary_officer_office) "hPo" = ( /obj/structure/surface/rack, /obj/item/tool/wet_sign, @@ -40900,18 +38868,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_f_p) -"hQc" = ( -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "cargo_arrow" - }, -/area/almayer/squads/charlie_delta_shared) "hQU" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -40924,19 +38880,6 @@ icon_state = "plate" }, /area/almayer/medical/morgue) -"hQW" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/sign/safety/hvac_old{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/squads/alpha) "hQY" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -40957,12 +38900,6 @@ icon_state = "mono" }, /area/almayer/medical/medical_science) -"hRd" = ( -/obj/structure/machinery/vending/coffee, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha) "hRg" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/sign/safety/water{ @@ -40997,6 +38934,12 @@ icon_state = "redcorner" }, /area/almayer/shipboard/brig/execution) +"hRT" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer, +/area/almayer/command/corporateliason) "hRW" = ( /obj/effect/decal/warning_stripes{ icon_state = "S"; @@ -41072,14 +39015,11 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/repair_bay) -"hTc" = ( -/obj/structure/machinery/firealarm{ - pixel_y = 28 - }, +"hST" = ( /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "silverfull" }, -/area/almayer/squads/delta) +/area/almayer/hull/lower_hull/l_a_s) "hTf" = ( /obj/structure/machinery/portable_atmospherics/hydroponics, /turf/open/floor/almayer{ @@ -41205,6 +39145,10 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) +"hVs" = ( +/obj/structure/machinery/light, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/port_hallway) "hVz" = ( /obj/structure/machinery/light{ dir = 1 @@ -41248,11 +39192,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/hangar) -"hWr" = ( -/obj/effect/landmark/start/marine/smartgunner/bravo, -/obj/effect/landmark/late_join/bravo, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/bravo) "hWs" = ( /obj/structure/machinery/flasher_button{ id = "briefing_flash"; @@ -41266,6 +39205,21 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/briefing) +"hWx" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/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 = "plate" + }, +/area/almayer/hallways/port_hallway) "hWJ" = ( /obj/structure/largecrate/random/case/small, /turf/open/floor/almayer{ @@ -41273,45 +39227,44 @@ icon_state = "red" }, /area/almayer/shipboard/weapon_room) -"hWO" = ( -/obj/structure/pipes/vents/scrubber, +"hWK" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/toolbox/mechanical{ + pixel_x = 1; + pixel_y = 7 + }, +/obj/item/storage/toolbox/emergency{ + pixel_x = -3 + }, /turf/open/floor/almayer{ dir = 1; - icon_state = "blue" + icon_state = "red" }, -/area/almayer/command/cichallway) +/area/almayer/squads/alpha) "hWU" = ( /obj/structure/largecrate/random/barrel/blue, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_s) -"hXb" = ( +"hXr" = ( /turf/open/floor/almayer{ - dir = 1; - icon_state = "cargo_arrow" - }, -/area/almayer/squads/charlie_delta_shared) -"hXd" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/ammo_box/magazine/misc/mre{ - pixel_x = 4; - pixel_y = 15 + dir = 5; + icon_state = "plating" }, -/obj/item/storage/box/wy_mre{ - pixel_x = 5; - pixel_y = 2 +/area/almayer/living/numbertwobunks) +"hXs" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/obj/item/tool/kitchen/utensil/pfork{ - pixel_x = -8; - pixel_y = 7 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/item/tool/kitchen/utensil/pfork{ - pixel_x = -7; - pixel_y = 8 +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + icon_state = "red" }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) +/area/almayer/squads/alpha) "hXY" = ( /turf/open/floor/almayer{ dir = 4; @@ -41334,6 +39287,12 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_p) +"hYe" = ( +/obj/structure/machinery/power/apc/almayer, +/turf/open/floor/almayer{ + icon_state = "blue" + }, +/area/almayer/squads/delta) "hYn" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -41352,6 +39311,13 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/hangar) +"hZb" = ( +/obj/structure/platform, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/living/briefing) "hZj" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -41412,30 +39378,43 @@ }, /turf/open/floor/carpet, /area/almayer/command/corporateliason) -"ial" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +"iar" = ( +/obj/structure/machinery/light, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1 }, -/obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera" +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" +/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 }, -/area/almayer/squads/alpha) -"iaq" = ( -/obj/structure/machinery/vending/cola, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 8; + icon_state = "cargo_arrow" }, -/area/almayer/squads/bravo) +/area/almayer/squads/delta) "iat" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/port) +"iav" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "cargo_arrow" + }, +/area/almayer/squads/alpha) "iaF" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -41453,6 +39432,15 @@ icon_state = "red" }, /area/almayer/command/lifeboat) +"iba" = ( +/obj/structure/sign/safety/distribution_pipes{ + pixel_x = 32 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "green" + }, +/area/almayer/hallways/starboard_hallway) "ibc" = ( /obj/structure/machinery/conveyor_switch{ id = "req_belt" @@ -41507,6 +39495,14 @@ icon_state = "kitchen" }, /area/almayer/living/grunt_rnr) +"idB" = ( +/obj/structure/disposalpipe/junction{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "blue" + }, +/area/almayer/hallways/port_hallway) "idX" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/prison{ @@ -41578,6 +39574,15 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/lower_medical_lobby) +"ieC" = ( +/obj/structure/machinery/cm_vending/clothing/medic/alpha{ + density = 0; + pixel_y = 28 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha) "ieF" = ( /obj/effect/projector{ name = "Almayer_AresUp"; @@ -41606,13 +39611,6 @@ }, /turf/open/floor/almayer, /area/almayer/living/briefing) -"ifb" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/vehicle_crew{ - density = 0; - pixel_y = 16 - }, -/turf/open/floor/almayer, -/area/almayer/living/tankerbunks) "iff" = ( /obj/structure/sign/safety/reception{ pixel_x = 32; @@ -41623,6 +39621,14 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/north1) +"ifC" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_10" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/tankerbunks) "ifR" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -41673,6 +39679,27 @@ icon_state = "red" }, /area/almayer/shipboard/brig/main_office) +"igD" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 2 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) +"igY" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/squads/alpha) "ihn" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/drinks/cans/souto/blue{ @@ -41688,18 +39715,6 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/lower_medical_medbay) -"ihM" = ( -/obj/structure/machinery/cm_vending/clothing/marine/delta{ - density = 0; - pixel_y = 16 - }, -/obj/structure/sign/safety/cryo{ - pixel_x = 32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/delta) "ihX" = ( /obj/structure/machinery/status_display{ pixel_y = -30 @@ -41708,12 +39723,6 @@ icon_state = "red" }, /area/almayer/command/lifeboat) -"ihY" = ( -/obj/structure/machinery/door/airlock/almayer/marine/bravo/spec, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/bravo) "iid" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 2; @@ -41725,31 +39734,17 @@ icon_state = "test_floor4" }, /area/almayer/hull/upper_hull/u_m_p) +"iif" = ( +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/hallways/port_hallway) "iit" = ( /obj/effect/landmark/ert_spawns/distress_cryo, /obj/effect/landmark/late_join, /obj/effect/landmark/start/reporter, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/cryo_cells) -"iiz" = ( -/obj/structure/surface/rack, -/obj/item/reagent_container/food/drinks/bottle/sake{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/reagent_container/food/drinks/bottle/sake{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/reagent_container/food/drinks/bottle/sake, -/obj/item/reagent_container/food/drinks/bottle/sake{ - pixel_x = -4 - }, -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/corporateliason) "iiC" = ( /obj/structure/sign/safety/maint{ pixel_x = 8; @@ -41766,10 +39761,13 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_s) -"iiZ" = ( -/obj/structure/machinery/cm_vending/sorted/marine_food, +"ijd" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/chem_dispenser/soda{ + pixel_y = 5 + }, /turf/open/floor/almayer{ - icon_state = "bluefull" + icon_state = "greenfull" }, /area/almayer/command/cichallway) "ije" = ( @@ -41828,6 +39826,29 @@ }, /turf/open/floor/wood/ship, /area/almayer/shipboard/sea_office) +"ijR" = ( +/obj/structure/platform{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) +"ijS" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/delta) "ijU" = ( /obj/item/tool/wet_sign, /turf/open/floor/plating/plating_catwalk, @@ -41891,12 +39912,10 @@ /obj/structure/bed/chair, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) -"ilZ" = ( -/obj/effect/spawner/random/toolbox, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/lower_hull/l_a_s) +"imf" = ( +/obj/structure/supply_drop/alpha, +/turf/open/floor/plating, +/area/almayer/squads/req) "imo" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -41972,17 +39991,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_p) -"iow" = ( -/obj/structure/machinery/cm_vending/sorted/attachments/squad{ - req_access = null; - req_one_access = null; - req_one_access_txt = "15;16;21"; - vend_y_offset = 0 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha_bravo_shared) "ioU" = ( /turf/closed/wall/almayer, /area/almayer/command/securestorage) @@ -42013,14 +40021,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_s) -"ipE" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "orangefull" - }, -/area/almayer/squads/alpha_bravo_shared) "ipK" = ( /obj/structure/largecrate/random/case/small, /turf/open/floor/almayer{ @@ -42072,16 +40072,6 @@ icon_state = "green" }, /area/almayer/squads/req) -"iqp" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - req_one_access = null; - req_one_access_txt = "37"; - access_modified = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/living/auxiliary_officer_office) "iqx" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -42220,45 +40210,12 @@ icon_state = "bluecorner" }, /area/almayer/hallways/aft_hallway) -"itf" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/structure/machinery/door_control{ - id = "ARES Interior"; - indestructible = 1; - name = "ARES Chamber Lockdown"; - pixel_x = -24; - pixel_y = 8; - req_one_access_txt = "90;91;92" - }, -/obj/structure/machinery/door/poddoor/railing{ - closed_layer = 4; - density = 0; - id = "ARES Railing"; - layer = 2.1; - open_layer = 2.1; - unacidable = 0; - unslashable = 0 - }, -/turf/open/floor/almayer/no_build{ - dir = 8; - icon_state = "silver" - }, -/area/almayer/command/airoom) "itR" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south2) -"itX" = ( -/obj/structure/machinery/vending/coffee, -/turf/open/floor/almayer{ - icon_state = "bluefull" - }, -/area/almayer/command/cichallway) "iub" = ( /obj/structure/machinery/light{ dir = 4 @@ -42351,32 +40308,30 @@ icon_state = "orange" }, /area/almayer/hallways/hangar) -"ivs" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) "ivz" = ( /obj/structure/closet, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/living/port_emb) +"ivA" = ( +/obj/structure/machinery/cm_vending/clothing/vehicle_crew, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/tankerbunks) "ivB" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ icon_state = "test_floor4" }, /area/almayer/hallways/port_hallway) -"ivM" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, +"ivC" = ( +/obj/structure/machinery/vending/coffee, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/squads/delta) +/area/almayer/hallways/port_hallway) "iwh" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -42445,15 +40400,6 @@ icon_state = "test_floor4" }, /area/almayer/hallways/stern_hallway) -"ixD" = ( -/obj/structure/machinery/light, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/delta) "ixN" = ( /obj/structure/largecrate, /obj/item/folded_tent/reqs{ @@ -42477,6 +40423,18 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/req) +"ixX" = ( +/obj/structure/bed/chair/comfy{ + dir = 8 + }, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/living/captain_mess) "iyq" = ( /obj/structure/machinery/door/poddoor/shutters/almayer/open{ dir = 2; @@ -42511,18 +40469,6 @@ icon_state = "plating" }, /area/almayer/hull/lower_hull/l_f_s) -"iyS" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 1; - name = "ship-grade camera" - }, -/turf/open/floor/almayer{ - icon_state = "blue" - }, -/area/almayer/squads/delta) "izk" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -42594,14 +40540,13 @@ icon_state = "orange" }, /area/almayer/hallways/stern_hallway) -"iAT" = ( -/obj/structure/sign/safety/south{ - pixel_x = -17; - pixel_y = 8 +"iAO" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/open/floor/almayer{ dir = 8; - icon_state = "blue" + icon_state = "cargo_arrow" }, /area/almayer/hallways/port_hallway) "iBt" = ( @@ -42644,6 +40589,17 @@ icon_state = "red" }, /area/almayer/hallways/aft_hallway) +"iCi" = ( +/obj/structure/machinery/cm_vending/gear/tl{ + density = 0; + pixel_x = -32; + vend_x_offset = 1 + }, +/turf/open/floor/almayer{ + dir = 9; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) "iCu" = ( /obj/structure/machinery/door/poddoor/almayer/open{ dir = 4; @@ -42676,12 +40632,27 @@ icon_state = "green" }, /area/almayer/living/offices) +"iCM" = ( +/obj/structure/machinery/cm_vending/gear/engi, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/cryo_cells) "iDd" = ( /obj/structure/machinery/door/poddoor/railing{ id = "vehicle_elevator_railing_aux" }, /turf/open/floor/almayer, /area/almayer/hallways/vehiclehangar) +"iDk" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) "iDm" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -42698,17 +40669,37 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_f_s) +"iDX" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/squads/delta) +"iDZ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 2 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "iEb" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/port_hallway) -"iEg" = ( +"iEi" = ( +/obj/structure/surface/table/almayer, /turf/open/floor/almayer{ - dir = 9; - icon_state = "silver" + icon_state = "dark_sterile" }, +/area/almayer/medical/medical_science) +"iEn" = ( +/obj/structure/bed/chair/office/dark, +/turf/open/floor/almayer, /area/almayer/living/auxiliary_officer_office) "iEr" = ( /obj/structure/pipes/standard/simple/hidden/supply{ @@ -42724,6 +40715,32 @@ icon_state = "test_floor4" }, /area/almayer/hull/upper_hull/u_a_p) +"iEG" = ( +/obj/structure/barricade/plasteel/metal, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/turf/open/floor/almayer{ + icon_state = "cargo_arrow" + }, +/area/almayer/hallways/port_hallway) +"iEK" = ( +/turf/open/floor/almayer{ + icon_state = "greencorner" + }, +/area/almayer/hallways/port_hallway) +"iET" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + icon_state = "blue" + }, +/area/almayer/squads/delta) "iFc" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -42811,6 +40828,15 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_s) +"iGF" = ( +/obj/structure/sign/safety/distribution_pipes{ + pixel_x = -17 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) "iGK" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -42855,6 +40881,10 @@ icon_state = "cargo" }, /area/almayer/shipboard/brig/cells) +"iHH" = ( +/obj/structure/largecrate/random/barrel/red, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/lower_hull/l_a_s) "iHO" = ( /obj/structure/pipes/vents/scrubber{ dir = 1 @@ -42876,6 +40906,20 @@ icon_state = "kitchen" }, /area/almayer/living/grunt_rnr) +"iIo" = ( +/obj/structure/bed/stool, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "silver" + }, +/area/almayer/living/port_emb) +"iIO" = ( +/obj/structure/supply_drop/delta, +/turf/open/floor/plating, +/area/almayer/squads/req) "iIP" = ( /obj/structure/toilet{ pixel_y = 16 @@ -42890,17 +40934,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/port_emb) -"iIR" = ( -/obj/structure/surface/table/almayer, -/obj/item/trash/USCMtray{ - pixel_y = 7 - }, -/obj/item/reagent_container/food/condiment/hotsauce/cholula{ - pixel_x = 10; - pixel_y = 22 - }, -/turf/open/floor/almayer, -/area/almayer/squads/bravo) "iIY" = ( /obj/structure/closet/emcloset, /turf/open/floor/almayer{ @@ -42911,6 +40944,12 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_s) +"iJq" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/starboard_hallway) "iJB" = ( /obj/structure/sign/safety/galley{ pixel_x = 8; @@ -42920,17 +40959,18 @@ icon_state = "silver" }, /area/almayer/command/cichallway) -"iJS" = ( -/obj/structure/machinery/cm_vending/gear/tl{ - density = 0; - pixel_x = -32; - vend_x_offset = 1 +"iJG" = ( +/obj/structure/sign/prop1{ + pixel_x = 32; + pixel_y = 2 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 }, /turf/open/floor/almayer{ - dir = 10; - icon_state = "blue" + icon_state = "test_floor4" }, -/area/almayer/squads/delta) +/area/almayer/hallways/starboard_hallway) "iKa" = ( /obj/structure/sink{ dir = 1; @@ -43034,14 +41074,6 @@ /obj/structure/machinery/computer/disk_reader, /turf/open/floor/almayer, /area/almayer/command/computerlab) -"iLh" = ( -/obj/structure/bed/chair/comfy/bravo{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "orangefull" - }, -/area/almayer/living/briefing) "iLq" = ( /obj/structure/pipes/vents/scrubber{ dir = 1 @@ -43066,30 +41098,40 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/lower_medical_lobby) +"iLK" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) "iLO" = ( /turf/open/floor/almayer{ dir = 4; icon_state = "silver" }, /area/almayer/command/computerlab) -"iLQ" = ( -/obj/structure/machinery/light{ - dir = 8 +"iLR" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/structure/machinery/firealarm{ + pixel_y = 28 }, /turf/open/floor/almayer{ dir = 8; - icon_state = "orangecorner" + icon_state = "cargo_arrow" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/port_hallway) "iMm" = ( /turf/open/floor/almayer, /area/almayer/living/grunt_rnr) -"iMr" = ( -/obj/structure/machinery/cryopod/right, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/squads/bravo) "iMx" = ( /obj/structure/platform{ dir = 1 @@ -43133,6 +41175,41 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cells) +"iOZ" = ( +/obj/structure/machinery/cm_vending/clothing/tl/alpha{ + density = 0; + pixel_x = 32 + }, +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/squads/alpha) +"iPs" = ( +/obj/structure/machinery/vending/cigarette{ + density = 0; + pixel_x = -5; + pixel_y = 16 + }, +/obj/structure/reagent_dispensers/water_cooler/stacks{ + density = 0; + pixel_x = 13; + pixel_y = 15 + }, +/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 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/squads/alpha) "iPv" = ( /obj/structure/bed/chair/comfy, /obj/structure/window/reinforced/ultra, @@ -43167,31 +41244,6 @@ allow_construction = 0 }, /area/almayer/shipboard/brig/lobby) -"iQi" = ( -/obj/structure/disposalpipe/junction, -/obj/structure/pipes/standard/simple/hidden/supply, -/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/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 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) "iQj" = ( /obj/structure/ladder{ height = 2; @@ -43201,25 +41253,6 @@ icon_state = "plate" }, /area/almayer/command/cichallway) -"iQt" = ( -/obj/structure/largecrate/random/case/small, -/obj/item/toy/deck{ - pixel_x = -6; - pixel_y = 6 - }, -/obj/structure/sign/poster{ - desc = "One of those hot, tanned babes back the beaches of good ol' Earth."; - icon_state = "poster12"; - name = "Beach Babe Pinup"; - pixel_x = -30; - pixel_y = 6; - serial_number = 12 - }, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "emerald" - }, -/area/almayer/living/port_emb) "iQx" = ( /obj/structure/machinery/light{ dir = 1 @@ -43242,6 +41275,17 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_s) +"iQP" = ( +/obj/structure/surface/table/almayer, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/item/toy/deck{ + pixel_x = 8; + pixel_y = 8 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/port_hallway) "iRr" = ( /obj/structure/machinery/light{ dir = 1 @@ -43261,6 +41305,49 @@ /obj/structure/pipes/vents/pump/on, /turf/open/floor/almayer, /area/almayer/living/gym) +"iRA" = ( +/obj/item/toy/farwadoll{ + desc = "A USCM approved plush doll. It's not soft and hardly comforting!"; + force = 15; + icon_state = "therapyred"; + layer = 4.1; + name = "Sergeant Huggs"; + pixel_y = 15; + throwforce = 15 + }, +/obj/item/clothing/head/cmcap{ + layer = 4.1; + pixel_x = -1; + pixel_y = 22 + }, +/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{ + layer = 3.1 + }, +/obj/item/bedsheet/brown{ + pixel_y = 13 + }, +/turf/open/floor/almayer{ + icon_state = "silver" + }, +/area/almayer/living/port_emb) "iRN" = ( /obj/structure/machinery/light/containment{ dir = 4 @@ -43281,17 +41368,27 @@ /obj/item/trash/chips, /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_f_p) -"iSZ" = ( +"iSd" = ( +/turf/open/floor/almayer{ + dir = 6; + icon_state = "red" + }, +/area/almayer/living/gym) +"iSo" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + icon_state = "red" }, -/obj/structure/surface/table/almayer, -/obj/item/facepaint/black, -/turf/open/floor/plating/plating_catwalk, /area/almayer/squads/alpha) +"iSv" = ( +/obj/structure/bed/chair/wheelchair, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/medical/lower_medical_medbay) "iTf" = ( /obj/structure/closet/crate/trashcart, /obj/item/clothing/gloves/yellow, @@ -43305,14 +41402,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_p) -"iTw" = ( -/obj/structure/bed/chair/comfy{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "bluefull" - }, -/area/almayer/living/bridgebunks) "iTz" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -43325,10 +41414,16 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_p) -"iTD" = ( -/obj/effect/landmark/start/auxiliary_officer, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/bridgebunks) +"iTC" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/delta{ + dir = 1; + req_one_access = list(15,18,19) + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/squads/delta) "iTI" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -43348,6 +41443,11 @@ icon_state = "silver" }, /area/almayer/hallways/aft_hallway) +"iTL" = ( +/turf/open/floor/almayer{ + icon_state = "silverfull" + }, +/area/almayer/hallways/port_hallway) "iTN" = ( /obj/item/stool{ pixel_x = -15; @@ -43355,6 +41455,12 @@ }, /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_f_p) +"iUl" = ( +/obj/structure/machinery/cm_vending/gear/medic, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "iUo" = ( /obj/structure/sign/safety/terminal{ pixel_x = 7; @@ -43445,16 +41551,6 @@ }, /turf/open/floor/carpet, /area/almayer/living/commandbunks) -"iWc" = ( -/obj/structure/surface/table/almayer, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/squads/delta) "iWd" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -43508,10 +41604,20 @@ icon_state = "red" }, /area/almayer/shipboard/brig/processing) -"iXT" = ( -/obj/item/trash/uscm_mre, +"iXG" = ( +/obj/structure/machinery/cm_vending/clothing/tl/bravo, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/cryo_cells) +"iXM" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/donut_box{ + pixel_x = 6; + pixel_y = 6 + }, /turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) +/area/almayer/hallways/port_hallway) "iXU" = ( /obj/structure/machinery/light{ dir = 8 @@ -43531,15 +41637,6 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/lower_medical_lobby) -"iYe" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "silver" - }, -/area/almayer/living/auxiliary_officer_office) "iYf" = ( /obj/structure/machinery/cm_vending/clothing/medical_crew{ density = 0; @@ -43606,6 +41703,13 @@ }, /turf/open/floor/almayer, /area/almayer/command/lifeboat) +"iZr" = ( +/obj/structure/machinery/camera/autoname/almayer{ + dir = 1; + name = "ship-grade camera" + }, +/turf/open/floor/almayer, +/area/almayer/squads/alpha) "iZw" = ( /obj/effect/step_trigger/teleporter_vector{ name = "Almayer_AresUp"; @@ -43628,15 +41732,6 @@ /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/plating, /area/almayer/shipboard/brig/chief_mp_office) -"iZH" = ( -/obj/structure/sign/safety/distribution_pipes{ - pixel_x = -17 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "emerald" - }, -/area/almayer/hallways/port_hallway) "iZP" = ( /obj/structure/platform{ dir = 8 @@ -43753,6 +41848,15 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south2) +"jby" = ( +/obj/structure/machinery/firealarm{ + pixel_y = 28 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/squads/delta) "jbB" = ( /obj/structure/sign/safety/nonpress_0g{ pixel_x = 32 @@ -43788,6 +41892,40 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) +"jbQ" = ( +/obj/structure/bed/chair{ + dir = 8; + pixel_y = 3 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + icon_state = "bluecorner" + }, +/area/almayer/hallways/port_hallway) +"jbW" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/cameras/hangar{ + dir = 1; + pixel_x = -7; + pixel_y = -8 + }, +/obj/item/device/radio/intercom/alamo{ + layer = 2.9; + pixel_y = -4; + pixel_x = 9 + }, +/turf/open/floor/almayer, +/area/almayer/living/auxiliary_officer_office) "jbX" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -43830,20 +41968,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/port_umbilical) -"jdm" = ( -/obj/structure/surface/table/almayer, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/item/trash/USCMtray, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "blue" - }, -/area/almayer/squads/delta) "jdy" = ( /obj/structure/sign/safety/autoopenclose{ pixel_x = 7; @@ -43861,6 +41985,16 @@ icon_state = "dark_sterile" }, /area/almayer/medical/operating_room_three) +"jdI" = ( +/obj/structure/machinery/light, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "redcorner" + }, +/area/almayer/squads/alpha) "jea" = ( /obj/structure/sign/safety/autoopenclose{ pixel_y = 32 @@ -43871,9 +42005,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_a_p) -"jeb" = ( -/turf/closed/wall/almayer, -/area/almayer/squads/alpha_bravo_shared) +"jeg" = ( +/obj/structure/machinery/cm_vending/clothing/specialist/delta, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "jeq" = ( /obj/structure/surface/rack, /obj/item/storage/box/pillbottles{ @@ -43889,12 +42026,12 @@ icon_state = "mono" }, /area/almayer/medical/hydroponics) -"jew" = ( -/obj/structure/surface/table/reinforced/black, -/turf/open/floor/almayer{ - icon_state = "red" +"jex" = ( +/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep{ + req_access = list(1) }, -/area/almayer/living/cryo_cells) +/turf/open/floor/wood/ship, +/area/almayer/living/auxiliary_officer_office) "jez" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 8; @@ -43923,13 +42060,6 @@ icon_state = "plating_striped" }, /area/almayer/squads/req) -"jeQ" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, -/turf/open/floor/almayer{ - dir = 6; - icon_state = "red" - }, -/area/almayer/living/cryo_cells) "jeU" = ( /obj/structure/largecrate/random/secure, /turf/open/floor/almayer{ @@ -44032,14 +42162,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/port_emb) -"jgl" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - name = "Bathroom" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/living/auxiliary_officer_office) "jgu" = ( /obj/structure/sink{ dir = 4; @@ -44072,12 +42194,6 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/north1) -"jgJ" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "blue" - }, -/area/almayer/command/cichallway) "jgM" = ( /obj/structure/surface/table/almayer, /turf/open/floor/almayer{ @@ -44103,15 +42219,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/operating_room_four) -"jht" = ( -/obj/structure/machinery/vending/coffee{ - density = 0; - pixel_y = 16 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) "jhx" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -44134,12 +42241,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_p) -"jhD" = ( -/obj/structure/machinery/firealarm{ - pixel_y = -28 - }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) "jhW" = ( /obj/structure/machinery/cryopod/right, /turf/open/floor/almayer{ @@ -44164,6 +42265,12 @@ icon_state = "plate" }, /area/almayer/hallways/port_hallway) +"jiW" = ( +/obj/structure/machinery/cm_vending/clothing/marine/alpha, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha) "jiX" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -44230,6 +42337,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/port_hallway) +"jjX" = ( +/obj/structure/closet/fireaxecabinet{ + pixel_x = -31 + }, +/turf/open/floor/almayer, +/area/almayer/living/auxiliary_officer_office) "jjZ" = ( /obj/structure/machinery/light{ dir = 4 @@ -44267,16 +42380,6 @@ icon_state = "plate" }, /area/almayer/medical/morgue) -"jks" = ( -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 4; - id = "Firing_Range_2"; - name = "range shutters" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/turf/open/floor/plating, -/area/almayer/living/cryo_cells) "jkz" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/storage/box/handcuffs{ @@ -44368,10 +42471,6 @@ icon_state = "plate" }, /area/almayer/command/lifeboat) -"jmg" = ( -/obj/structure/largecrate/supply/ammo/shotgun, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/lower_hull/l_a_s) "jmK" = ( /turf/open/floor/almayer{ icon_state = "plate" @@ -44406,11 +42505,16 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_m_p) -"jmY" = ( +"jnb" = ( +/obj/structure/window/reinforced{ + dir = 4; + health = 80 + }, /turf/open/floor/almayer{ - icon_state = "blue" + dir = 1; + icon_state = "cargo_arrow" }, -/area/almayer/command/cichallway) +/area/almayer/hallways/port_hallway) "jnf" = ( /turf/open/floor/almayer{ dir = 1; @@ -44463,6 +42567,13 @@ /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/plating, /area/almayer/command/cic) +"joa" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/box/masks, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha) "jox" = ( /obj/structure/machinery/brig_cell/cell_3{ pixel_x = -32 @@ -44509,6 +42620,15 @@ }, /turf/open/floor/almayer, /area/almayer/living/gym) +"jpA" = ( +/obj/structure/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) "jpJ" = ( /obj/structure/bed/chair{ dir = 8 @@ -44531,6 +42651,19 @@ allow_construction = 0 }, /area/almayer/shipboard/brig/lobby) +"jqC" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/vents/pump{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) +"jqE" = ( +/obj/structure/foamed_metal, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "jqP" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ id = "ARES Interior"; @@ -44577,14 +42710,24 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) -"jss" = ( -/obj/structure/bed/chair/comfy{ - dir = 8 +"jrU" = ( +/obj/structure/bed/chair{ + dir = 8; + pixel_y = 3 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, /turf/open/floor/almayer{ - icon_state = "bluefull" + dir = 4; + icon_state = "silver" }, -/area/almayer/living/captain_mess) +/area/almayer/hallways/port_hallway) "jsx" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -44632,6 +42775,10 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/living/port_emb) +"juF" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/living/auxiliary_officer_office) "juN" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/paper_bin/uscm, @@ -44668,31 +42815,6 @@ allow_construction = 0 }, /area/almayer/shipboard/brig/general_equipment) -"jvp" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply{ - pixel_y = -1 - }, -/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/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1; - pixel_y = 1 - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/alpha) "jvB" = ( /obj/effect/step_trigger/clone_cleaner, /turf/open/floor/almayer/no_build{ @@ -44738,13 +42860,15 @@ "jvY" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/command/telecomms) -"jwK" = ( -/obj/structure/disposalpipe/segment, +"jwP" = ( +/obj/structure/pipes/vents/scrubber{ + dir = 4 + }, /turf/open/floor/almayer{ dir = 1; icon_state = "red" }, -/area/almayer/squads/alpha_bravo_shared) +/area/almayer/squads/alpha) "jxi" = ( /obj/structure/machinery/sleep_console, /turf/open/floor/almayer{ @@ -44752,12 +42876,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) -"jxx" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie) "jxB" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/almayer/open{ @@ -44816,6 +42934,39 @@ "jAi" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/hallways/vehiclehangar) +"jAw" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/obj/structure/machinery/door_control{ + id = "ARES Interior"; + indestructible = 1; + name = "ARES Chamber Lockdown"; + pixel_x = -24; + pixel_y = -8; + req_one_access_txt = "90;91;92" + }, +/obj/structure/machinery/door/poddoor/railing{ + closed_layer = 4.1; + density = 0; + dir = 2; + id = "ARES Railing"; + layer = 2.1; + open_layer = 2.1; + pixel_x = -1; + pixel_y = -1; + unacidable = 0; + unslashable = 0 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) "jAz" = ( /obj/structure/platform, /obj/structure/platform{ @@ -44860,6 +43011,26 @@ icon_state = "test_floor4" }, /area/almayer/engineering/upper_engineering/port) +"jBb" = ( +/obj/structure/bed/chair{ + dir = 8; + pixel_y = 3 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) +"jBc" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4; + health = 80 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "cargo_arrow" + }, +/area/almayer/hallways/port_hallway) "jBy" = ( /obj/structure/machinery/light{ dir = 4 @@ -44909,6 +43080,24 @@ icon_state = "red" }, /area/almayer/shipboard/brig/main_office) +"jCB" = ( +/obj/structure/surface/table/almayer, +/obj/item/ashtray/glass{ + pixel_x = 6; + pixel_y = 4 + }, +/obj/item/ashtray/glass{ + pixel_x = -2; + pixel_y = 1 + }, +/obj/structure/pipes/vents/pump{ + dir = 1 + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer, +/area/almayer/living/auxiliary_officer_office) "jCK" = ( /obj/effect/decal/medical_decals{ icon_state = "triagedecalbottomleft"; @@ -44919,29 +43108,23 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_lobby) -"jDV" = ( -/obj/effect/projector{ - name = "Almayer_AresDown"; - vector_x = 97; - vector_y = -65 - }, -/obj/structure/platform{ - dir = 4 +"jCT" = ( +/obj/structure/disposalpipe/trunk{ + dir = 1 }, -/obj/structure/stairs{ - dir = 1; - icon_state = "ramptop" +/obj/structure/machinery/disposal, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, -/obj/structure/machinery/door_control{ - id = "ARES StairsUpper"; - name = "ARES Core Access"; - pixel_x = 24; - req_one_access_txt = "90;91;92" +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 }, -/turf/open/floor/almayer/no_build{ - icon_state = "ai_floors" +/turf/open/floor/almayer{ + icon_state = "plate" }, -/area/almayer/command/airoom) +/area/almayer/squads/delta) "jEs" = ( /obj/structure/surface/table/almayer, /obj/item/tool/screwdriver{ @@ -44954,6 +43137,12 @@ }, /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_f_p) +"jFb" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep/training, +/turf/open/floor/almayer{ + icon_state = "silverfull" + }, +/area/almayer/hull/lower_hull/l_a_s) "jFe" = ( /obj/structure/prop/holidays/string_lights{ pixel_y = 27 @@ -45011,6 +43200,15 @@ icon_state = "test_floor4" }, /area/almayer/hull/upper_hull/u_a_s) +"jGf" = ( +/obj/structure/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "orange" + }, +/area/almayer/engineering/upper_engineering/port) "jGn" = ( /obj/structure/machinery/light{ dir = 1 @@ -45038,15 +43236,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/port_hallway) -"jGR" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/delta) "jHe" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -45082,14 +43271,14 @@ }, /area/almayer/hallways/aft_hallway) "jHL" = ( -/obj/structure/machinery/light/small{ - dir = 8 +/obj/structure/machinery/power/terminal{ + dir = 1 }, /turf/open/floor/almayer{ - dir = 8; + dir = 10; icon_state = "orange" }, -/area/almayer/engineering/upper_engineering/port) +/area/almayer/engineering/upper_engineering/starboard) "jHQ" = ( /obj/structure/machinery/crema_switch{ pixel_x = -24; @@ -45117,6 +43306,17 @@ icon_state = "green" }, /area/almayer/hallways/port_hallway) +"jJh" = ( +/obj/structure/machinery/cryopod/right{ + pixel_y = 6 + }, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/hallways/port_hallway) "jJq" = ( /obj/structure/surface/rack, /obj/item/storage/firstaid/regular, @@ -45204,30 +43404,20 @@ icon_state = "green" }, /area/almayer/hallways/aft_hallway) -"jLj" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "cargo_arrow" - }, -/area/almayer/squads/charlie) "jLs" = ( /obj/structure/machinery/vending/cola, /turf/open/floor/prison{ icon_state = "kitchen" }, /area/almayer/living/captain_mess) -"jLK" = ( -/obj/structure/machinery/light{ - dir = 4 +"jLv" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep{ + req_one_access = list() }, /turf/open/floor/almayer{ - dir = 4; - icon_state = "emerald" + icon_state = "plate" }, -/area/almayer/hallways/port_hallway) +/area/almayer/squads/delta) "jMb" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -45238,20 +43428,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/port_hallway) -"jMi" = ( -/obj/structure/surface/table/almayer, -/obj/item/toy/deck{ - pixel_y = 14 - }, -/obj/item/trash/cigbutt/ucigbutt{ - layer = 3.7; - pixel_x = 5; - pixel_y = 8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/lower_hull/l_a_s) "jMm" = ( /obj/effect/spawner/random/tool, /turf/open/floor/almayer{ @@ -45365,28 +43541,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_s) -"jOi" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" - }, -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orangecorner" - }, -/area/almayer/squads/bravo) "jOk" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/line_nexter_control{ @@ -45423,18 +43577,6 @@ icon_state = "red" }, /area/almayer/shipboard/brig/processing) -"jOx" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) "jOG" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/firealarm{ @@ -45458,6 +43600,18 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering/starboard) +"jPv" = ( +/obj/structure/machinery/cm_vending/gear/tl, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/cryo_cells) +"jPT" = ( +/obj/structure/machinery/cm_vending/sorted/tech/tool_storage, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/command/cic) "jQt" = ( /turf/open/floor/almayer/research/containment/floor2{ dir = 8 @@ -45472,6 +43626,12 @@ icon_state = "orange" }, /area/almayer/hull/lower_hull/l_m_s) +"jQT" = ( +/obj/structure/disposalpipe/junction{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/port_hallway) "jRn" = ( /obj/structure/machinery/light/small, /obj/structure/largecrate/supply/supplies/mre, @@ -45492,6 +43652,11 @@ }, /turf/closed/wall/almayer/outer, /area/space) +"jRB" = ( +/turf/open/floor/almayer{ + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) "jRC" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -45525,17 +43690,6 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"jSp" = ( -/obj/structure/machinery/cm_vending/gear/tl{ - density = 0; - pixel_x = -32; - vend_x_offset = 1 - }, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "emerald" - }, -/area/almayer/squads/charlie) "jSw" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 1; @@ -45606,13 +43760,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_f_p) -"jTI" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "emerald" - }, -/area/almayer/squads/charlie_delta_shared) "jUb" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/toy/deck{ @@ -45710,19 +43857,6 @@ "jVa" = ( /turf/open/floor/almayer, /area/almayer/shipboard/brig/cells) -"jVr" = ( -/obj/structure/machinery/cm_vending/clothing/marine/alpha{ - density = 0; - layer = 4.1; - pixel_y = -29 - }, -/obj/structure/sign/safety/cryo{ - pixel_x = 32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha) "jVt" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -45762,6 +43896,30 @@ icon_state = "plate" }, /area/almayer/living/offices) +"jWC" = ( +/obj/structure/machinery/cm_vending/gear/spec, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/cryo_cells) +"jWS" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/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/door/firedoor/border_only/almayer{ + dir = 2 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/port_hallway) "jWU" = ( /obj/effect/step_trigger/clone_cleaner, /obj/structure/blocker/forcefield/multitile_vehicles, @@ -45769,6 +43927,42 @@ allow_construction = 0 }, /area/almayer/hallways/starboard_hallway) +"jXd" = ( +/obj/item/clothing/head/beret/centcom/captain{ + color = "#4b5320"; + desc = "Dusty beret bearing the logo of the royal marines. How did this get here?"; + name = "dusty beret"; + pixel_y = -6 + }, +/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{ + layer = 3.1 + }, +/obj/item/bedsheet/brown{ + pixel_y = 13 + }, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "silver" + }, +/area/almayer/living/port_emb) "jXf" = ( /obj/structure/machinery/door/airlock/almayer/medical{ id_tag = "or03"; @@ -45871,12 +44065,6 @@ /obj/structure/surface/table/reinforced/black, /turf/open/floor/carpet, /area/almayer/command/cichallway) -"jZv" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "emerald" - }, -/area/almayer/squads/charlie) "jZL" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/cameras/almayer_network{ @@ -45901,6 +44089,14 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_p) +"jZT" = ( +/obj/structure/sign/safety/cryo{ + pixel_x = 32 + }, +/turf/open/floor/almayer{ + icon_state = "cargo_arrow" + }, +/area/almayer/hallways/port_hallway) "jZU" = ( /obj/structure/machinery/power/apc/almayer{ dir = 1 @@ -45939,17 +44135,6 @@ icon_state = "silver" }, /area/almayer/hallways/aft_hallway) -"kaB" = ( -/obj/structure/machinery/cm_vending/gear/tl{ - density = 0; - pixel_x = -32; - vend_x_offset = 1 - }, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "red" - }, -/area/almayer/squads/alpha) "kaF" = ( /obj/effect/step_trigger/clone_cleaner, /obj/structure/blocker/forcefield/multitile_vehicles, @@ -45961,14 +44146,6 @@ allow_construction = 0 }, /area/almayer/hallways/starboard_hallway) -"kaI" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "bluefull" - }, -/area/almayer/squads/charlie_delta_shared) "kaN" = ( /obj/structure/platform{ dir = 1 @@ -45993,21 +44170,10 @@ icon_state = "plate" }, /area/almayer/command/combat_correspondent) -"kbc" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/shared/alpha_bravo/yellow{ - dir = 8 - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/bravo) +"kbk" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/cryo_cells) "kbx" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -46045,19 +44211,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/containment) -"kbV" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/floor/almayer, -/area/almayer/living/briefing) -"kcl" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/window/framed/almayer, -/turf/open/floor/plating, -/area/almayer/squads/bravo) "kcp" = ( /turf/closed/wall/almayer, /area/almayer/living/auxiliary_officer_office) @@ -46112,6 +44265,24 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_lobby) +"kev" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/toy/deck{ + desc = "A simple deck of playing cards. You could play Caravan with these!"; + pixel_y = 12 + }, +/obj/item/toy/deck/uno{ + pixel_x = 3; + pixel_y = 4 + }, +/obj/item/clothing/mask/cigarette{ + pixel_x = -2; + pixel_y = -2 + }, +/turf/open/floor/almayer{ + icon_state = "blue" + }, +/area/almayer/squads/delta) "keO" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -46127,12 +44298,15 @@ /turf/open/floor/almayer, /area/almayer/engineering/upper_engineering/starboard) "kff" = ( -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "red" +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/area/almayer/hallways/stern_hallway) +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + layer = 2.5 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/hangar) "kfp" = ( /obj/structure/sign/safety/distribution_pipes{ pixel_x = 8; @@ -46142,6 +44316,17 @@ icon_state = "plate" }, /area/almayer/hallways/starboard_hallway) +"kft" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/squads/alpha) "kfv" = ( /obj/structure/surface/table/almayer, /obj/item/stack/nanopaste{ @@ -46232,14 +44417,6 @@ /obj/structure/machinery/door/poddoor/almayer/biohazard/white, /turf/open/floor/plating, /area/almayer/medical/medical_science) -"khd" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie_delta_shared) "khD" = ( /turf/open/floor/almayer{ icon_state = "plate" @@ -46311,65 +44488,12 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) -"kiU" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - icon_state = "orange" - }, -/area/almayer/squads/bravo) -"kiV" = ( -/obj/structure/surface/table/almayer, -/obj/item/reagent_container/food/condiment/hotsauce/tabasco{ - pixel_x = 11 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/squads/alpha) "kjN" = ( /obj/structure/machinery/power/apc/almayer{ dir = 4 }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/surgery) -"kjV" = ( -/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/yellow{ - layer = 3.2 - }, -/obj/item/bedsheet/yellow{ - pixel_y = 13 - }, -/obj/structure/sign/safety/bathunisex{ - pixel_x = -16; - pixel_y = 8 - }, -/obj/item/toy/plushie_cade, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/port_emb) "kkt" = ( /obj/structure/surface/table/almayer, /obj/item/book/manual/marine_law, @@ -46423,6 +44547,19 @@ icon_state = "plate" }, /area/almayer/living/offices) +"kmx" = ( +/obj/structure/machinery/door_control{ + id = "ARES Operations Right"; + name = "ARES Operations Shutter"; + pixel_x = 24; + pixel_y = -8; + req_one_access_txt = "90;91;92" + }, +/turf/open/floor/almayer/no_build{ + dir = 4; + icon_state = "silver" + }, +/area/almayer/command/airoom) "kmE" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -46436,32 +44573,29 @@ /obj/item/tool/mop, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_a_p) -"kmL" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/firstaid/regular{ - pixel_x = 8; - pixel_y = -2 - }, -/obj/item/storage/box/drinkingglasses{ - pixel_x = -7 - }, -/obj/item/reagent_container/spray/cleaner{ - pixel_x = -10; - pixel_y = 14 - }, -/obj/item/storage/xeno_tag_case/full{ - pixel_y = 8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/corporateliason) "kmM" = ( /obj/structure/sink{ pixel_y = 24 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_f_s) +"kmR" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) +"kne" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) "kng" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -46470,6 +44604,16 @@ icon_state = "plate" }, /area/almayer/living/pilotbunks) +"knG" = ( +/obj/structure/machinery/cm_vending/clothing/tl/delta{ + density = 0; + pixel_x = 32 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) "knH" = ( /obj/structure/machinery/vending/coffee, /obj/structure/sign/safety/coffee{ @@ -46486,6 +44630,15 @@ /obj/structure/machinery/light, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/grunt_rnr) +"knQ" = ( +/obj/structure/sign/poster{ + pixel_y = 32 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "blue" + }, +/area/almayer/squads/delta) "koc" = ( /obj/structure/machinery/status_display{ pixel_y = -30 @@ -46513,20 +44666,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/morgue) -"koC" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) "koT" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -46551,6 +44690,20 @@ icon_state = "plate" }, /area/almayer/hallways/aft_hallway) +"kpF" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep/training, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "plating_striped" + }, +/area/almayer/hull/lower_hull/l_a_s) +"kpK" = ( +/obj/structure/surface/table/almayer, +/obj/item/reagent_container/food/condiment/hotsauce/cholula, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/living/briefing) "kpQ" = ( /obj/structure/machinery/door_control{ id = "engidorm"; @@ -46675,6 +44828,19 @@ icon_state = "bluecorner" }, /area/almayer/living/basketball) +"krj" = ( +/obj/structure/machinery/door_control{ + id = "ARES StairsLower"; + name = "ARES Core Lockdown"; + pixel_x = -24; + pixel_y = -8; + req_one_access_txt = "90;91;92" + }, +/turf/open/floor/almayer/no_build{ + dir = 8; + icon_state = "silver" + }, +/area/almayer/command/airoom) "kro" = ( /turf/open/floor/almayer{ icon_state = "green" @@ -46723,14 +44889,6 @@ icon_state = "green" }, /area/almayer/squads/req) -"ksp" = ( -/obj/structure/machinery/cryopod/right{ - pixel_y = 6 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/squads/bravo) "ksA" = ( /obj/structure/closet/secure_closet/freezer/fridge/groceries, /obj/structure/machinery/light{ @@ -46795,6 +44953,19 @@ icon_state = "plating" }, /area/almayer/shipboard/brig/armory) +"ktz" = ( +/obj/structure/machinery/light{ + dir = 4; + invisibility = 101; + unacidable = 1; + unslashable = 1 + }, +/obj/structure/disposalpipe/junction{ + dir = 1; + icon_state = "pipe-j2" + }, +/turf/open/floor/almayer, +/area/almayer/living/cryo_cells) "ktB" = ( /obj/structure/largecrate/random/barrel/white, /turf/open/floor/almayer{ @@ -46829,12 +45000,6 @@ }, /turf/open/floor/almayer, /area/almayer/squads/req) -"kuw" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "emeraldcorner" - }, -/area/almayer/living/briefing) "kvh" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/station_alert{ @@ -46844,6 +45009,20 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering) +"kvx" = ( +/obj/structure/machinery/cm_vending/clothing/medic/alpha{ + density = 0; + pixel_y = 28 + }, +/obj/structure/machinery/cm_vending/gear/medic{ + density = 0; + pixel_x = -32 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" + }, +/area/almayer/squads/alpha) "kvz" = ( /obj/structure/machinery/power/terminal{ dir = 4 @@ -46949,6 +45128,19 @@ icon_state = "redcorner" }, /area/almayer/shipboard/brig/processing) +"kxP" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/surface/table/almayer, +/obj/item/trash/USCMtray{ + pixel_y = 7 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/alpha) "kyI" = ( /obj/structure/machinery/light{ dir = 8 @@ -47006,11 +45198,34 @@ /obj/structure/machinery/vending/walkman, /turf/open/floor/almayer, /area/almayer/living/briefing) +"kzg" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/safety/hvac_old{ + pixel_x = 8; + pixel_y = -32 + }, +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/squads/alpha) "kzk" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/plating, /area/almayer/command/computerlab) +"kzv" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/bed/chair/comfy/alpha, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/living/briefing) "kzy" = ( /obj/structure/bed/chair, /turf/open/floor/almayer{ @@ -47018,59 +45233,12 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) -"kzK" = ( -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = 28 - }, -/obj/item/bedsheet/blue{ - layer = 3.2 - }, -/obj/item/bedsheet/blue{ - pixel_y = 13 - }, -/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 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/port_emb) "kzP" = ( /turf/open/floor/almayer{ dir = 9; icon_state = "red" }, /area/almayer/hallways/port_hallway) -"kzT" = ( -/obj/structure/machinery/door_control{ - id = "ARES StairsLower"; - name = "ARES Core Lockdown"; - pixel_x = -24; - pixel_y = -8; - req_one_access_txt = "90;91;92" - }, -/turf/open/floor/almayer/no_build{ - dir = 8; - icon_state = "silver" - }, -/area/almayer/command/airoom) "kAh" = ( /obj/structure/sign/safety/restrictedarea{ pixel_x = -17 @@ -47157,6 +45325,14 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) +"kCu" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/toolbox/mechanical, +/obj/item/device/megaphone, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/tankerbunks) "kCE" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -47172,6 +45348,12 @@ icon_state = "dark_sterile" }, /area/almayer/medical/containment) +"kCK" = ( +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" + }, +/area/almayer/living/briefing) "kCS" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, @@ -47238,6 +45420,14 @@ icon_state = "red" }, /area/almayer/shipboard/brig/processing) +"kDN" = ( +/obj/structure/sign/safety/cryo{ + pixel_x = 32 + }, +/turf/open/floor/almayer{ + icon_state = "cargo_arrow" + }, +/area/almayer/squads/delta) "kDR" = ( /obj/structure/disposalpipe/junction{ dir = 1; @@ -47319,6 +45509,13 @@ icon_state = "plating" }, /area/almayer/squads/req) +"kFV" = ( +/obj/structure/machinery/door/airlock/almayer/generic, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/living/auxiliary_officer_office) "kFY" = ( /obj/structure/sign/safety/cryo{ pixel_x = 7 @@ -47337,16 +45534,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_p) -"kGF" = ( -/obj/structure/reagent_dispensers/water_cooler/stacks{ - density = 0; - pixel_y = 16 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "emerald" - }, -/area/almayer/squads/charlie) "kGL" = ( /obj/effect/step_trigger/clone_cleaner, /turf/open/floor/almayer{ @@ -47442,25 +45629,25 @@ icon_state = "orange" }, /area/almayer/hallways/starboard_umbilical) -"kIP" = ( -/obj/structure/machinery/cryopod/right{ - pixel_y = 6 - }, +"kIH" = ( /turf/open/floor/almayer{ - icon_state = "cargo" + dir = 9; + icon_state = "silver" }, -/area/almayer/squads/charlie) +/area/almayer/hallways/port_hallway) "kIV" = ( /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_f_p) -"kJi" = ( -/obj/structure/machinery/light, +"kJq" = ( +/obj/structure/surface/table/almayer, +/obj/item/tool/hand_labeler, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 4; + icon_state = "silver" }, -/area/almayer/squads/alpha) +/area/almayer/hallways/port_hallway) "kJC" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -47487,6 +45674,17 @@ /obj/structure/bed/chair/comfy/orange, /turf/open/floor/almayer, /area/almayer/shipboard/brig/main_office) +"kJS" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/alpha{ + req_one_access = list(15,18,19) + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/squads/alpha) "kJV" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -47531,6 +45729,15 @@ icon_state = "silver" }, /area/almayer/command/airoom) +"kKC" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/squads/alpha) "kKG" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -47564,15 +45771,17 @@ icon_state = "test_floor4" }, /area/almayer/engineering/upper_engineering/port) -"kLk" = ( -/obj/structure/machinery/cm_vending/clothing/tl/bravo{ - density = 0; - pixel_x = 32 +"kLl" = ( +/obj/structure/machinery/iv_drip, +/obj/structure/machinery/computer/working_joe{ + dir = 8; + pixel_x = 17 }, /turf/open/floor/almayer{ - icon_state = "orange" + dir = 4; + icon_state = "sterile_green_corner" }, -/area/almayer/squads/bravo) +/area/almayer/medical/lower_medical_medbay) "kLP" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -47583,6 +45792,13 @@ icon_state = "greencorner" }, /area/almayer/squads/req) +"kMk" = ( +/obj/structure/machinery/light/small{ + dir = 4 + }, +/obj/structure/largecrate/random/barrel/blue, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/lower_hull/l_a_s) "kMq" = ( /obj/structure/sign/poster{ desc = "It says DRUG."; @@ -47663,6 +45879,13 @@ icon_state = "mono" }, /area/almayer/medical/medical_science) +"kNz" = ( +/obj/structure/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/turf/open/floor/almayer, +/area/almayer/living/cryo_cells) "kNO" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal3"; @@ -47676,12 +45899,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/basketball) -"kNQ" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orangecorner" - }, -/area/almayer/hallways/starboard_hallway) "kNY" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -47741,12 +45958,12 @@ icon_state = "test_floor4" }, /area/almayer/hallways/aft_hallway) -"kOH" = ( +"kON" = ( +/obj/structure/machinery/vending/snack, /turf/open/floor/almayer{ - dir = 5; - icon_state = "blue" + icon_state = "greenfull" }, -/area/almayer/living/port_emb) +/area/almayer/command/cichallway) "kPo" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 4; @@ -47754,6 +45971,20 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_p) +"kPp" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/obj/structure/platform{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "kPx" = ( /obj/structure/surface/table/almayer, /obj/item/device/mass_spectrometer, @@ -47826,6 +46057,27 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/basketball) +"kQd" = ( +/obj/structure/bed/chair{ + dir = 8; + pixel_y = 3 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 + }, +/obj/structure/disposalpipe/junction{ + dir = 1; + icon_state = "pipe-j2" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) "kQz" = ( /obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ dir = 1; @@ -47860,6 +46112,24 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_p) +"kRO" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/box/gloves{ + pixel_x = -4; + pixel_y = 13 + }, +/obj/item/storage/box/masks{ + pixel_x = -6; + pixel_y = 4 + }, +/obj/item/tool/hand_labeler{ + pixel_x = 5; + pixel_y = 3 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/medical/medical_science) "kRP" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/item/prop/magazine/dirty/torn, @@ -47870,13 +46140,13 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) "kSd" = ( -/obj/item/cell/high/empty, -/obj/item/cell/high/empty, -/obj/structure/surface/rack, +/obj/structure/machinery/power/terminal{ + dir = 1 + }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "orange" }, -/area/almayer/hull/upper_hull/u_a_s) +/area/almayer/engineering/upper_engineering/starboard) "kSv" = ( /obj/item/reagent_container/glass/bucket/janibucket, /turf/open/floor/almayer{ @@ -47916,6 +46186,37 @@ icon_state = "red" }, /area/almayer/hallways/aft_hallway) +"kSR" = ( +/obj/item/clothing/head/ushanka{ + layer = 3.3 + }, +/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, +/obj/structure/bed{ + buckling_y = 13; + layer = 3.5; + pixel_y = 13 + }, +/obj/item/bedsheet/brown{ + layer = 3.1 + }, +/obj/item/bedsheet/brown{ + pixel_y = 13 + }, +/turf/open/floor/almayer{ + dir = 6; + icon_state = "silver" + }, +/area/almayer/living/port_emb) "kTc" = ( /obj/structure/closet/secure_closet/guncabinet/red, /obj/item/ammo_magazine/shotgun, @@ -47973,6 +46274,14 @@ icon_state = "orangecorner" }, /area/almayer/engineering/ce_room) +"kTT" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "bluefull" + }, +/area/almayer/squads/delta) "kTY" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -47994,6 +46303,19 @@ icon_state = "test_floor4" }, /area/almayer/living/pilotbunks) +"kUi" = ( +/obj/effect/step_trigger/clone_cleaner, +/obj/structure/machinery/door_control{ + id = "ARES StairsUpper"; + name = "ARES Core Access"; + pixel_x = 24; + pixel_y = 24; + req_one_access_txt = "90;91;92" + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) "kUt" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -48089,18 +46411,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_f_p) -"kXa" = ( -/obj/structure/machinery/cm_vending/clothing/marine/bravo{ - density = 0; - pixel_y = 16 - }, -/obj/structure/sign/safety/cryo{ - pixel_x = 32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) "kXf" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 8; @@ -48117,6 +46427,15 @@ icon_state = "silver" }, /area/almayer/command/airoom) +"kXm" = ( +/obj/structure/machinery/door/airlock/almayer/marine/delta/tl{ + req_one_access = list(); + req_access = list(18,32) + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/squads/delta) "kXu" = ( /turf/open/floor/almayer{ dir = 8; @@ -48129,6 +46448,17 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) +"kXy" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N" + }, +/obj/effect/decal/cleanable/blood/oil, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/platform{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "kXJ" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/computer/secure_data{ @@ -48164,6 +46494,12 @@ icon_state = "test_floor4" }, /area/almayer/hull/lower_hull/l_f_s) +"kYc" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/turf/open/floor/almayer{ + icon_state = "greenfull" + }, +/area/almayer/command/cichallway) "kYP" = ( /obj/structure/sign/safety/maint{ pixel_x = 32 @@ -48198,22 +46534,29 @@ icon_state = "plate" }, /area/almayer/living/offices) +"kZv" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_x = -1; + pixel_y = 2 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/delta) "kZA" = ( /turf/open/floor/almayer{ dir = 4; icon_state = "orange" }, /area/almayer/hallways/port_umbilical) -"kZN" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/prop/almayer/computer/PC{ - dir = 8 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "silver" - }, -/area/almayer/living/auxiliary_officer_office) "kZV" = ( /obj/structure/machinery/light, /obj/effect/decal/warning_stripes{ @@ -48228,12 +46571,6 @@ icon_state = "mono" }, /area/almayer/medical/hydroponics) -"lah" = ( -/turf/open/floor/almayer{ - dir = 6; - icon_state = "emerald" - }, -/area/almayer/living/gym) "laj" = ( /obj/structure/platform{ dir = 1 @@ -48254,6 +46591,44 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_m_p) +"lay" = ( +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/command/cic) +"laH" = ( +/obj/structure/machinery/firealarm{ + pixel_y = 28 + }, +/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{ + layer = 3.1 + }, +/obj/item/bedsheet/brown{ + pixel_y = 13 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/port_emb) "laO" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -48280,17 +46655,6 @@ icon_state = "test_floor4" }, /area/almayer/engineering/upper_engineering) -"laU" = ( -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 - }, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - id = "Firing_Range_1"; - name = "range shutters" - }, -/turf/open/floor/plating, -/area/almayer/living/cryo_cells) "laV" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/almayer/open{ @@ -48316,51 +46680,44 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_m_p) -"lbf" = ( -/obj/structure/machinery/cryopod{ - pixel_y = 6 +"lbx" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/shared/alpha_bravo{ + dir = 2; + req_one_access = list(15,18) }, /turf/open/floor/almayer{ - icon_state = "cargo" + icon_state = "test_floor4" }, -/area/almayer/squads/charlie) +/area/almayer/squads/alpha) "lbB" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orange" - }, +/turf/open/floor/almayer, /area/almayer/engineering/upper_engineering/port) -"lbX" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 +"lbZ" = ( +/obj/structure/transmitter/rotary{ + name = "Mech Bay"; + phone_category = "Command"; + phone_id = "Combat Information Center"; + pixel_x = 21 }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 5; + icon_state = "plating" }, -/area/almayer/squads/charlie) +/area/almayer/hallways/port_hallway) "lcg" = ( /obj/structure/machinery/ares/substrate, /turf/open/floor/almayer/no_build{ icon_state = "test_floor4" }, /area/almayer/command/airoom) -"lcy" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/bed/chair/comfy{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "bluefull" - }, -/area/almayer/living/bridgebunks) "lcV" = ( /obj/structure/bed/chair{ dir = 4 @@ -48384,6 +46741,13 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/north2) +"ldq" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/window/framed/almayer, +/turf/open/floor/plating, +/area/almayer/hallways/port_hallway) "ldt" = ( /obj/structure/machinery/conveyor{ dir = 8; @@ -48443,24 +46807,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/hydroponics) -"lef" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "emerald" - }, -/area/almayer/squads/charlie) -"leg" = ( -/obj/structure/bed/chair{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "emerald" - }, -/area/almayer/hallways/hangar) "leh" = ( /obj/structure/surface/rack, /obj/effect/spawner/random/tool, @@ -48481,6 +46827,15 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) +"leQ" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "green" + }, +/area/almayer/hallways/port_hallway) "leY" = ( /obj/structure/bed/sofa/south/white/left, /turf/open/floor/almayer{ @@ -48488,6 +46843,17 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_lobby) +"lfn" = ( +/obj/structure/surface/table/almayer, +/obj/item/trash/USCMtray{ + pixel_y = 7 + }, +/obj/item/reagent_container/food/condiment/hotsauce/cholula{ + pixel_x = 10; + pixel_y = 22 + }, +/turf/open/floor/almayer, +/area/almayer/squads/alpha) "lfH" = ( /obj/structure/machinery/light{ dir = 4 @@ -48519,17 +46885,6 @@ icon_state = "red" }, /area/almayer/shipboard/brig/processing) -"lgy" = ( -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 - }, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - id = "Firing_Range_2"; - name = "range shutters" - }, -/turf/open/floor/plating, -/area/almayer/living/cryo_cells) "lgK" = ( /obj/structure/machinery/cm_vending/clothing/senior_officer{ density = 0; @@ -48676,11 +47031,6 @@ icon_state = "plate" }, /area/almayer/living/gym) -"ljs" = ( -/obj/effect/landmark/start/marine/spec/bravo, -/obj/effect/landmark/late_join/bravo, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/bravo) "ljG" = ( /obj/structure/closet/crate/freezer, /obj/item/reagent_container/food/condiment/coldsauce, @@ -48729,18 +47079,13 @@ icon_state = "red" }, /area/almayer/living/offices/flight) -"lkM" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 - }, -/turf/open/floor/almayer{ - icon_state = "plate" +"lkA" = ( +/obj/structure/sign/safety/hvac_old{ + pixel_x = 8; + pixel_y = 32 }, -/area/almayer/squads/charlie) +/turf/closed/wall/almayer/reinforced, +/area/almayer/hull/lower_hull/l_a_s) "lkW" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/belt/medical/lifesaver/full, @@ -48769,13 +47114,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_p) -"lml" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 1; - name = "ship-grade camera" - }, -/turf/open/floor/almayer, -/area/almayer/squads/bravo) "lmw" = ( /obj/structure/closet/l3closet/general, /obj/structure/machinery/light{ @@ -48816,11 +47154,6 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) -"lnm" = ( -/turf/open/floor/almayer{ - icon_state = "orangecorner" - }, -/area/almayer/living/briefing) "lnt" = ( /turf/open/floor/almayer{ icon_state = "silvercorner" @@ -48840,45 +47173,6 @@ icon_state = "kitchen" }, /area/almayer/engineering/upper_engineering) -"lnS" = ( -/obj/structure/sign/safety/rewire{ - pixel_y = 38 - }, -/obj/structure/sign/safety/fibre_optics{ - pixel_x = 14; - pixel_y = 38 - }, -/obj/structure/sign/safety/laser{ - pixel_y = 24 - }, -/obj/structure/sign/safety/terminal{ - pixel_x = 14; - pixel_y = 24 - }, -/obj/structure/machinery/door_control{ - id = "ARES Operations Left"; - name = "ARES Operations Shutter"; - pixel_x = 24; - pixel_y = -8; - req_one_access_txt = "90;91;92" - }, -/turf/open/floor/almayer/no_build{ - icon_state = "ai_floors" - }, -/area/almayer/command/airoom) -"lok" = ( -/obj/structure/machinery/cm_vending/clothing/marine/charlie{ - density = 0; - layer = 4.1; - pixel_y = -29 - }, -/obj/structure/sign/safety/cryo{ - pixel_x = 32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) "lol" = ( /obj/structure/machinery/status_display{ pixel_x = 16; @@ -48902,6 +47196,14 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) +"loD" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep{ + req_one_access = list() + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha) "loK" = ( /obj/structure/closet/crate/medical, /obj/item/storage/firstaid/adv, @@ -48916,23 +47218,6 @@ "loP" = ( /turf/closed/wall/almayer, /area/almayer/engineering/laundry) -"loS" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = -29 - }, -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - icon_state = "bluecorner" - }, -/area/almayer/squads/delta) "loV" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal3"; @@ -48953,11 +47238,6 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) -"lpt" = ( -/turf/open/floor/almayer{ - icon_state = "blue" - }, -/area/almayer/squads/charlie_delta_shared) "lpy" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1 @@ -48995,6 +47275,21 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_lobby) +"lqH" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/window/reinforced/toughened{ + dir = 4 + }, +/obj/structure/window/reinforced/toughened, +/obj/structure/machinery/computer/crew/alt{ + dir = 8; + pixel_y = 4 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/command/cic) "lqI" = ( /obj/structure/bed/chair{ dir = 8 @@ -49011,27 +47306,18 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/aft_hallway) -"lqK" = ( -/obj/effect/decal/cleanable/ash, -/obj/item/trash/cigbutt/ucigbutt{ - pixel_x = -13; - pixel_y = 8 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "emerald" - }, -/area/almayer/hallways/hangar) -"lqN" = ( -/obj/item/device/assembly/mousetrap/armed, -/obj/structure/pipes/standard/simple/hidden/supply{ +"lqR" = ( +/obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, /turf/open/floor/almayer{ - dir = 10; - icon_state = "orange" + dir = 6; + icon_state = "blue" }, -/area/almayer/living/port_emb) +/area/almayer/squads/delta) "lqZ" = ( /obj/structure/machinery/floodlight/landing, /turf/open/floor/almayer{ @@ -49079,10 +47365,6 @@ icon_state = "plate" }, /area/almayer/living/port_emb) -"lrT" = ( -/obj/structure/bed/chair, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) "lrV" = ( /obj/structure/machinery/door/window/brigdoor/southright{ id = "Cell 3"; @@ -49173,15 +47455,6 @@ /obj/item/tool/weldingtool, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) -"ltI" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "emerald" - }, -/area/almayer/squads/charlie) "ltU" = ( /obj/structure/filingcabinet, /turf/open/floor/almayer{ @@ -49291,8 +47564,7 @@ "luY" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ - dir = 4; - icon_state = "orange" + icon_state = "orangecorner" }, /area/almayer/engineering/upper_engineering/starboard) "luZ" = ( @@ -49312,6 +47584,31 @@ icon_state = "test_floor4" }, /area/almayer/command/cic) +"lvv" = ( +/obj/structure/machinery/camera/autoname/almayer{ + dir = 8; + name = "ship-grade camera" + }, +/obj/structure/sign/safety/ammunition{ + pixel_x = 32; + pixel_y = 7 + }, +/obj/structure/sign/safety/two{ + pixel_x = 31; + pixel_y = -8 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) +"lvz" = ( +/obj/structure/surface/table/almayer, +/obj/item/facepaint/black{ + pixel_x = -4 + }, +/turf/open/floor/almayer, +/area/almayer/squads/alpha) "lvA" = ( /obj/structure/machinery/power/apc/almayer/hardened{ dir = 1 @@ -49320,6 +47617,17 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/north1) +"lvL" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer{ + dir = 9; + icon_state = "silver" + }, +/area/almayer/living/cryo_cells) "lvZ" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/almayer/locked{ @@ -49401,34 +47709,11 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/basketball) -"lwJ" = ( +"lxV" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/turf/open/floor/almayer{ - icon_state = "emeraldfull" - }, -/area/almayer/squads/charlie) -"lxo" = ( -/obj/structure/sign/safety/hazard{ - pixel_x = -17; - pixel_y = -8 - }, -/obj/structure/sign/safety/ammunition{ - pixel_x = -17; - pixel_y = 7 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/auxiliary_officer_office) -"lxW" = ( -/obj/structure/sign/prop2{ - pixel_y = 29 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, +/turf/open/floor/wood/ship, /area/almayer/living/auxiliary_officer_office) "lyi" = ( /obj/structure/surface/table/almayer, @@ -49460,16 +47745,13 @@ icon_state = "silvercorner" }, /area/almayer/command/computerlab) -"lyX" = ( -/obj/structure/machinery/cm_vending/clothing/senior_officer{ - req_access = null; - req_access_txt = 37; - req_one_access = null - }, -/turf/open/floor/almayer{ - icon_state = "plate" +"lyJ" = ( +/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep, +/obj/structure/machinery/light{ + dir = 8 }, -/area/almayer/living/auxiliary_officer_office) +/turf/open/floor/almayer, +/area/almayer/squads/delta) "lzj" = ( /obj/structure/sign/safety/storage{ pixel_x = 8; @@ -49480,13 +47762,6 @@ icon_state = "blue" }, /area/almayer/hallways/aft_hallway) -"lzq" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) "lzx" = ( /turf/open/floor/almayer{ dir = 1; @@ -49522,12 +47797,6 @@ icon_state = "red" }, /area/almayer/hallways/aft_hallway) -"lAl" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orange" - }, -/area/almayer/squads/bravo) "lAu" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/machinery/door/airlock/multi_tile/almayer/engidoor{ @@ -49568,18 +47837,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_s) -"lAQ" = ( -/obj/structure/machinery/cm_vending/gear/tl{ - density = 0; - pixel_x = -32; - vend_x_offset = 1 - }, -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "emerald" - }, -/area/almayer/squads/charlie) "lBg" = ( /obj/structure/bedsheetbin, /turf/open/floor/almayer{ @@ -49598,18 +47855,10 @@ icon_state = "red" }, /area/almayer/hallways/aft_hallway) -"lBv" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "emerald" - }, -/area/almayer/squads/charlie) +"lBD" = ( +/obj/item/clothing/under/gimmick/jason, +/turf/open/floor/carpet, +/area/almayer/living/auxiliary_officer_office) "lBF" = ( /obj/structure/surface/table/almayer, /obj/effect/spawner/random/toolbox, @@ -49689,15 +47938,6 @@ icon_state = "test_floor4" }, /area/almayer/hallways/starboard_hallway) -"lDJ" = ( -/obj/structure/sign/safety/distribution_pipes{ - pixel_x = -17 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "orange" - }, -/area/almayer/hallways/starboard_hallway) "lDL" = ( /obj/structure/machinery/light{ dir = 4 @@ -49723,14 +47963,15 @@ }, /turf/open/floor/almayer, /area/almayer/hull/upper_hull/u_f_p) -"lDV" = ( -/obj/effect/landmark/start/marine/medic/bravo, -/obj/effect/landmark/late_join/bravo, -/obj/structure/sign/safety/cryo{ - pixel_y = 26 +"lEc" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/effect/spawner/random/toolbox, +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/alpha) +/area/almayer/hallways/port_hallway) "lEf" = ( /turf/closed/wall/almayer/research/containment/wall/corner{ dir = 1 @@ -49762,28 +48003,6 @@ }, /turf/open/floor/almayer, /area/almayer/living/chapel) -"lEL" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/prop/ice_colony/tiger_rug{ - desc = "A beat up beer stained, incredibly garish, polyester tiger rug. No one knows how it got here. Written on the wash tag are the words 'From Thedus, with love <3', in Sharpie."; - icon_state = "HotlineAlt"; - layer = 2.9; - name = "Richard the tiger" - }, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "emerald" - }, -/area/almayer/living/port_emb) -"lEO" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) "lEW" = ( /obj/structure/disposalpipe/segment, /turf/closed/wall/almayer, @@ -49827,6 +48046,14 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/morgue) +"lFo" = ( +/obj/structure/surface/table/almayer, +/obj/item/ammo_box/magazine/misc/mre{ + pixel_x = -6; + pixel_y = 7 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "lFs" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -49851,6 +48078,22 @@ icon_state = "cargo" }, /area/almayer/engineering/starboard_atmos) +"lFu" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = -29 + }, +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/squads/alpha) "lFA" = ( /obj/structure/surface/table/almayer, /obj/item/storage/pouch/tools/tank, @@ -49913,6 +48156,15 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_f_p) +"lGx" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blue" + }, +/area/almayer/living/briefing) "lGG" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -49939,6 +48191,20 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_s) +"lGY" = ( +/obj/structure/machinery/door_control{ + id = "ARES StairsLower"; + name = "ARES Core Lockdown"; + pixel_x = 24; + pixel_y = 8; + req_one_access_txt = "90;91;92" + }, +/obj/effect/step_trigger/clone_cleaner, +/turf/open/floor/almayer/no_build{ + dir = 4; + icon_state = "silver" + }, +/area/almayer/command/airoom) "lHc" = ( /obj/effect/landmark/start/doctor, /obj/structure/sign/safety/maint{ @@ -49952,6 +48218,12 @@ icon_state = "greencorner" }, /area/almayer/living/grunt_rnr) +"lHv" = ( +/turf/open/floor/almayer{ + dir = 1; + icon_state = "green" + }, +/area/almayer/command/cichallway) "lIa" = ( /obj/item/robot_parts/arm/l_arm, /obj/item/robot_parts/leg/l_leg, @@ -49990,6 +48262,21 @@ icon_state = "test_floor4" }, /area/almayer/hallways/stern_hallway) +"lIy" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/auxiliary_officer_office) +"lIE" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blue" + }, +/area/almayer/squads/delta) "lII" = ( /obj/structure/bed/chair/office/dark{ dir = 1 @@ -49998,6 +48285,21 @@ icon_state = "mono" }, /area/almayer/engineering/port_atmos) +"lIL" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/shared/alpha_bravo{ + dir = 2; + req_one_access = list(15,19) + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/squads/alpha) "lIU" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -50024,14 +48326,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_m_p) -"lJu" = ( -/obj/structure/barricade/metal{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/living/cryo_cells) "lJv" = ( /obj/structure/window/framed/almayer/white, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -50064,18 +48358,6 @@ icon_state = "cargo" }, /area/almayer/living/offices) -"lJO" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/surface/table/almayer, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha) "lJY" = ( /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south2) @@ -50090,15 +48372,6 @@ icon_state = "dark_sterile" }, /area/almayer/engineering/laundry) -"lKb" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/shared/alpha_bravo{ - dir = 2 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/alpha_bravo_shared) "lKk" = ( /obj/structure/sign/safety/maint{ pixel_x = 32 @@ -50108,10 +48381,10 @@ icon_state = "red" }, /area/almayer/hallways/stern_hallway) -"lLC" = ( -/obj/structure/surface/table/almayer, +"lLK" = ( +/obj/structure/bed/chair, /turf/open/floor/almayer, -/area/almayer/squads/charlie) +/area/almayer/squads/delta) "lLS" = ( /obj/structure/sign/safety/galley{ pixel_x = 32 @@ -50121,10 +48394,6 @@ icon_state = "silver" }, /area/almayer/command/cichallway) -"lLV" = ( -/obj/structure/largecrate/random/barrel/green, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/lower_hull/l_m_s) "lMc" = ( /turf/open/floor/almayer{ icon_state = "red" @@ -50197,21 +48466,6 @@ icon_state = "redcorner" }, /area/almayer/shipboard/brig/main_office) -"lNw" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/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 = "plate" - }, -/area/almayer/squads/charlie) "lNy" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -50234,6 +48488,20 @@ icon_state = "redcorner" }, /area/almayer/shipboard/brig/execution) +"lOi" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/machinery/status_display{ + pixel_y = -29 + }, +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/squads/alpha) "lOl" = ( /obj/structure/machinery/light{ dir = 8 @@ -50272,6 +48540,13 @@ icon_state = "test_floor4" }, /area/almayer/medical/medical_science) +"lOU" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "bluecorner" + }, +/area/almayer/squads/delta) "lPB" = ( /obj/structure/surface/table/almayer, /obj/item/device/lightreplacer, @@ -50334,12 +48609,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_s) -"lQz" = ( -/obj/structure/machinery/vending/coffee, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) "lQG" = ( /obj/structure/machinery/computer/tech_control, /turf/open/floor/plating/plating_catwalk, @@ -50366,19 +48635,6 @@ icon_state = "green" }, /area/almayer/hallways/port_hallway) -"lRs" = ( -/obj/structure/surface/table/almayer, -/obj/item/trash/USCMtray{ - pixel_x = 6; - pixel_y = 4 - }, -/obj/item/reagent_container/food/condiment/hotsauce/cholula{ - pixel_y = 20 - }, -/turf/open/floor/almayer{ - icon_state = "orangefull" - }, -/area/almayer/living/briefing) "lRE" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_sn_full_cap" @@ -50427,6 +48683,10 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_m_p) +"lSM" = ( +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/auxiliary_officer_office) "lSO" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = 25 @@ -50489,6 +48749,13 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_s) +"lWm" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/foamed_metal, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "lWr" = ( /obj/structure/largecrate/random/case, /turf/open/floor/almayer{ @@ -50496,6 +48763,41 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) +"lWD" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/window/framed/almayer, +/obj/structure/curtain/open/shower{ + name = "cryo curtain" + }, +/turf/open/floor/plating, +/area/almayer/hull/lower_hull/l_a_s) +"lWT" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/alpha) +"lXe" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/disposalpipe/segment, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1 + }, +/turf/open/floor/almayer{ + dir = 6; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) "lXg" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/recharger, @@ -50529,6 +48831,37 @@ icon_state = "green" }, /area/almayer/living/offices) +"lXP" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/living/cryo_cells) +"lXS" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/window/reinforced/toughened{ + dir = 8 + }, +/obj/structure/window/reinforced/toughened, +/obj/structure/machinery/computer/cameras/almayer_network/vehicle{ + dir = 4; + layer = 2.99; + pixel_y = 4 + }, +/obj/structure/machinery/computer/almayer_control{ + dir = 4; + layer = 2.99; + pixel_y = 26 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/command/cic) "lYi" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/manifold/hidden/supply, @@ -50682,6 +49015,19 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/upper_medical) +"maV" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = 28 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/tankerbunks) "mbn" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -50692,6 +49038,20 @@ icon_state = "greencorner" }, /area/almayer/hallways/aft_hallway) +"mci" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/structure/machinery/firealarm{ + pixel_y = 28 + }, +/obj/structure/sign/safety/maint{ + pixel_x = -17 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/tankerbunks) "mcL" = ( /obj/structure/machinery/vending/snack, /obj/structure/sign/safety/maint{ @@ -50754,20 +49114,6 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) -"meu" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/sign/poster{ - pixel_y = -32 - }, -/turf/open/floor/almayer{ - icon_state = "blue" - }, -/area/almayer/squads/delta) "meJ" = ( /obj/structure/sign/safety/distribution_pipes{ pixel_x = 8; @@ -50795,11 +49141,12 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_s) -"meY" = ( -/turf/closed/wall/almayer{ - damage_cap = 15000 +"mfb" = ( +/turf/open/floor/almayer{ + dir = 8; + icon_state = "silver" }, -/area/almayer/squads/alpha) +/area/almayer/hallways/port_hallway) "mfe" = ( /obj/structure/prop/invuln/overhead_pipe{ pixel_x = 12 @@ -50825,6 +49172,12 @@ }, /turf/open/floor/plating/almayer, /area/almayer/hull/lower_hull/l_a_p) +"mfJ" = ( +/obj/structure/machinery/power/apc/almayer{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/living/auxiliary_officer_office) "mfM" = ( /obj/structure/surface/table/almayer, /obj/effect/landmark/map_item, @@ -50838,12 +49191,26 @@ icon_state = "silver" }, /area/almayer/living/briefing) +"mfN" = ( +/obj/effect/landmark/start/marine/smartgunner/alpha, +/obj/effect/landmark/late_join/alpha, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/alpha) "mfQ" = ( /turf/open/floor/almayer{ allow_construction = 0; icon_state = "plate" }, /area/almayer/living/pilotbunks) +"mga" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "blue" + }, +/area/almayer/squads/delta) "mgj" = ( /obj/structure/reagent_dispensers/water_cooler/stacks{ density = 0; @@ -50854,15 +49221,6 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) -"mgF" = ( -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, -/turf/open/floor/almayer{ - icon_state = "cargo_arrow" - }, -/area/almayer/squads/charlie_delta_shared) "mha" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out"; @@ -50904,26 +49262,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/command/lifeboat) -"mhI" = ( -/obj/structure/machinery/vending/cigarette{ - density = 0; - pixel_x = -5; - pixel_y = 16 - }, -/obj/structure/reagent_dispensers/water_cooler/stacks{ - density = 0; - pixel_x = 13; - pixel_y = 15 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha) "miE" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 1 @@ -50940,13 +49278,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_s) -"miV" = ( -/obj/structure/sign/safety/rewire{ - pixel_x = -17; - pixel_y = 8 - }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) "mji" = ( /obj/structure/pipes/standard/manifold/fourway/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -50957,15 +49288,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_p) -"mjS" = ( -/obj/structure/machinery/firealarm{ - pixel_y = 28 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie) "mkc" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -51011,6 +49333,24 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) +"mkg" = ( +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera" + }, +/obj/structure/sign/safety/ammunition{ + pixel_x = 15; + pixel_y = 32 + }, +/obj/structure/sign/safety/hazard{ + pixel_y = 32 + }, +/obj/structure/machinery/disposal, +/obj/structure/disposalpipe/trunk, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "blue" + }, +/area/almayer/squads/delta) "mkh" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -51027,6 +49367,14 @@ allow_construction = 0 }, /area/almayer/shipboard/brig/lobby) +"mko" = ( +/obj/structure/pipes/vents/pump{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "silver" + }, +/area/almayer/living/port_emb) "mkx" = ( /obj/structure/machinery/door_control{ id = "cl_shutters 2"; @@ -51074,11 +49422,6 @@ icon_state = "tcomms" }, /area/almayer/command/airoom) -"mlm" = ( -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/living/cryo_cells) "mlp" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -51091,6 +49434,15 @@ icon_state = "test_floor4" }, /area/almayer/hull/upper_hull/u_f_s) +"mlv" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "green" + }, +/area/almayer/command/cichallway) "mlz" = ( /obj/structure/platform_decoration{ dir = 1 @@ -51111,6 +49463,45 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_f_s) +"mmD" = ( +/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{ + layer = 3.1 + }, +/obj/item/bedsheet/brown{ + pixel_y = 13 + }, +/turf/open/floor/almayer{ + icon_state = "silver" + }, +/area/almayer/living/port_emb) +"mmG" = ( +/obj/structure/machinery/vending/coffee{ + density = 0; + pixel_y = 16 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blue" + }, +/area/almayer/squads/delta) "mmN" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 1 @@ -51221,6 +49612,12 @@ "moB" = ( /turf/closed/wall/almayer, /area/almayer/shipboard/brig/cells) +"moD" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/cryo_cells) "moE" = ( /obj/structure/sign/safety/water{ pixel_x = 8; @@ -51228,12 +49625,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_a_s) -"moI" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/alpha_bravo_shared) "moM" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer{ @@ -51290,19 +49681,12 @@ icon_state = "red" }, /area/almayer/shipboard/brig/main_office) -"mqK" = ( -/obj/structure/machinery/cm_vending/gear/spec, -/obj/structure/sign/safety/hazard{ - pixel_x = 15; - pixel_y = -32 - }, -/obj/structure/sign/safety/ammunition{ - pixel_y = -32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" +"mqu" = ( +/obj/structure/bed/chair{ + dir = 4 }, -/area/almayer/squads/bravo) +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "mqU" = ( /obj/structure/pipes/vents/pump{ dir = 8; @@ -51323,6 +49707,33 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_s) +"mrB" = ( +/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/machinery/door_control{ + dir = 1; + id = "researchlockdownext_door"; + name = "Door Shutters"; + pixel_x = -26; + pixel_y = 1; + req_access_txt = "28" + }, +/obj/structure/disposalpipe/junction{ + dir = 2; + icon_state = "pipe-j2" + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "sterile_green_side" + }, +/area/almayer/medical/medical_science) "mrD" = ( /obj/structure/machinery/light{ dir = 1 @@ -51347,6 +49758,26 @@ icon_state = "green" }, /area/almayer/squads/req) +"mrW" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "plating_striped" + }, +/area/almayer/hull/lower_hull/l_a_s) +"msa" = ( +/obj/structure/machinery/cm_vending/clothing/specialist/alpha{ + density = 0; + pixel_y = 28 + }, +/obj/structure/machinery/cm_vending/gear/spec{ + density = 0; + pixel_x = -32 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" + }, +/area/almayer/squads/alpha) "msi" = ( /obj/structure/filingcabinet/filingcabinet{ density = 0; @@ -51373,15 +49804,12 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/containment) -"msm" = ( -/obj/structure/sign/poster{ - pixel_y = 32 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orange" +"msy" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 }, -/area/almayer/squads/bravo) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/auxiliary_officer_office) "msP" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer{ @@ -51410,20 +49838,6 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north1) -"mtr" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/status_display{ - pixel_y = -29 - }, -/turf/open/floor/almayer{ - icon_state = "orange" - }, -/area/almayer/squads/bravo) "mtD" = ( /obj/structure/machinery/status_display{ pixel_x = 16; @@ -51452,6 +49866,9 @@ /obj/item/ammo_magazine/rifle/m41aMK1/ap, /obj/item/weapon/gun/rifle/m41aMK1/ap, /obj/structure/machinery/light, +/obj/item/ammo_magazine/rifle/m41aMK1/ap, +/obj/item/ammo_magazine/rifle/m41aMK1/ap, +/obj/item/ammo_magazine/rifle/m41aMK1/ap, /turf/open/floor/almayer{ icon_state = "redfull" }, @@ -51483,19 +49900,15 @@ icon_state = "plate" }, /area/almayer/squads/alpha) -"mvl" = ( -/obj/structure/disposalpipe/segment{ +"muP" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/obj/structure/pipes/standard/manifold/hidden/supply, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 1; - name = "ship-grade camera" - }, /turf/open/floor/almayer{ - icon_state = "bluecorner" + dir = 8; + icon_state = "cargo_arrow" }, -/area/almayer/squads/delta) +/area/almayer/hallways/port_hallway) "mvI" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 4; @@ -51550,6 +49963,17 @@ /obj/structure/machinery/light, /turf/open/floor/plating/plating_catwalk, /area/almayer/stair_clone/upper) +"mxb" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/delta{ + req_one_access = list(15,18,19) + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/squads/delta) "mxL" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -51627,11 +50051,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_s) -"mzg" = ( -/turf/open/floor/almayer{ - icon_state = "emerald" - }, -/area/almayer/squads/charlie) "mzo" = ( /turf/closed/wall/almayer, /area/almayer/hull/lower_hull/l_f_p) @@ -51652,6 +50071,10 @@ /obj/structure/machinery/light, /turf/open/floor/almayer, /area/almayer/living/offices) +"mzK" = ( +/obj/structure/largecrate/random/barrel/green, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/lower_hull/l_f_p) "mzO" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -51668,12 +50091,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/starboard_hallway) -"mzV" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "blue" - }, -/area/almayer/living/port_emb) "mAp" = ( /obj/structure/surface/table/almayer, /obj/effect/spawner/random/tool, @@ -51689,6 +50106,15 @@ }, /turf/open/floor/plating/almayer, /area/almayer/shipboard/brig/armory) +"mAv" = ( +/obj/structure/surface/table/almayer, +/obj/item/reagent_container/food/condiment/hotsauce/sriracha{ + pixel_x = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/delta) "mAT" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 8; @@ -51721,14 +50147,6 @@ icon_state = "test_floor4" }, /area/almayer/hull/lower_hull/l_f_s) -"mBc" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "bluefull" - }, -/area/almayer/squads/charlie_delta_shared) "mBk" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -51782,6 +50200,11 @@ }, /turf/open/floor/plating, /area/almayer/squads/req) +"mCB" = ( +/obj/effect/landmark/start/marine/smartgunner/delta, +/obj/effect/landmark/late_join/delta, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/delta) "mCL" = ( /obj/structure/sign/safety/fire_haz{ pixel_x = 8; @@ -51808,18 +50231,15 @@ "mDJ" = ( /turf/open/floor/almayer, /area/almayer/engineering/upper_engineering/starboard) -"mDT" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +"mDY" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 }, -/area/almayer/squads/charlie_delta_shared) -"mDW" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "emerald" +/obj/structure/bed/chair{ + dir = 4 }, -/area/almayer/living/briefing) +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "mEE" = ( /obj/structure/platform{ dir = 4; @@ -51890,18 +50310,15 @@ icon_state = "test_floor4" }, /area/almayer/command/airoom) -"mFO" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 +"mFX" = ( +/obj/structure/machinery/power/apc/almayer{ + dir = 1 }, /turf/open/floor/almayer{ - dir = 8; - icon_state = "orange" + dir = 1; + icon_state = "red" }, -/area/almayer/squads/bravo) +/area/almayer/squads/alpha) "mGe" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, @@ -51946,6 +50363,14 @@ icon_state = "dark_sterile" }, /area/almayer/engineering/laundry) +"mHt" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "Bathroom" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/living/tankerbunks) "mHx" = ( /obj/structure/bed/chair{ dir = 4 @@ -51974,6 +50399,12 @@ icon_state = "silver" }, /area/almayer/command/airoom) +"mHH" = ( +/mob/living/simple_animal/bunny{ + name = "Dina" + }, +/turf/open/floor/carpet, +/area/almayer/command/cichallway) "mHO" = ( /obj/structure/machinery/light, /turf/open/floor/almayer, @@ -51985,6 +50416,18 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_a_p) +"mIr" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/computer/groundside_operations{ + dir = 4; + pixel_y = 8 + }, +/obj/structure/machinery/door/window/westright, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/command/cic) "mIy" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -52031,6 +50474,13 @@ icon_state = "blue" }, /area/almayer/hallways/aft_hallway) +"mIZ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/turf/open/floor/almayer, +/area/almayer/living/tankerbunks) "mJa" = ( /obj/structure/closet/crate/trashcart, /obj/item/trash/boonie, @@ -52055,16 +50505,23 @@ icon_state = "silver" }, /area/almayer/command/cichallway) -"mJj" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/window/framed/almayer, -/turf/open/floor/plating, -/area/almayer/squads/alpha) "mJu" = ( /turf/open/floor/almayer/uscm/directional, /area/almayer/command/cic) +"mJz" = ( +/turf/closed/wall/almayer{ + damage_cap = 15000 + }, +/area/almayer/hallways/port_hallway) +"mJC" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blue" + }, +/area/almayer/squads/delta) "mJL" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -52072,32 +50529,6 @@ }, /turf/closed/wall/almayer, /area/almayer/living/pilotbunks) -"mJP" = ( -/obj/structure/machinery/cm_vending/gear/tl{ - density = 0; - pixel_x = -32; - vend_x_offset = 1 - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "orange" - }, -/area/almayer/squads/bravo) -"mKb" = ( -/obj/structure/flora/pottedplant{ - desc = "It is made of Fiberbush(tm). It contains asbestos."; - icon_state = "pottedplant_22"; - name = "synthetic potted plant"; - pixel_y = 8 - }, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "red" - }, -/area/almayer/squads/alpha) "mKf" = ( /obj/structure/largecrate/random/barrel/white, /turf/open/floor/plating/plating_catwalk, @@ -52141,38 +50572,6 @@ icon_state = "mono" }, /area/almayer/medical/hydroponics) -"mKJ" = ( -/obj/structure/machinery/firealarm{ - pixel_y = 28 - }, -/obj/item/bedsheet/purple{ - layer = 3.2 - }, -/obj/item/bedsheet/purple{ - pixel_y = 13 - }, -/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 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/port_emb) "mKX" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -52216,19 +50615,6 @@ "mLE" = ( /turf/open/floor/plating, /area/almayer/command/airoom) -"mLF" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/surface/table/almayer, -/obj/item/trash/USCMtray{ - pixel_y = 7 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/alpha) "mLI" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -52252,18 +50638,63 @@ }, /turf/open/floor/almayer, /area/almayer/squads/req) +"mLT" = ( +/obj/structure/machinery/vending/cola{ + density = 0; + pixel_y = 16 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blue" + }, +/area/almayer/squads/delta) "mLU" = ( /turf/open/floor/almayer{ dir = 6; icon_state = "orange" }, /area/almayer/hallways/stern_hallway) +"mMc" = ( +/obj/structure/machinery/disposal, +/obj/structure/disposalpipe/trunk, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/cryo_cells) +"mMd" = ( +/obj/structure/target, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/hull/lower_hull/l_a_s) +"mMo" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "mechdoor"; + name = "Vehicle Bay One"; + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "mMu" = ( /obj/structure/machinery/floodlight/landing, /turf/open/floor/almayer{ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south2) +"mMJ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "mMP" = ( /obj/effect/landmark/start/intel, /turf/open/floor/plating/plating_catwalk, @@ -52370,6 +50801,14 @@ icon_state = "green" }, /area/almayer/hallways/aft_hallway) +"mON" = ( +/obj/structure/surface/table/almayer, +/obj/item/reagent_container/food/drinks/bottle/tequila, +/obj/structure/pipes/vents/pump{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "mOU" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -52408,6 +50847,15 @@ }, /turf/open/floor/almayer, /area/almayer/command/cic) +"mPQ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "silvercorner" + }, +/area/almayer/hallways/port_hallway) "mPX" = ( /turf/open/floor/almayer{ icon_state = "orange" @@ -52492,6 +50940,25 @@ icon_state = "test_floor4" }, /area/almayer/command/airoom) +"mRF" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/port_hallway) +"mRQ" = ( +/obj/structure/surface/table/almayer, +/obj/item/device/camera/siliconcam{ + pixel_x = -6; + pixel_y = 11 + }, +/obj/item/device/camera_film{ + pixel_x = 4; + pixel_y = -2 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "mRW" = ( /turf/open/floor/almayer/research/containment/corner1, /area/almayer/medical/containment/cell/cl) @@ -52542,12 +51009,6 @@ icon_state = "test_floor4" }, /area/almayer/hull/upper_hull/u_f_p) -"mSU" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer{ - icon_state = "blue" - }, -/area/almayer/squads/charlie_delta_shared) "mTb" = ( /obj/structure/machinery/light{ dir = 4 @@ -52607,6 +51068,15 @@ /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/starboard_hallway) +"mUh" = ( +/obj/structure/bed/chair/comfy{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/living/captain_mess) "mUn" = ( /obj/structure/machinery/conveyor_switch{ id = "lower_garbage" @@ -52624,12 +51094,6 @@ icon_state = "plate" }, /area/almayer/living/offices) -"mUx" = ( -/obj/structure/machinery/door/airlock/almayer/marine/bravo/sl, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/bravo) "mUz" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/computer/cameras/almayer/ares{ @@ -52694,6 +51158,23 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) +"mVG" = ( +/obj/structure/machinery/cm_vending/sorted/marine_food{ + density = 0; + pixel_y = 16 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) +"mVH" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/cell_charger, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/port_hallway) "mWe" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 8; @@ -52725,15 +51206,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/port_hallway) -"mWy" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/shared/alpha_bravo/yellow{ - dir = 2 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/alpha_bravo_shared) "mWD" = ( /obj/structure/machinery/cryopod/right{ layer = 3.1; @@ -52743,21 +51215,6 @@ icon_state = "cargo" }, /area/almayer/living/bridgebunks) -"mWQ" = ( -/obj/structure/flora/pottedplant{ - desc = "It is made of Fiberbush(tm). It contains asbestos."; - icon_state = "pottedplant_22"; - name = "synthetic potted plant"; - pixel_y = 8 - }, -/obj/structure/sign/banners/maximumeffort{ - pixel_y = 30 - }, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "blue" - }, -/area/almayer/squads/delta) "mWV" = ( /obj/structure/bed/chair/comfy/blue, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -52782,6 +51239,20 @@ icon_state = "red" }, /area/almayer/hallways/aft_hallway) +"mXX" = ( +/obj/structure/surface/table/almayer, +/obj/item/tool/weldpack, +/obj/item/tool/weldpack, +/obj/structure/machinery/light{ + dir = 8; + invisibility = 101; + unacidable = 1; + unslashable = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha) "mYs" = ( /obj/structure/machinery/light{ dir = 4 @@ -52796,20 +51267,6 @@ }, /turf/closed/wall/almayer, /area/almayer/squads/req) -"mYw" = ( -/obj/structure/sign/safety/escapepod{ - pixel_x = -17; - pixel_y = -8 - }, -/obj/structure/sign/safety/stairs{ - pixel_x = -17; - pixel_y = 7 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "blue" - }, -/area/almayer/hallways/port_hallway) "mYx" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22"; @@ -52819,6 +51276,16 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south1) +"mYI" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N" + }, +/obj/structure/platform{ + dir = 8; + layer = 2.7 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/port_hallway) "mYY" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out" @@ -52840,20 +51307,6 @@ icon_state = "green" }, /area/almayer/hallways/port_hallway) -"mZb" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22"; - pixel_y = 8 - }, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 1; - name = "ship-grade camera" - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "blue" - }, -/area/almayer/command/cichallway) "mZr" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -52903,12 +51356,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_f_s) -"nar" = ( -/obj/structure/toilet{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/auxiliary_officer_office) "nau" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 @@ -52918,9 +51365,21 @@ "naB" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/brig/perma) +"naM" = ( +/obj/structure/machinery/vending/coffee, +/turf/open/floor/almayer{ + icon_state = "greenfull" + }, +/area/almayer/command/cichallway) "naQ" = ( -/obj/structure/machinery/light/small{ - dir = 4 +/obj/structure/machinery/door/window/tinted{ + dir = 1 + }, +/obj/structure/toilet{ + dir = 1 + }, +/obj/structure/window/reinforced/tinted{ + dir = 8 }, /turf/open/floor/prison{ icon_state = "kitchen" @@ -52953,12 +51412,39 @@ icon_state = "test_floor4" }, /area/almayer/living/gym) +"nbh" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" + }, +/area/almayer/squads/alpha) "nbB" = ( /obj/structure/closet/secure_closet/freezer/fridge/full, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/living/grunt_rnr) +"nbI" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "ncp" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -53065,6 +51551,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) +"neM" = ( +/obj/structure/machinery/computer/ordercomp, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha) "neO" = ( /obj/structure/machinery/power/apc/almayer{ dir = 1 @@ -53080,16 +51572,16 @@ }, /turf/open/floor/almayer, /area/almayer/living/briefing) -"nff" = ( -/obj/structure/surface/table/almayer, -/obj/item/trash/USCMtray{ - pixel_x = 6; - pixel_y = 4 +"neU" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/microwave{ + pixel_x = -2; + pixel_y = 7 }, /turf/open/floor/almayer{ - icon_state = "orangefull" + icon_state = "greenfull" }, -/area/almayer/living/briefing) +/area/almayer/command/cichallway) "nfp" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -53142,32 +51634,6 @@ icon_state = "cargo" }, /area/almayer/squads/req) -"ngA" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/junction, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" - }, -/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 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) "ngI" = ( /turf/open/floor/almayer{ dir = 8; @@ -53194,22 +51660,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_p) -"nhx" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/toy/deck{ - desc = "A simple deck of playing cards. You could play Caravan with these!"; - pixel_y = 12 - }, -/obj/item/toy/deck/uno{ - pixel_x = 3; - pixel_y = 4 - }, -/obj/item/clothing/mask/cigarette{ - pixel_x = -2; - pixel_y = -2 - }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) "nhG" = ( /obj/structure/surface/table/almayer, /obj/item/newspaper{ @@ -53277,43 +51727,12 @@ icon_state = "sterile_green" }, /area/almayer/medical/medical_science) -"niR" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_10" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/auxiliary_officer_office) -"niY" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_x = -1; - pixel_y = 2 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) "nja" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south2) -"njd" = ( -/obj/structure/pipes/standard/manifold/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "red" - }, -/area/almayer/squads/alpha) "njD" = ( /obj/structure/surface/table/almayer, /obj/item/clothing/suit/storage/hazardvest, @@ -53334,12 +51753,6 @@ icon_state = "plate" }, /area/almayer/living/grunt_rnr) -"njL" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "emerald" - }, -/area/almayer/hallways/port_hallway) "njT" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -53350,6 +51763,11 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_a_p) +"njX" = ( +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/living/tankerbunks) "nka" = ( /obj/structure/machinery/door/poddoor/railing{ dir = 2; @@ -53378,6 +51796,33 @@ icon_state = "red" }, /area/almayer/shipboard/starboard_missiles) +"nkC" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/toy/deck{ + desc = "A simple deck of playing cards. You could play Caravan with these!"; + pixel_y = 12 + }, +/obj/item/toy/deck/uno{ + pixel_x = 3; + pixel_y = 4 + }, +/obj/item/clothing/mask/cigarette{ + pixel_x = -2; + pixel_y = -2 + }, +/turf/open/floor/almayer{ + icon_state = "silverfull" + }, +/area/almayer/hallways/port_hallway) +"nkK" = ( +/obj/structure/machinery/autolathe, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha) "nlB" = ( /turf/open/floor/almayer{ dir = 1; @@ -53470,6 +51915,10 @@ icon_state = "plate" }, /area/almayer/command/cichallway) +"nno" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "nnr" = ( /obj/structure/surface/table/almayer, /obj/item/storage/toolbox/electrical{ @@ -53487,13 +51936,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_p) -"nny" = ( -/obj/structure/sign/safety/rewire{ - pixel_x = -17; - pixel_y = 8 - }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) "nnz" = ( /obj/structure/sign/safety/maint{ pixel_x = 32; @@ -53570,6 +52012,15 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_m_p) +"noY" = ( +/obj/structure/bed/chair/comfy{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/living/captain_mess) "nph" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -53592,6 +52043,28 @@ icon_state = "dark_sterile" }, /area/almayer/medical/containment) +"nqp" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/machinery/computer/working_joe{ + dir = 4; + pixel_x = -17 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) +"nqq" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/delta) "nqx" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -53641,15 +52114,6 @@ icon_state = "plating" }, /area/almayer/hallways/vehiclehangar) -"nrw" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "emeraldcorner" - }, -/area/almayer/squads/charlie) "nrz" = ( /obj/structure/surface/rack, /obj/item/tool/kitchen/rollingpin, @@ -53658,6 +52122,20 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_p) +"nrB" = ( +/obj/structure/machinery/cm_vending/clothing/specialist/delta{ + density = 0; + pixel_y = -31 + }, +/obj/structure/machinery/cm_vending/gear/spec{ + density = 0; + pixel_x = -32 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "blue" + }, +/area/almayer/squads/delta) "nrN" = ( /obj/structure/machinery/sleep_console, /turf/open/floor/almayer{ @@ -53679,6 +52157,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south1) +"nse" = ( +/obj/structure/machinery/vending/cigarette, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "nsu" = ( /obj/structure/machinery/door/airlock/almayer/security{ dir = 2; @@ -53693,6 +52177,37 @@ icon_state = "test_floor4" }, /area/almayer/hull/lower_hull/l_f_s) +"nsx" = ( +/obj/structure/machinery/cm_vending/gear/tl{ + density = 0; + pixel_x = -32; + vend_x_offset = 1 + }, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "red" + }, +/area/almayer/squads/alpha) +"nsD" = ( +/turf/open/floor/carpet, +/area/almayer/living/auxiliary_officer_office) +"nsT" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/delta) +"nsW" = ( +/obj/structure/target, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/hallways/port_hallway) "nsY" = ( /turf/closed/wall/almayer, /area/almayer/living/port_emb) @@ -53782,6 +52297,14 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_f_s) +"ntB" = ( +/obj/structure/pipes/vents/pump{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "blue" + }, +/area/almayer/squads/delta) "ntI" = ( /obj/structure/machinery/light{ dir = 4 @@ -53811,12 +52334,20 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_s) -"nuA" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +"nuz" = ( +/obj/structure/sign/safety/escapepod{ + pixel_x = -17; + pixel_y = -8 }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha) +/obj/structure/sign/safety/stairs{ + pixel_x = -17; + pixel_y = 7 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "green" + }, +/area/almayer/hallways/starboard_hallway) "nuK" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/condiment/hotsauce/franks{ @@ -53849,18 +52380,6 @@ }, /turf/open/floor/plating, /area/almayer/medical/chemistry) -"nvT" = ( -/obj/structure/disposalpipe/junction{ - dir = 2; - icon_state = "pipe-j2" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/delta) "nwb" = ( /obj/structure/pipes/vents/scrubber{ dir = 1 @@ -53905,12 +52424,6 @@ allow_construction = 0 }, /area/almayer/shipboard/brig/lobby) -"nwD" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orange" - }, -/area/almayer/command/cic) "nwG" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 1 @@ -53957,6 +52470,31 @@ icon_state = "green" }, /area/almayer/squads/req) +"nxa" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_x = -1; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "cargo_arrow" + }, +/area/almayer/squads/alpha) "nxq" = ( /obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ dir = 1; @@ -53969,6 +52507,20 @@ }, /turf/open/floor/plating, /area/almayer/shipboard/brig/main_office) +"nxJ" = ( +/obj/structure/machinery/cm_vending/clothing/medic/alpha{ + density = 0; + pixel_y = 28 + }, +/obj/structure/machinery/cm_vending/gear/medic{ + pixel_x = 32; + density = 0 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "red" + }, +/area/almayer/squads/alpha) "nxK" = ( /obj/structure/sign/safety/high_voltage{ pixel_y = -32 @@ -53981,6 +52533,21 @@ icon_state = "blue" }, /area/almayer/hallways/aft_hallway) +"nxP" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) +"nxS" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "greencorner" + }, +/area/almayer/hallways/starboard_hallway) "nyj" = ( /obj/effect/decal/medical_decals{ icon_state = "docdecal2" @@ -54020,9 +52587,6 @@ icon_state = "green" }, /area/almayer/hallways/starboard_hallway) -"nyQ" = ( -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) "nzv" = ( /obj/structure/filingcabinet/filingcabinet, /obj/item/clipboard, @@ -54063,19 +52627,6 @@ }, /turf/open/floor/almayer, /area/almayer/squads/req) -"nBa" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad{ - req_access = null; - req_one_access = null; - req_one_access_txt = "15;16;21"; - vend_x_offset = 0; - vend_y_offset = 0 - }, -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha_bravo_shared) "nBb" = ( /turf/open/floor/almayer{ dir = 5; @@ -54123,6 +52674,16 @@ icon_state = "redcorner" }, /area/almayer/living/briefing) +"nBy" = ( +/obj/structure/sign/safety/south{ + pixel_x = -17; + pixel_y = 8 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "green" + }, +/area/almayer/hallways/port_hallway) "nBE" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -54140,27 +52701,6 @@ icon_state = "red" }, /area/almayer/hallways/aft_hallway) -"nCf" = ( -/obj/effect/landmark/start/marine/tl/charlie, -/obj/effect/landmark/late_join/charlie, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/charlie) -"nCp" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = -29 - }, -/turf/open/floor/almayer{ - icon_state = "orange" - }, -/area/almayer/squads/bravo) "nCT" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -54228,14 +52768,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/req) -"nEo" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/donut_box{ - pixel_x = 6; - pixel_y = 6 - }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie) "nEs" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -54352,12 +52884,12 @@ icon_state = "plate" }, /area/almayer/living/grunt_rnr) -"nFK" = ( -/obj/structure/bed/chair{ - dir = 1 +"nFR" = ( +/turf/open/floor/almayer{ + dir = 8; + icon_state = "blue" }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) +/area/almayer/squads/delta) "nFX" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 2; @@ -54396,6 +52928,26 @@ icon_state = "plate" }, /area/almayer/shipboard/port_point_defense) +"nGC" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera" + }, +/obj/structure/sign/safety/ammunition{ + pixel_x = 15; + pixel_y = 32 + }, +/obj/structure/sign/safety/hazard{ + pixel_y = 32 + }, +/obj/structure/machinery/disposal, +/obj/structure/disposalpipe/trunk, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "nHg" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -54408,15 +52960,6 @@ "nHF" = ( /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_m_s) -"nHJ" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "plating_striped" - }, -/area/almayer/living/cryo_cells) "nHV" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -54530,6 +53073,15 @@ icon_state = "red" }, /area/almayer/command/lifeboat) +"nKV" = ( +/obj/structure/machinery/light, +/obj/structure/surface/table/almayer, +/obj/structure/machinery/cell_charger, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/port_hallway) "nLa" = ( /obj/structure/bed/chair{ dir = 4 @@ -54570,6 +53122,13 @@ icon_state = "cargo_arrow" }, /area/almayer/squads/req) +"nLC" = ( +/obj/item/trash/uscm_mre, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "redcorner" + }, +/area/almayer/squads/alpha) "nLI" = ( /obj/structure/sign/safety/terminal{ layer = 2.5; @@ -54598,6 +53157,13 @@ /obj/structure/machinery/cm_vending/sorted/marine_food, /turf/open/floor/almayer, /area/almayer/hull/upper_hull/u_f_p) +"nLS" = ( +/obj/structure/surface/table/almayer, +/obj/effect/landmark/map_item, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha) "nMc" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -54637,6 +53203,15 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_s) +"nMN" = ( +/obj/structure/bed/chair{ + dir = 8; + pixel_y = 3 + }, +/turf/open/floor/almayer{ + icon_state = "silverfull" + }, +/area/almayer/hallways/port_hallway) "nMV" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = 25 @@ -54672,12 +53247,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_m_p) -"nNH" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "emeraldcorner" - }, -/area/almayer/living/briefing) "nNQ" = ( /obj/structure/machinery/firealarm{ dir = 4; @@ -54705,15 +53274,6 @@ }, /turf/open/floor/almayer, /area/almayer/living/port_emb) -"nNV" = ( -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 - }, -/turf/open/floor/almayer{ - icon_state = "emeraldfull" - }, -/area/almayer/squads/charlie_delta_shared) "nNX" = ( /obj/structure/machinery/door/airlock/almayer/secure/reinforced{ name = "\improper Evacuation Airlock PU-1"; @@ -54851,6 +53411,14 @@ /obj/structure/machinery/light, /turf/open/floor/almayer, /area/almayer/hallways/aft_hallway) +"nQS" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "bluefull" + }, +/area/almayer/squads/delta) "nRq" = ( /obj/effect/decal/cleanable/blood/oil/streak, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -54876,6 +53444,18 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/engineering/upper_engineering) +"nSu" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha) "nSG" = ( /obj/structure/machinery/door_control{ id = "tcomms"; @@ -54926,12 +53506,6 @@ }, /turf/open/floor/almayer, /area/almayer/command/computerlab) -"nTZ" = ( -/turf/open/floor/almayer{ - dir = 5; - icon_state = "orange" - }, -/area/almayer/living/gym) "nUa" = ( /obj/structure/bed/chair{ dir = 1 @@ -55042,6 +53616,14 @@ icon_state = "test_floor4" }, /area/almayer/engineering/upper_engineering/starboard) +"nWn" = ( +/obj/structure/machinery/cryopod/right, +/turf/open/floor/wood/ship, +/area/almayer/living/auxiliary_officer_office) +"nWC" = ( +/obj/structure/disposalpipe/segment, +/turf/closed/wall/almayer, +/area/almayer/living/cryo_cells) "nWN" = ( /obj/structure/surface/table/almayer, /turf/open/floor/wood/ship, @@ -55081,16 +53663,6 @@ icon_state = "test_floor4" }, /area/almayer/squads/req) -"nYc" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "cargo_arrow" - }, -/area/almayer/squads/bravo) "nYd" = ( /obj/structure/bed/chair/wood/normal{ dir = 4 @@ -55139,14 +53711,6 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/cells) -"nZy" = ( -/obj/structure/surface/table/almayer, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/item/facepaint/black, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/charlie) "nZF" = ( /turf/open/floor/almayer{ icon_state = "orange" @@ -55171,12 +53735,6 @@ }, /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_f_p) -"oaW" = ( -/obj/structure/machinery/cryopod/right, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/squads/charlie) "obo" = ( /obj/structure/disposalpipe/up/almayer{ dir = 8; @@ -55200,15 +53758,6 @@ icon_state = "silver" }, /area/almayer/engineering/port_atmos) -"obE" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha_bravo_shared) "obG" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/computer/card{ @@ -55218,12 +53767,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_s) -"obQ" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) "ocf" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 1 @@ -55253,33 +53796,18 @@ }, /turf/open/floor/carpet, /area/almayer/living/commandbunks) -"ocB" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S"; - layer = 3.3 - }, -/obj/structure/sign/safety/terminal{ - pixel_x = 14; - pixel_y = 24 - }, -/obj/structure/sign/safety/fibre_optics{ - pixel_x = 14; - pixel_y = 38 - }, -/obj/structure/machinery/computer/working_joe{ - dir = 8; - pixel_x = 17 - }, -/obj/structure/sign/safety/laser{ - pixel_y = 24 +"ocX" = ( +/obj/structure/machinery/alarm/almayer{ + dir = 1 }, -/obj/structure/sign/safety/rewire{ - pixel_y = 38 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/open/floor/almayer/no_build{ - icon_state = "ai_floors" +/turf/open/floor/almayer{ + dir = 4; + icon_state = "bluecorner" }, -/area/almayer/command/airoom) +/area/almayer/squads/delta) "oda" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/device/radio{ @@ -55314,16 +53842,6 @@ icon_state = "red" }, /area/almayer/command/lifeboat) -"odB" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "cargo_arrow" - }, -/area/almayer/squads/bravo) "odD" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 8; @@ -55370,20 +53888,10 @@ icon_state = "outerhull_dir" }, /area/almayer/command/lifeboat) -"oef" = ( -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/squads/alpha_bravo_shared) "oeo" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_f_p) -"oer" = ( -/turf/closed/wall/almayer{ - damage_cap = 15000 - }, -/area/almayer/squads/delta) "oeB" = ( /turf/open/floor/almayer{ dir = 8; @@ -55405,6 +53913,14 @@ icon_state = "silver" }, /area/almayer/command/computerlab) +"oeN" = ( +/obj/structure/surface/rack, +/obj/effect/spawner/random/claymore/lowchance, +/obj/effect/spawner/random/claymore/lowchance, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/squads/req) "ofs" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -55437,12 +53953,40 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_f_p) -"ohj" = ( -/obj/structure/machinery/cryopod, +"ohe" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/obj/structure/sign/safety/terminal{ + pixel_x = 14; + pixel_y = 24 + }, +/obj/structure/sign/safety/fibre_optics{ + pixel_x = 14; + pixel_y = 38 + }, +/obj/structure/machinery/computer/working_joe{ + dir = 8; + pixel_x = 17 + }, +/obj/structure/sign/safety/laser{ + pixel_y = 24 + }, +/obj/structure/sign/safety/rewire{ + pixel_y = 38 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) +"ohk" = ( +/obj/structure/surface/table/almayer, +/obj/effect/spawner/random/toolbox, /turf/open/floor/almayer{ - icon_state = "cargo" + icon_state = "plate" }, -/area/almayer/squads/charlie) +/area/almayer/squads/alpha) "ohA" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -55549,15 +54093,6 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) -"oiQ" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/squads/bravo) "oiY" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -55574,28 +54109,11 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) -"ojF" = ( -/obj/structure/machinery/cm_vending/clothing/tl/charlie{ - density = 0; - pixel_x = 32 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "emerald" - }, -/area/almayer/squads/charlie) "ojZ" = ( /obj/structure/window/framed/almayer/white, /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/plating, /area/almayer/medical/lower_medical_medbay) -"oka" = ( -/obj/effect/landmark/start/marine/medic/charlie, -/obj/effect/landmark/late_join/charlie, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) "okd" = ( /obj/structure/platform_decoration, /obj/structure/machinery/power/apc/almayer{ @@ -55711,13 +54229,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/engineering/ce_room) -"olU" = ( -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "blue" - }, -/area/almayer/command/cichallway) "omb" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 1 @@ -55773,17 +54284,6 @@ icon_state = "orange" }, /area/almayer/hallways/hangar) -"onN" = ( -/obj/structure/surface/table/almayer, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/item/toy/deck{ - pixel_x = 8; - pixel_y = 8 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/charlie) "onQ" = ( /obj/structure/sign/safety/rewire{ pixel_x = 8; @@ -55794,17 +54294,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/upper_medical) -"onY" = ( -/obj/structure/surface/table/almayer, -/obj/item/paper_bin/uscm, -/obj/item/device/flashlight/lamp{ - pixel_x = -8; - pixel_y = 12 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/auxiliary_officer_office) "oog" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -55818,6 +54307,15 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/hangar) +"ooi" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "green" + }, +/area/almayer/hallways/starboard_hallway) "oos" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/living/grunt_rnr) @@ -55836,6 +54334,24 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) +"ooJ" = ( +/obj/structure/bed/chair{ + dir = 8; + pixel_y = 3 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "blue" + }, +/area/almayer/squads/delta) "ooR" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 1 @@ -55889,19 +54405,36 @@ icon_state = "red" }, /area/almayer/shipboard/brig/processing) -"oqu" = ( -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 8 +"opS" = ( +/obj/structure/largecrate/random/case/small, +/obj/item/toy/deck{ + pixel_x = -6; + pixel_y = 6 }, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 +/obj/structure/sign/poster{ + desc = "One of those hot, tanned babes back the beaches of good ol' Earth."; + icon_state = "poster12"; + name = "Beach Babe Pinup"; + pixel_x = -30; + pixel_y = 6; + serial_number = 12 }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 9; + icon_state = "silver" }, -/area/almayer/squads/delta) +/area/almayer/living/port_emb) +"oqf" = ( +/obj/effect/decal/cleanable/ash, +/obj/item/trash/cigbutt/ucigbutt{ + pixel_x = -13; + pixel_y = 8 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blue" + }, +/area/almayer/hallways/hangar) "oqv" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -55919,6 +54452,40 @@ }, /turf/open/floor/almayer, /area/almayer/living/pilotbunks) +"oqx" = ( +/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/structure/sign/safety/bathunisex{ + pixel_x = -16; + pixel_y = 8 + }, +/obj/item/toy/plushie_cade, +/obj/item/bedsheet/blue{ + layer = 3.2 + }, +/obj/item/bedsheet/blue{ + pixel_y = 13 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/port_emb) "oqA" = ( /obj/structure/machinery/door/poddoor/shutters/almayer/uniform_vendors, /turf/open/floor/almayer{ @@ -56018,13 +54585,23 @@ dir = 10 }, /area/almayer/command/lifeboat) -"osc" = ( -/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep, -/obj/structure/machinery/light{ - dir = 8 +"orZ" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) +/turf/open/floor/almayer{ + icon_state = "silver" + }, +/area/almayer/living/port_emb) +"osg" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/squads/delta) "osx" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -56065,22 +54642,6 @@ icon_state = "test_floor4" }, /area/almayer/command/cic) -"osA" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" - }, -/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{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) "osE" = ( /obj/structure/closet/emcloset, /turf/open/floor/almayer{ @@ -56102,6 +54663,52 @@ }, /turf/open/floor/wood/ship, /area/almayer/shipboard/brig/chief_mp_office) +"osN" = ( +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = 28 + }, +/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{ + layer = 3.1 + }, +/obj/item/bedsheet/brown{ + pixel_y = 13 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/port_emb) +"osO" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/sign/prop1{ + pixel_x = 32; + pixel_y = 2 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/port_hallway) "osT" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/prop/ice_colony/hula_girl{ @@ -56110,6 +54717,19 @@ }, /turf/open/floor/almayer, /area/almayer/living/pilotbunks) +"osV" = ( +/obj/structure/surface/rack, +/obj/effect/spawner/random/attachment, +/obj/effect/spawner/random/attachment, +/obj/effect/spawner/random/attachment, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/squads/req) +"ots" = ( +/obj/structure/largecrate/random/secure, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/tankerbunks) "otu" = ( /turf/closed/wall/almayer/research/containment/wall/connect_w, /area/almayer/medical/containment/cell) @@ -56218,6 +54838,10 @@ icon_state = "silver" }, /area/almayer/living/briefing) +"ovq" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer, +/area/almayer/living/cryo_cells) "ovF" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -56240,6 +54864,20 @@ dir = 4 }, /area/almayer/medical/containment/cell) +"ovN" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper Cryogenics Bay" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/port_hallway) "ovP" = ( /obj/structure/sign/safety/security{ pixel_x = 15 @@ -56251,6 +54889,16 @@ icon_state = "mono" }, /area/almayer/engineering/upper_engineering/starboard) +"owu" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/machinery/camera/autoname/almayer, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blue" + }, +/area/almayer/squads/delta) "owH" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/machinery/door/poddoor/almayer{ @@ -56268,20 +54916,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/grunt_rnr) -"owW" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/door/airlock/almayer/maint{ - req_access = null; - req_one_access = null; - req_one_access_txt = "19;29"; - access_modified = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/shipboard/sea_office) "oxi" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -56353,15 +54987,6 @@ icon_state = "cargo" }, /area/almayer/engineering/engine_core) -"ozq" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/alpha) "ozr" = ( /obj/structure/closet, /obj/item/reagent_container/food/drinks/bottle/sake, @@ -56384,6 +55009,15 @@ icon_state = "mono" }, /area/almayer/engineering/upper_engineering/starboard) +"ozH" = ( +/obj/structure/bed/chair{ + dir = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer, +/area/almayer/living/tankerbunks) "ozN" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat/blastdoor{ id_tag = "Boat2-D2"; @@ -56394,24 +55028,12 @@ icon_state = "test_floor4" }, /area/almayer/engineering/upper_engineering/starboard) -"ozT" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/obj/structure/disposalpipe/segment, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - pixel_x = -1 - }, +"ozP" = ( +/obj/structure/machinery/cm_vending/sorted/tech/electronics_storage, /turf/open/floor/almayer{ - dir = 6; - icon_state = "emerald" + icon_state = "redfull" }, -/area/almayer/squads/charlie) +/area/almayer/command/cic) "oAd" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 1; @@ -56465,6 +55087,15 @@ icon_state = "silver" }, /area/almayer/command/cichallway) +"oBU" = ( +/obj/structure/largecrate/supply/ammo/m41a/half, +/obj/structure/largecrate/supply/ammo/pistol/half{ + pixel_y = 12 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/lower_hull/l_f_p) "oCf" = ( /obj/structure/machinery/light{ unacidable = 1; @@ -56623,15 +55254,6 @@ icon_state = "bluefull" }, /area/almayer/command/cichallway) -"oEX" = ( -/obj/structure/pipes/vents/scrubber{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/living/port_emb) "oFG" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -56644,13 +55266,6 @@ /obj/docking_port/stationary/escape_pod/north, /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_m_p) -"oFV" = ( -/obj/structure/sign/poster{ - pixel_x = -32; - serial_number = 16 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/delta) "oGx" = ( /obj/structure/closet/secure_closet/surgical{ pixel_x = 30 @@ -56680,39 +55295,43 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south1) -"oGP" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ +"oGF" = ( +/obj/structure/machinery/cryopod/right{ + pixel_y = 6 + }, +/obj/structure/machinery/light{ dir = 4 }, /turf/open/floor/almayer{ - icon_state = "orange" + icon_state = "cargo" }, -/area/almayer/living/port_emb) -"oHc" = ( -/obj/structure/machinery/light, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - pixel_x = -1 +/area/almayer/squads/delta) +"oGI" = ( +/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/squads/delta) +"oHa" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/tool/stamp/ro{ + name = "spare quartermaster's rubber stamp"; + pixel_x = -7; + pixel_y = 11 }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_x = -1; - pixel_y = 2 +/turf/open/floor/almayer{ + icon_state = "greenfull" }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1; - pixel_y = 2 +/area/almayer/command/cichallway) +"oHf" = ( +/obj/structure/sign/poster{ + pixel_y = 32 }, /turf/open/floor/almayer{ - dir = 8; - icon_state = "cargo_arrow" + dir = 4; + icon_state = "silver" }, -/area/almayer/squads/charlie) +/area/almayer/hallways/port_hallway) "oHl" = ( /obj/structure/surface/table/almayer, /obj/item/storage/toolbox/electrical, @@ -56729,6 +55348,22 @@ icon_state = "test_floor4" }, /area/almayer/engineering/laundry) +"oHz" = ( +/obj/structure/machinery/light{ + dir = 8; + invisibility = 101; + unacidable = 1; + unslashable = 1 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "plating_striped" + }, +/area/almayer/hull/lower_hull/l_a_s) +"oHD" = ( +/obj/structure/machinery/cm_vending/sorted/marine_food, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "oIc" = ( /obj/structure/machinery/power/apc/almayer{ dir = 4 @@ -56790,29 +55425,26 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) -"oJR" = ( -/obj/effect/projector{ - name = "Almayer_AresDown"; - vector_x = 97; - vector_y = -65 +"oJA" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/toolbox/mechanical{ + pixel_x = 3; + pixel_y = 12 }, -/obj/structure/platform{ - dir = 8 +/obj/item/storage/toolbox/electrical{ + pixel_y = 5 }, -/obj/structure/stairs{ - dir = 1; - icon_state = "ramptop" +/obj/item/folder/white{ + layer = 2.9; + pixel_x = -8 }, -/obj/structure/machinery/door_control{ - id = "ARES StairsUpper"; - name = "ARES Core Access"; - pixel_x = -24; - req_one_access_txt = "90;91;92" +/obj/structure/machinery/computer/working_joe{ + pixel_y = 16 }, -/turf/open/floor/almayer/no_build{ - icon_state = "ai_floors" +/turf/open/floor/almayer{ + icon_state = "mono" }, -/area/almayer/command/airoom) +/area/almayer/medical/hydroponics) "oKb" = ( /obj/structure/machinery/status_display{ pixel_y = 30 @@ -56855,29 +55487,6 @@ icon_state = "plating" }, /area/almayer/squads/req) -"oLi" = ( -/obj/effect/landmark/start/marine/medic/bravo, -/obj/effect/landmark/late_join/bravo, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/alpha) -"oLm" = ( -/obj/structure/machinery/door_control{ - id = "ARES StairsLower"; - name = "ARES Core Lockdown"; - pixel_x = -24; - pixel_y = 8; - req_one_access_txt = "90;91;92" - }, -/obj/structure/machinery/camera/autoname/almayer/containment/ares{ - dir = 4; - pixel_y = -8 - }, -/obj/effect/step_trigger/clone_cleaner, -/turf/open/floor/almayer/no_build{ - dir = 8; - icon_state = "silver" - }, -/area/almayer/command/airoom) "oLv" = ( /obj/structure/sign/safety/medical{ pixel_x = 8; @@ -56943,17 +55552,6 @@ icon_state = "plate" }, /area/almayer/squads/req) -"oMi" = ( -/obj/structure/machinery/status_display{ - pixel_y = 30 - }, -/obj/structure/sign/safety/rewire{ - pixel_x = 32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/auxiliary_officer_office) "oMs" = ( /obj/structure/machinery/computer/cameras/almayer{ dir = 1 @@ -56963,14 +55561,6 @@ icon_state = "rasputin3" }, /area/almayer/powered/agent) -"oMH" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/squads/alpha_bravo_shared) "oMM" = ( /obj/structure/machinery/light{ dir = 1 @@ -57000,14 +55590,6 @@ icon_state = "redfull" }, /area/almayer/hull/lower_hull/l_f_s) -"oNj" = ( -/obj/structure/sign/prop1{ - pixel_x = -32; - pixel_y = 2 - }, -/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) "oNp" = ( /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -57111,34 +55693,16 @@ icon_state = "plate" }, /area/almayer/command/cichallway) +"oQA" = ( +/obj/effect/landmark/start/marine/leader/alpha, +/obj/effect/landmark/late_join/alpha, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/alpha) "oQH" = ( /turf/open/floor/almayer{ icon_state = "cargo_arrow" }, /area/almayer/living/briefing) -"oQM" = ( -/obj/structure/pipes/vents/pump{ - dir = 4 - }, -/obj/structure/surface/table/almayer, -/obj/item/paper_bin{ - pixel_x = -4; - pixel_y = 8 - }, -/obj/item/tool/pen, -/obj/item/book/manual/marine_law{ - pixel_x = 15; - pixel_y = 5 - }, -/obj/item/book/manual/security_space_law{ - pixel_x = 16; - pixel_y = 9 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "silver" - }, -/area/almayer/living/auxiliary_officer_office) "oRj" = ( /obj/structure/stairs{ icon_state = "ramptop" @@ -57230,29 +55794,24 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering/port) -"oSL" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 1; - name = "ship-grade camera" - }, -/obj/structure/sign/safety/hazard{ - pixel_x = 15; - pixel_y = -32 +"oSA" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/obj/structure/sign/safety/ammunition{ - pixel_y = -32 +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 }, -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 1 +/obj/structure/machinery/door/airlock/multi_tile/almayer/almayer{ + dir = 1; + name = "\improper Auxiliary Combat Support Secondary Preparations"; + req_one_access = "19;27;22"; + welded = 1 }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "test_floor4" }, -/area/almayer/squads/alpha_bravo_shared) +/area/almayer/hallways/port_hallway) "oTe" = ( /obj/item/prop/almayer/box, /obj/item/prop{ @@ -57288,15 +55847,13 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_m_p) -"oTA" = ( -/obj/structure/machinery/cryopod, -/obj/structure/machinery/light{ - dir = 8 - }, +"oTU" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/light, /turf/open/floor/almayer{ - icon_state = "cargo" + icon_state = "test_floor4" }, -/area/almayer/squads/alpha) +/area/almayer/hallways/stern_hallway) "oUG" = ( /obj/structure/machinery/light{ dir = 8 @@ -57306,6 +55863,16 @@ icon_state = "silver" }, /area/almayer/command/cichallway) +"oVx" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22"; + pixel_y = 8 + }, +/turf/open/floor/almayer{ + dir = 6; + icon_state = "green" + }, +/area/almayer/command/cichallway) "oVP" = ( /obj/structure/bed/chair{ dir = 4 @@ -57355,6 +55922,31 @@ icon_state = "cargo" }, /area/almayer/shipboard/brig/cryo) +"oWQ" = ( +/obj/structure/disposalpipe/junction, +/obj/structure/pipes/standard/simple/hidden/supply, +/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/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 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/delta) "oWX" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ dir = 1; @@ -57366,11 +55958,6 @@ icon_state = "test_floor4" }, /area/almayer/living/grunt_rnr) -"oXb" = ( -/obj/effect/landmark/start/marine/charlie, -/obj/effect/landmark/late_join/charlie, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/charlie) "oXp" = ( /obj/effect/decal/cleanable/ash, /turf/open/floor/wood/ship, @@ -57391,6 +55978,16 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) +"oYa" = ( +/obj/structure/surface/table/almayer, +/obj/item/reagent_container/food/condiment/hotsauce/sriracha{ + pixel_x = 7; + pixel_y = 7 + }, +/turf/open/floor/almayer{ + icon_state = "bluefull" + }, +/area/almayer/living/briefing) "oYb" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -57419,6 +56016,32 @@ icon_state = "red" }, /area/almayer/living/offices/flight) +"oYw" = ( +/obj/structure/surface/table/almayer, +/obj/item/tool/extinguisher, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha) +"oYB" = ( +/obj/structure/machinery/light{ + dir = 8; + invisibility = 101; + unacidable = 1; + unslashable = 1 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) +"oYO" = ( +/obj/structure/barricade/metal, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/hallways/port_hallway) "oZd" = ( /obj/structure/closet/secure_closet/personal/cabinet{ req_access = null @@ -57445,6 +56068,22 @@ icon_state = "red" }, /area/almayer/living/offices/flight) +"oZG" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/squads/alpha) "oZV" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/roller, @@ -57461,6 +56100,15 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) +"oZW" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 9; + icon_state = "blue" + }, +/area/almayer/living/port_emb) "paa" = ( /obj/structure/machinery/iv_drip, /turf/open/floor/almayer{ @@ -57475,6 +56123,13 @@ icon_state = "plate" }, /area/almayer/shipboard/brig/main_office) +"paA" = ( +/obj/structure/machinery/vending/cigarette, +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + icon_state = "greenfull" + }, +/area/almayer/command/cichallway) "paI" = ( /obj/structure/sign/safety/debark_lounge{ pixel_x = 15; @@ -57510,32 +56165,19 @@ icon_state = "plate" }, /area/almayer/living/captain_mess) -"pbs" = ( -/obj/structure/bed/chair/office/dark{ - dir = 4; - layer = 3.25 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/cic) "pbC" = ( /obj/item/bedsheet/red, /obj/structure/bed, /turf/open/floor/wood/ship, /area/almayer/shipboard/brig/chief_mp_office) -"pbV" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "emerald" +"pbL" = ( +/obj/structure/machinery/light/small{ + dir = 4 }, -/area/almayer/command/cic) -"pbW" = ( -/obj/structure/machinery/vending/cola, /turf/open/floor/almayer{ - icon_state = "bluefull" + icon_state = "plate" }, -/area/almayer/command/cichallway) +/area/almayer/hull/lower_hull/l_f_p) "pch" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -57552,10 +56194,7 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 1 }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orange" - }, +/turf/open/floor/almayer, /area/almayer/engineering/upper_engineering/port) "pcD" = ( /obj/structure/machinery/door/airlock/almayer/maint{ @@ -57612,6 +56251,20 @@ icon_state = "red" }, /area/almayer/shipboard/brig/main_office) +"pcS" = ( +/obj/structure/sign/safety/escapepod{ + pixel_x = -17; + pixel_y = -8 + }, +/obj/structure/sign/safety/stairs{ + pixel_x = -17; + pixel_y = 7 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "green" + }, +/area/almayer/hallways/port_hallway) "pda" = ( /obj/structure/largecrate/random/case/double, /obj/structure/sign/safety/distribution_pipes{ @@ -57698,11 +56351,25 @@ allow_construction = 0 }, /area/almayer/stair_clone) +"pfx" = ( +/obj/structure/machinery/cm_vending/gear/smartgun, +/obj/structure/sign/safety/ammunition{ + pixel_x = 15; + pixel_y = 32 + }, +/obj/structure/sign/safety/hazard{ + pixel_y = 32 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "pfA" = ( /obj/item/tool/soap, /obj/structure/machinery/light/small{ dir = 8 }, +/obj/structure/surface/rack, /turf/open/floor/prison{ icon_state = "kitchen" }, @@ -57713,6 +56380,11 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south2) +"pfK" = ( +/obj/effect/landmark/start/marine/delta, +/obj/effect/landmark/late_join/delta, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/alpha) "pfM" = ( /obj/structure/machinery/light{ dir = 4 @@ -57787,6 +56459,20 @@ icon_state = "plate" }, /area/almayer/command/combat_correspondent) +"phD" = ( +/obj/structure/machinery/cm_vending/clothing/medic/delta{ + density = 0; + pixel_y = -30 + }, +/obj/structure/machinery/cm_vending/gear/medic{ + pixel_x = 32; + density = 0 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "blue" + }, +/area/almayer/squads/delta) "piO" = ( /obj/structure/surface/rack, /obj/item/tool/weldingtool, @@ -57844,6 +56530,14 @@ icon_state = "plating_striped" }, /area/almayer/squads/req) +"pjH" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "pjM" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -57869,11 +56563,18 @@ icon_state = "green" }, /area/almayer/hallways/port_hallway) -"pkz" = ( +"plx" = ( +/obj/structure/machinery/cm_vending/clothing/senior_officer{ + req_access = list(26) + }, +/obj/structure/sign/safety/hvac_old{ + pixel_x = 8; + pixel_y = 32 + }, /turf/open/floor/almayer{ - icon_state = "redfull" + icon_state = "cargo" }, -/area/almayer/squads/alpha_bravo_shared) +/area/almayer/squads/req) "plE" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -57909,6 +56610,24 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/main_office) +"pmb" = ( +/obj/structure/machinery/camera/autoname/almayer{ + dir = 4; + name = "ship-grade camera" + }, +/turf/open/floor/almayer, +/area/almayer/living/auxiliary_officer_office) +"pmg" = ( +/obj/structure/surface/table/almayer, +/obj/item/prop/magazine/boots/n055{ + pixel_x = -9; + pixel_y = 5 + }, +/obj/structure/pipes/vents/scrubber{ + dir = 1 + }, +/turf/open/floor/almayer, +/area/almayer/living/auxiliary_officer_office) "pmk" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -57918,6 +56637,16 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_p) +"pml" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "cargo_arrow" + }, +/area/almayer/hallways/port_hallway) "pmn" = ( /obj/structure/sign/safety/storage{ pixel_x = 8; @@ -57927,16 +56656,10 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_m_s) -"pmq" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "cargo_arrow" - }, -/area/almayer/squads/delta) +"pmr" = ( +/obj/structure/bed/chair, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "pmH" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -58016,6 +56739,41 @@ }, /turf/open/floor/almayer, /area/almayer/living/auxiliary_officer_office) +"ppD" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/cameras/wooden_tv/prop{ + dir = 8; + layer = 3.2; + pixel_x = -3; + pixel_y = 6 + }, +/obj/structure/sign/poster{ + desc = "YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE."; + icon_state = "poster11"; + name = "YOU ALWAYS KNOW A WORKING JOE."; + pixel_x = 27; + serial_number = 11 + }, +/obj/item/trash/pistachios{ + layer = 2; + pixel_x = 6; + pixel_y = -6 + }, +/obj/structure/machinery/recharger{ + layer = 3.1; + pixel_y = 22 + }, +/obj/item/ammo_magazine/rifle/incendiary{ + current_rounds = 0; + desc = "A 10mm assault rifle magazine with ':D' drawn on the side"; + pixel_x = 10; + pixel_y = 2 + }, +/turf/open/floor/almayer{ + dir = 6; + icon_state = "silver" + }, +/area/almayer/living/port_emb) "pqc" = ( /obj/structure/machinery/firealarm{ dir = 4; @@ -58059,12 +56817,6 @@ /obj/item/trash/cigbutt, /turf/open/floor/wood/ship, /area/almayer/shipboard/brig/cells) -"pqK" = ( -/obj/structure/machinery/cryopod, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/squads/bravo) "pqQ" = ( /turf/open/floor/almayer{ dir = 5; @@ -58077,15 +56829,18 @@ }, /turf/open/floor/almayer, /area/almayer/living/gym) -"prx" = ( -/obj/structure/bed/chair/comfy{ - dir = 4 +"prz" = ( +/obj/structure/surface/table/almayer, +/obj/item/paper_bin/uscm, +/obj/item/attachable/bayonet, +/obj/item/device/flashlight/lamp{ + pixel_x = -8; + pixel_y = 12 }, -/obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ - icon_state = "dark_sterile" + icon_state = "plate" }, -/area/almayer/medical/medical_science) +/area/almayer/living/tankerbunks) "prE" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/tool/kitchen/tray, @@ -58102,17 +56857,20 @@ /obj/item/tool/kitchen/utensil/pfork, /turf/open/floor/wood/ship, /area/almayer/shipboard/brig/cells) -"psa" = ( -/obj/structure/bed/chair/comfy{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "bluefull" - }, -/area/almayer/living/bridgebunks) "psm" = ( /turf/closed/wall/almayer, /area/almayer/hull/upper_hull/u_a_s) +"pso" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_ammo/squad{ + req_access = null; + req_one_access = null; + req_one_access_txt = "15;16;18;21"; + vend_x_offset = 0 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/delta) "psp" = ( /obj/structure/surface/table/almayer, /obj/item/storage/toolbox/mechanical, @@ -58173,13 +56931,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/upper_medical) -"ptj" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie_delta_shared) "ptv" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/platform{ @@ -58234,6 +56985,48 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_p) +"puU" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/door_control{ + id = "CIC Lockdown"; + name = "CIC Lockdown"; + pixel_x = -7; + pixel_y = 9; + req_access_txt = "1" + }, +/obj/structure/machinery/door_control{ + id = "Hangar Lockdown"; + name = "Hangar Lockdown"; + pixel_x = -7; + pixel_y = 2; + req_access_txt = "1" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4; + icon_state = "exposed01-supply" + }, +/obj/structure/machinery/door_control{ + id = "bot_armory"; + name = "Armory Lockdown"; + pixel_x = -7; + pixel_y = -5; + req_one_access_txt = "1;4" + }, +/obj/structure/transmitter/rotary{ + name = "Combat Information Center Telephone"; + phone_category = "Command"; + phone_id = "Combat Information Center"; + pixel_x = 5; + pixel_y = 4 + }, +/obj/structure/machinery/door/window/westright{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/command/cic) "pvh" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /obj/item/tool/warning_cone{ @@ -58259,14 +57052,6 @@ icon_state = "green" }, /area/almayer/hallways/aft_hallway) -"pvJ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/charlie) "pvK" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -58298,6 +57083,25 @@ icon_state = "redcorner" }, /area/almayer/shipboard/starboard_missiles) +"pvV" = ( +/obj/structure/surface/table/reinforced/black, +/obj/item/explosive/grenade/high_explosive/training, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) +"pwk" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "green" + }, +/area/almayer/hallways/port_hallway) "pwt" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = -25 @@ -58314,6 +57118,21 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) +"pwJ" = ( +/obj/structure/pipes/vents/scrubber{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blue" + }, +/area/almayer/squads/delta) "pwK" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -58363,13 +57182,33 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south2) -"pyc" = ( -/obj/structure/bed/stool, +"pxT" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/machinery/light, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 2 + }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "emerald" + dir = 8; + icon_state = "cargo_arrow" }, -/area/almayer/living/port_emb) +/area/almayer/squads/delta) +"pye" = ( +/turf/open/floor/almayer{ + icon_state = "bluefull" + }, +/area/almayer/hull/lower_hull/l_a_s) "pyi" = ( /obj/structure/prop/almayer/missile_tube{ icon_state = "missiletubesouth" @@ -58382,28 +57221,6 @@ "pyj" = ( /turf/open/floor/almayer, /area/almayer/shipboard/brig/processing) -"pyl" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_x = -1; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "cargo_arrow" - }, -/area/almayer/squads/bravo) "pyy" = ( /obj/structure/filingcabinet, /turf/open/floor/almayer{ @@ -58446,6 +57263,15 @@ icon_state = "red" }, /area/almayer/shipboard/weapon_room) +"pyR" = ( +/obj/structure/surface/table/almayer, +/obj/item/reagent_container/food/condiment/hotsauce/sriracha{ + pixel_x = 4 + }, +/turf/open/floor/almayer{ + icon_state = "bluefull" + }, +/area/almayer/living/briefing) "pzc" = ( /obj/structure/pipes/vents/pump, /obj/structure/bed/chair{ @@ -58474,6 +57300,22 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/north1) +"pzD" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/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{ + icon_state = "plate" + }, +/area/almayer/squads/alpha) "pzG" = ( /obj/docking_port/stationary/emergency_response/port1, /turf/open/floor/almayer{ @@ -58530,6 +57372,23 @@ icon_state = "greencorner" }, /area/almayer/hallways/port_hallway) +"pBS" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 4 + }, +/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 = "plate" + }, +/area/almayer/squads/delta) "pBW" = ( /turf/open/floor/almayer{ icon_state = "orangecorner" @@ -58556,6 +57415,22 @@ icon_state = "mono" }, /area/almayer/hallways/stern_hallway) +"pCE" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/bed/chair/comfy{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/living/bridgebunks) +"pCF" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/tankerbunks) "pDh" = ( /obj/structure/machinery/power/monitor{ name = "Core Power Monitoring" @@ -58600,36 +57475,19 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/port) -"pDt" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "cargo_arrow" - }, -/area/almayer/squads/bravo) -"pDB" = ( -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/structure/machinery/disposal, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 +"pEd" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 4; + icon_state = "silver" }, -/area/almayer/squads/charlie) +/area/almayer/living/cryo_cells) +"pEj" = ( +/obj/structure/machinery/vending/cigarette, +/turf/open/floor/almayer, +/area/almayer/living/auxiliary_officer_office) "pEl" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -58726,6 +57584,15 @@ icon_state = "orangecorner" }, /area/almayer/engineering/lower_engineering) +"pFE" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep{ + req_one_access = list() + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "cargo_arrow" + }, +/area/almayer/squads/delta) "pFM" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -58738,6 +57605,19 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_a_p) +"pFX" = ( +/obj/structure/pipes/vents/pump, +/turf/open/floor/almayer{ + icon_state = "green" + }, +/area/almayer/command/cichallway) +"pGm" = ( +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + dir = 9; + icon_state = "green" + }, +/area/almayer/command/cichallway) "pGG" = ( /obj/structure/surface/table/almayer, /obj/item/storage/fancy/cigarettes/lucky_strikes, @@ -58815,12 +57695,6 @@ "pHp" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/perma) -"pHA" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) "pHG" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -59020,14 +57894,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/req) -"pML" = ( -/obj/structure/pipes/vents/pump{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "blue" - }, -/area/almayer/living/port_emb) "pNa" = ( /obj/structure/machinery/door/poddoor/almayer/open{ dir = 4; @@ -59051,6 +57917,17 @@ /obj/structure/largecrate/random/case/double, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_p) +"pNI" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/machinery/door/airlock/almayer/marine{ + dir = 2 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/lower_hull/l_a_s) "pNM" = ( /obj/structure/platform{ dir = 4 @@ -59088,6 +57965,40 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, /area/almayer/living/offices) +"pOo" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/obj/structure/platform{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) +"pOp" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/book/manual/engineering_guide{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/prop/helmetgarb/gunoil{ + pixel_x = -8 + }, +/obj/structure/machinery/light{ + dir = 4; + invisibility = 101; + unacidable = 1; + unslashable = 1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "red" + }, +/area/almayer/squads/alpha) "pOB" = ( /obj/item/trash/cigbutt{ pixel_x = -10; @@ -59175,41 +58086,14 @@ icon_state = "plating" }, /area/almayer/engineering/engine_core) -"pQu" = ( -/obj/structure/machinery/chem_dispenser/soda{ - pixel_y = 20 - }, +"pQw" = ( +/obj/structure/machinery/cm_vending/sorted/marine_food, /turf/open/floor/almayer, -/area/almayer/command/corporateliason) +/area/almayer/living/cryo_cells) "pQy" = ( /obj/structure/window/framed/almayer, /turf/open/floor/plating, /area/almayer/living/bridgebunks) -"pQF" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad{ - req_access = null; - req_one_access = null; - req_one_access_txt = "17;18;21"; - vend_x_offset = 0; - vend_y_offset = 0 - }, -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie_delta_shared) -"pQG" = ( -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/lower_hull/l_a_s) -"pQN" = ( -/obj/structure/surface/table/almayer, -/obj/item/reagent_container/food/condiment/hotsauce/franks, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/delta) "pQP" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -59248,6 +58132,12 @@ icon_state = "mono" }, /area/almayer/medical/medical_science) +"pRo" = ( +/obj/structure/machinery/cm_vending/gear/walker, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/hallways/port_hallway) "pRy" = ( /turf/open/floor/almayer/research/containment/corner_var1{ dir = 4 @@ -59269,6 +58159,11 @@ icon_state = "silvercorner" }, /area/almayer/shipboard/brig/cic_hallway) +"pRS" = ( +/obj/structure/surface/table/almayer, +/obj/item/facepaint/green, +/turf/open/floor/almayer, +/area/almayer/squads/alpha) "pRX" = ( /obj/structure/machinery/portable_atmospherics/hydroponics, /turf/open/floor/almayer{ @@ -59284,6 +58179,12 @@ icon_state = "blue" }, /area/almayer/hallways/aft_hallway) +"pSQ" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "redcorner" + }, +/area/almayer/squads/alpha) "pSU" = ( /obj/structure/machinery/light, /obj/structure/machinery/photocopier, @@ -59330,21 +58231,25 @@ icon_state = "mono" }, /area/almayer/command/computerlab) -"pUf" = ( -/obj/structure/bed/chair{ - dir = 4 +"pUe" = ( +/obj/structure/machinery/door/airlock/almayer/marine{ + dir = 2 }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/area/almayer/hallways/port_hallway) +"pUh" = ( +/obj/item/bedsheet/orange, +/obj/structure/bed{ + icon_state = "psychbed" }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "bluecorner" +/obj/structure/machinery/cm_vending/clothing/senior_officer{ + density = 0; + pixel_y = 30 }, -/area/almayer/squads/delta) +/turf/open/floor/wood/ship, +/area/almayer/engineering/ce_room) "pUi" = ( /obj/effect/decal/cleanable/blood/drip, /obj/item/tool/crowbar{ @@ -59393,6 +58298,15 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_a_p) +"pVa" = ( +/obj/structure/machinery/vending/coffee{ + density = 0; + pixel_y = 16 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "pVu" = ( /obj/item/paper/prison_station/interrogation_log{ pixel_x = 10; @@ -59460,6 +58374,13 @@ "pVZ" = ( /turf/closed/wall/almayer/outer, /area/almayer/hull/upper_hull/u_a_s) +"pWa" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/machinery/cm_vending/clothing/vehicle_crew/walker, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "pWb" = ( /obj/effect/landmark/start/marine/tl/delta, /obj/effect/landmark/late_join/delta, @@ -59534,6 +58455,18 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/living/pilotbunks) +"pWW" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "silvercorner" + }, +/area/almayer/hallways/port_hallway) "pXj" = ( /obj/structure/closet/radiation, /turf/open/floor/almayer{ @@ -59541,18 +58474,6 @@ icon_state = "orange" }, /area/almayer/engineering/lower_engineering) -"pXl" = ( -/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 = "plate" - }, -/area/almayer/squads/alpha) "pXn" = ( /obj/structure/prop/invuln/overhead_pipe{ dir = 4; @@ -59594,11 +58515,6 @@ icon_state = "plating" }, /area/almayer/squads/req) -"pXZ" = ( -/obj/effect/landmark/start/marine/spec/charlie, -/obj/effect/landmark/late_join/charlie, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/charlie) "pYi" = ( /obj/structure/machinery/light{ dir = 4 @@ -59620,6 +58536,13 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/containment) +"pYq" = ( +/obj/structure/bed/chair{ + dir = 8; + pixel_y = 3 + }, +/turf/open/floor/almayer, +/area/almayer/squads/alpha) "pYu" = ( /obj/item/tool/warning_cone{ pixel_x = -12; @@ -59704,6 +58627,22 @@ icon_state = "plate" }, /area/almayer/shipboard/brig/cryo) +"qaC" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/structure/machinery/firealarm{ + pixel_y = 28 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "cargo_arrow" + }, +/area/almayer/squads/delta) "qaD" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer{ @@ -59772,6 +58711,22 @@ icon_state = "redcorner" }, /area/almayer/living/briefing) +"qbz" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/light, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + icon_state = "blue" + }, +/area/almayer/squads/delta) "qbO" = ( /obj/structure/machinery/power/apc/almayer/hardened{ dir = 1 @@ -59808,15 +58763,18 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/starboard_hallway) -"qcy" = ( -/obj/structure/sign/safety/bathunisex{ - pixel_x = 8; - pixel_y = -32 +"qcS" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/living/auxiliary_officer_office) +/area/almayer/hallways/port_hallway) "qdk" = ( /obj/structure/surface/table/almayer, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -59872,17 +58830,14 @@ icon_state = "test_floor4" }, /area/almayer/engineering/laundry) -"qer" = ( -/obj/structure/machinery/cryopod/right{ - pixel_y = 6 - }, -/obj/structure/machinery/light{ - dir = 4 +"qey" = ( +/obj/structure/platform{ + dir = 1 }, /turf/open/floor/almayer{ - icon_state = "cargo" + icon_state = "blue" }, -/area/almayer/squads/charlie) +/area/almayer/living/briefing) "qeF" = ( /obj/structure/sign/safety/reception{ pixel_x = 8; @@ -59908,11 +58863,6 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering/port) -"qeY" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/toy/beach_ball/holoball, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) "qfa" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/emails{ @@ -59923,14 +58873,6 @@ icon_state = "redcorner" }, /area/almayer/shipboard/port_missiles) -"qfh" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha_bravo_shared) "qfy" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -60007,18 +58949,6 @@ }, /turf/open/floor/almayer, /area/almayer/command/combat_correspondent) -"qgN" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/squads/delta) "qhb" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -60057,21 +58987,10 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_s) -"qhU" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/sign/safety/hvac_old{ - pixel_x = 8; - pixel_y = -32 - }, -/turf/open/floor/almayer{ - icon_state = "orange" - }, -/area/almayer/squads/bravo) +"qhX" = ( +/obj/structure/window/framed/almayer, +/turf/open/floor/almayer, +/area/almayer/living/auxiliary_officer_office) "qic" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/door/airlock/almayer/maint{ @@ -60085,16 +59004,6 @@ /obj/structure/sign/dartboard, /turf/closed/wall/almayer, /area/almayer/hallways/hangar) -"qih" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - dir = 1; - name = "\improper Tanker Quarters"; - req_one_access_txt = "19;27" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/living/tankerbunks) "qim" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/manifold/hidden/supply{ @@ -60127,6 +59036,10 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_p) +"qjo" = ( +/obj/item/reagent_container/food/drinks/bottle/beer/craft, +/turf/open/floor/almayer, +/area/almayer/living/tankerbunks) "qjz" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/clipboard, @@ -60156,11 +59069,6 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) -"qki" = ( -/obj/effect/landmark/start/marine/smartgunner/charlie, -/obj/effect/landmark/late_join/charlie, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/charlie) "qkn" = ( /obj/structure/sign/safety/maint{ pixel_x = -17 @@ -60183,20 +59091,26 @@ }, /turf/open/floor/plating, /area/almayer/shipboard/sea_office) -"qmk" = ( -/obj/structure/surface/table/almayer, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +"qlD" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22"; + pixel_y = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/machinery/camera/autoname/almayer{ + dir = 1; + name = "ship-grade camera" }, -/obj/item/facepaint/green, /turf/open/floor/almayer{ - dir = 4; - icon_state = "bluecorner" + dir = 5; + icon_state = "green" }, -/area/almayer/squads/delta) +/area/almayer/command/cichallway) +"qlG" = ( +/obj/structure/machinery/cm_vending/sorted/marine_food, +/turf/open/floor/almayer{ + icon_state = "greenfull" + }, +/area/almayer/command/cichallway) "qmt" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out"; @@ -60325,6 +59239,26 @@ icon_state = "plate" }, /area/almayer/living/pilotbunks) +"qnn" = ( +/obj/structure/machinery/cm_vending/sorted/attachments/squad{ + req_access = null; + req_one_access = null; + req_one_access_txt = "15;16;18;21"; + vend_y_offset = 0 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha) +"qnp" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "qnC" = ( /obj/structure/surface/table/almayer, /turf/open/floor/almayer{ @@ -60352,6 +59286,20 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_a_s) +"qnX" = ( +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = 28 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) "qof" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ @@ -60385,18 +59333,16 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/north2) -"qoJ" = ( -/obj/structure/flora/pottedplant{ - desc = "It is made of Fiberbush(tm). It contains asbestos."; - icon_state = "pottedplant_22"; - name = "synthetic potted plant"; - pixel_y = 8 +"qoL" = ( +/obj/structure/machinery/firealarm{ + dir = 8; + pixel_x = -24 }, /turf/open/floor/almayer{ - dir = 5; - icon_state = "orange" + dir = 10; + icon_state = "red" }, -/area/almayer/squads/bravo) +/area/almayer/squads/alpha) "qoX" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -60436,6 +59382,15 @@ icon_state = "plate" }, /area/almayer/command/lifeboat) +"qqm" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_21"; + pixel_x = -1; + pixel_y = 11 + }, +/obj/structure/surface/table/almayer, +/turf/open/floor/wood/ship, +/area/almayer/living/auxiliary_officer_office) "qqn" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal3"; @@ -60485,36 +59440,6 @@ icon_state = "red" }, /area/almayer/shipboard/brig/main_office) -"qqQ" = ( -/obj/structure/machinery/cm_vending/sorted/medical/blood{ - density = 0; - pixel_y = 16 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1; - pixel_y = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "sterile_green_side" - }, -/area/almayer/medical/medical_science) -"qrc" = ( -/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_22"; - name = "synthetic potted plant"; - pixel_y = 8 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "blue" - }, -/area/almayer/squads/delta) "qre" = ( /obj/structure/machinery/status_display{ pixel_x = 32 @@ -60529,6 +59454,15 @@ icon_state = "silver" }, /area/almayer/command/computerlab) +"qrQ" = ( +/obj/structure/bed/chair/comfy{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/living/bridgebunks) "qsd" = ( /obj/structure/largecrate/random, /turf/open/floor/almayer{ @@ -60557,12 +59491,27 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/engineering/ce_room) +"qsU" = ( +/obj/structure/machinery/door/airlock/almayer/marine/alpha/tl{ + req_one_access = list(); + req_access = list(32,15) + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/squads/alpha) "qtv" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/living/gym) +"qtE" = ( +/obj/structure/toilet{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/tankerbunks) "qtR" = ( /obj/structure/closet/emcloset, /turf/open/floor/almayer{ @@ -60573,6 +59522,16 @@ /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer, /area/almayer/hull/upper_hull/u_f_s) +"qug" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/light{ + dir = 4; + invisibility = 101 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha) "quq" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -60613,6 +59572,13 @@ icon_state = "plate" }, /area/almayer/hallways/port_hallway) +"quR" = ( +/obj/structure/machinery/light, +/obj/structure/foamed_metal, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "quT" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ layer = 1.9 @@ -60692,19 +59658,18 @@ icon_state = "plate" }, /area/almayer/living/offices) -"qwJ" = ( -/obj/structure/machinery/door_control{ - id = "ARES Operations Left"; - name = "ARES Operations Shutter"; - pixel_x = -24; - pixel_y = -8; - req_one_access_txt = "90;91;92" - }, -/turf/open/floor/almayer/no_build{ +"qwQ" = ( +/turf/open/floor/almayer{ dir = 8; - icon_state = "silver" + icon_state = "plating_striped" }, -/area/almayer/command/airoom) +/area/almayer/hull/lower_hull/l_a_s) +"qwU" = ( +/obj/structure/window/framed/almayer, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "qxm" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 4; @@ -60717,6 +59682,10 @@ }, /turf/closed/wall/almayer/research/containment/wall/purple, /area/almayer/medical/containment/cell) +"qxw" = ( +/obj/structure/foamed_metal, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/port_hallway) "qxA" = ( /obj/structure/closet/firecloset, /turf/open/floor/almayer{ @@ -60773,24 +59742,6 @@ allow_construction = 0 }, /area/almayer/shipboard/brig/perma) -"qyi" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "blue" - }, -/area/almayer/squads/delta) -"qyo" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "blue" - }, -/area/almayer/command/cichallway) "qys" = ( /obj/structure/platform, /turf/open/floor/almayer{ @@ -60840,14 +59791,12 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) -"qyW" = ( -/obj/structure/bed/chair{ - dir = 4 - }, +"qyO" = ( +/obj/structure/machinery/cm_vending/gear/leader, /turf/open/floor/almayer{ - icon_state = "emeraldfull" + icon_state = "plate" }, -/area/almayer/squads/charlie_delta_shared) +/area/almayer/hallways/port_hallway) "qyZ" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/computer/view_objectives, @@ -60904,6 +59853,15 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) +"qBU" = ( +/obj/structure/bed/chair{ + dir = 8; + pixel_y = 3 + }, +/turf/open/floor/almayer{ + icon_state = "bluefull" + }, +/area/almayer/squads/delta) "qCc" = ( /obj/structure/sign/safety/security{ pixel_x = 15; @@ -60937,12 +59895,30 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_s) +"qCk" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/port_hallway) "qCo" = ( /obj/structure/pipes/vents/pump{ dir = 1 }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cells) +"qCu" = ( +/obj/structure/machinery/firealarm{ + pixel_y = -28 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "bluecorner" + }, +/area/almayer/squads/delta) "qCy" = ( /obj/effect/landmark/start/captain, /turf/open/floor/plating/plating_catwalk, @@ -60954,11 +59930,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) -"qDq" = ( -/obj/effect/landmark/start/marine/bravo, -/obj/effect/landmark/late_join/bravo, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/bravo) "qDt" = ( /obj/structure/machinery/door/airlock/almayer/secure/reinforced{ dir = 2; @@ -61066,27 +60037,6 @@ }, /turf/open/floor/plating, /area/almayer/shipboard/brig/cells) -"qFG" = ( -/obj/structure/window/framed/almayer, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) -"qFK" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - icon_state = "bluefull" - }, -/area/almayer/squads/delta) "qFQ" = ( /obj/structure/disposalpipe/segment, /obj/structure/prop/invuln/overhead_pipe{ @@ -61104,18 +60054,28 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_p) -"qGc" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/squads/alpha_bravo_shared) "qGF" = ( /obj/structure/machinery/optable, /turf/open/floor/almayer{ icon_state = "dark_sterile" }, /area/almayer/medical/operating_room_two) +"qGJ" = ( +/turf/closed/wall/almayer/reinforced, +/area/almayer/hallways/port_hallway) +"qGR" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/device/multitool{ + desc = "A large handheld tool used to override various machine functions. Primarily used to pulse Airlock and APC wires on a shortwave frequency. It contains a small data buffer as well. This one is comically oversized. Made in Texas."; + icon_state = "multitool_big"; + name = "\improper Oversized Security Access Tuner"; + pixel_y = 8 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/squads/alpha) "qHb" = ( /obj/structure/bed/chair{ dir = 8 @@ -61129,12 +60089,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_s) -"qHg" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "cargo_arrow" - }, -/area/almayer/squads/alpha_bravo_shared) "qHl" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -61274,30 +60228,6 @@ icon_state = "kitchen" }, /area/almayer/living/grunt_rnr) -"qJY" = ( -/obj/structure/surface/table/almayer, -/obj/item/reagent_container/food/drinks/bottle/orangejuice{ - layer = 3.1; - pixel_x = -12; - pixel_y = 14 - }, -/obj/item/toy/deck/uno{ - layer = 3.1; - pixel_x = -3; - pixel_y = -1 - }, -/obj/item/toy/handcard/uno_reverse_yellow{ - pixel_x = 6; - pixel_y = 5 - }, -/obj/item/spacecash/c10{ - pixel_x = 5; - pixel_y = 10 - }, -/turf/open/floor/almayer{ - icon_state = "orange" - }, -/area/almayer/living/port_emb) "qJZ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -61307,6 +60237,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) +"qKc" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/living/cryo_cells) "qKi" = ( /obj/effect/decal/warning_stripes{ icon_state = "E" @@ -61319,6 +60255,21 @@ icon_state = "plating" }, /area/almayer/engineering/upper_engineering) +"qKp" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/microwave{ + pixel_y = 6 + }, +/obj/structure/machinery/status_display{ + pixel_y = 30 + }, +/obj/structure/sign/safety/rewire{ + pixel_x = 32 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/almayer/living/tankerbunks) "qKz" = ( /obj/structure/machinery/light/small, /turf/open/floor/almayer{ @@ -61347,6 +60298,13 @@ icon_state = "greencorner" }, /area/almayer/hallways/port_hallway) +"qKX" = ( +/obj/structure/machinery/disposal, +/obj/structure/disposalpipe/trunk, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha) "qLi" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out"; @@ -61378,6 +60336,17 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/hallways/port_hallway) +"qLq" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 4 + }, +/obj/structure/bed/chair/comfy/alpha{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/living/briefing) "qLs" = ( /obj/effect/landmark/start/maint, /turf/open/floor/plating/plating_catwalk, @@ -61542,6 +60511,12 @@ icon_state = "outerhull_dir" }, /area/space/almayer/lifeboat_dock) +"qOn" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep/training, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "qOp" = ( /obj/structure/disposalpipe/junction, /turf/open/floor/plating/plating_catwalk, @@ -61690,13 +60665,14 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/port_point_defense) -"qSE" = ( -/obj/structure/surface/table/almayer, -/obj/item/reagent_container/food/condiment/hotsauce/cholula, +"qSq" = ( +/obj/structure/bed/chair{ + dir = 4 + }, /turf/open/floor/almayer{ - icon_state = "orangefull" + icon_state = "redfull" }, -/area/almayer/living/briefing) +/area/almayer/squads/alpha) "qSK" = ( /obj/item/stack/sheet/metal{ layer = 2.9; @@ -61708,6 +60684,15 @@ }, /turf/open/floor/plating, /area/almayer/living/port_emb) +"qTG" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "silvercorner" + }, +/area/almayer/hallways/port_hallway) "qTY" = ( /obj/structure/machinery/gibber, /turf/open/floor/plating/plating_catwalk, @@ -61726,6 +60711,43 @@ icon_state = "red" }, /area/almayer/shipboard/brig/processing) +"qUd" = ( +/obj/structure/sign/poster{ + desc = "This poster features Audrey Rainwater standing in a jacuzzi. She was the July 2182 centerfold in House Bunny Gentleman's Magazine. Don't ask how you know that."; + icon_state = "poster16"; + layer = 3.3; + name = "'Miss July' Pinup"; + pixel_y = 29; + serial_number = 16 + }, +/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{ + layer = 3.1 + }, +/obj/item/bedsheet/brown{ + pixel_y = 13 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/port_emb) "qUh" = ( /obj/structure/sign/safety/distribution_pipes{ pixel_x = -17 @@ -61746,19 +60768,6 @@ icon_state = "rasputin15" }, /area/almayer/powered/agent) -"qUq" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "cargo_arrow" - }, -/area/almayer/squads/charlie_delta_shared) "qUH" = ( /obj/structure/surface/rack, /turf/open/floor/almayer{ @@ -61790,6 +60799,12 @@ "qVM" = ( /turf/closed/wall/almayer, /area/almayer/hull/upper_hull/u_m_p) +"qVQ" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/tankerbunks) "qVS" = ( /obj/structure/machinery/door/poddoor/almayer/open{ dir = 2; @@ -61814,25 +60829,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_p) -"qWt" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/delta) "qWR" = ( /turf/closed/wall/almayer/research/containment/wall/corner{ dir = 4 @@ -61889,6 +60885,18 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) +"qYo" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 2 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/port_hallway) +"qYq" = ( +/turf/open/floor/almayer{ + icon_state = "cargo_arrow" + }, +/area/almayer/living/cryo_cells) "qYr" = ( /obj/effect/step_trigger/teleporter_vector{ name = "Almayer_Down3"; @@ -61960,19 +60968,33 @@ icon_state = "red" }, /area/almayer/living/offices/flight) -"qYQ" = ( -/obj/structure/window/reinforced{ - dir = 4; - health = 80 +"qYT" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/obj/structure/window/reinforced{ - dir = 8; - health = 80 +/obj/structure/machinery/door_control{ + id = "ARES Interior"; + indestructible = 1; + name = "ARES Chamber Lockdown"; + pixel_x = 24; + pixel_y = 8; + req_one_access_txt = "90;91;92" }, -/turf/open/floor/almayer{ - icon_state = "cargo_arrow" +/obj/structure/machinery/door/poddoor/railing{ + closed_layer = 4; + density = 0; + id = "ARES Railing"; + layer = 2.1; + open_layer = 2.1; + unacidable = 0; + unslashable = 0 + }, +/turf/open/floor/almayer/no_build{ + dir = 4; + icon_state = "silver" }, -/area/almayer/squads/charlie_delta_shared) +/area/almayer/command/airoom) "qYW" = ( /obj/item/clothing/shoes/red, /turf/open/floor/plating/plating_catwalk, @@ -62004,14 +61026,12 @@ icon_state = "greenfull" }, /area/almayer/living/offices) -"qZX" = ( -/obj/structure/machinery/cryopod{ - pixel_y = 6 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" +"qZJ" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 }, -/area/almayer/squads/bravo) +/turf/open/floor/almayer, +/area/almayer/living/tankerbunks) "rag" = ( /obj/structure/sign/safety/maint{ pixel_x = -17 @@ -62033,18 +61053,29 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_p) -"raK" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +"ray" = ( +/obj/effect/landmark/start/marine/delta, +/obj/effect/landmark/late_join/alpha, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/alpha) +"raI" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/clothing/head/cmcap{ + pixel_x = 8; + pixel_y = -1 }, -/obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera" +/obj/item/ammo_box/magazine/misc/mre{ + pixel_x = -6; + pixel_y = 7 + }, +/obj/item/prop/helmetgarb/helmet_nvg/cosmetic{ + pixel_x = 5; + pixel_y = 7 }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "emerald" + icon_state = "silverfull" }, -/area/almayer/squads/charlie) +/area/almayer/hallways/port_hallway) "rbp" = ( /obj/structure/largecrate/random/case/small, /turf/open/floor/almayer{ @@ -62076,27 +61107,6 @@ icon_state = "silvercorner" }, /area/almayer/command/computerlab) -"rbF" = ( -/obj/effect/landmark/late_join, -/obj/effect/landmark/ert_spawns/distress_cryo, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/cryo_cells) -"rbH" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/structure/machinery/firealarm{ - pixel_y = 28 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "cargo_arrow" - }, -/area/almayer/squads/charlie) "rbX" = ( /obj/structure/sign/safety/manualopenclose{ pixel_x = 15; @@ -62139,6 +61149,11 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_p) +"rcN" = ( +/obj/structure/surface/table/almayer, +/obj/item/facepaint/green, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "rcS" = ( /obj/structure/machinery/computer/cryopod/eng{ dir = 8 @@ -62192,6 +61207,12 @@ "rdK" = ( /turf/closed/wall/almayer, /area/almayer/hull/lower_hull/l_a_s) +"rdL" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "green" + }, +/area/almayer/hallways/starboard_hallway) "rdS" = ( /obj/structure/machinery/light{ dir = 8 @@ -62206,15 +61227,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_lobby) -"rdY" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "blue" - }, -/area/almayer/hallways/port_hallway) "ren" = ( /obj/structure/machinery/light{ dir = 4 @@ -62226,6 +61238,28 @@ icon_state = "plate" }, /area/almayer/living/gym) +"rev" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-j2" + }, +/obj/structure/bed/chair{ + dir = 8; + pixel_y = 3 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "redcorner" + }, +/area/almayer/squads/alpha) "reL" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/snacks/sliceable/bread{ @@ -62239,6 +61273,12 @@ icon_state = "kitchen" }, /area/almayer/living/grunt_rnr) +"reP" = ( +/obj/structure/machinery/cm_vending/sorted/marine_food, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/cryo_cells) "rfa" = ( /obj/effect/landmark/start/marine/medic/alpha, /obj/effect/landmark/late_join/alpha, @@ -62275,6 +61315,23 @@ icon_state = "plate" }, /area/almayer/shipboard/port_point_defense) +"rfL" = ( +/obj/structure/machinery/cryopod{ + pixel_y = 6 + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/hallways/port_hallway) +"rfZ" = ( +/obj/structure/pipes/vents/scrubber{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" + }, +/area/almayer/living/briefing) "rgy" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -62305,30 +61362,6 @@ icon_state = "plate" }, /area/almayer/living/port_emb) -"rgK" = ( -/obj/structure/pipes/vents/scrubber{ - dir = 8 - }, -/obj/structure/surface/table/almayer, -/obj/item/device/flashlight/lamp{ - layer = 3.5; - pixel_x = 5; - pixel_y = 14 - }, -/obj/item/attachable/bayonet{ - pixel_x = -14; - pixel_y = 3 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "silver" - }, -/area/almayer/living/auxiliary_officer_office) -"rgW" = ( -/turf/open/floor/almayer{ - icon_state = "emeraldcorner" - }, -/area/almayer/living/briefing) "rhO" = ( /obj/structure/machinery/vending/cola/research{ pixel_x = 4 @@ -62446,6 +61479,18 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/perma) +"rkt" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + dir = 6; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) "rku" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/tool/wrench{ @@ -62479,6 +61524,23 @@ }, /turf/open/floor/plating, /area/almayer/shipboard/brig/main_office) +"rld" = ( +/obj/structure/machinery/door/airlock/almayer/research/glass/reinforced{ + name = "\improper Research Reception Laboratory" + }, +/obj/structure/machinery/door/poddoor/almayer/biohazard/white{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/medical/medical_science) "rlf" = ( /obj/structure/machinery/cm_vending/clothing/synth/snowflake, /turf/open/floor/almayer{ @@ -62494,19 +61556,6 @@ icon_state = "plate" }, /area/almayer/shipboard/starboard_point_defense) -"rll" = ( -/obj/structure/machinery/light, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/delta) "rlz" = ( /obj/structure/filingcabinet{ density = 0; @@ -62619,6 +61668,12 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/upper_medical) +"rnU" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) "rob" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -62632,17 +61687,6 @@ icon_state = "plating" }, /area/almayer/hull/lower_hull/l_f_s) -"rou" = ( -/obj/structure/machinery/cryopod/right{ - pixel_y = 6 - }, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/squads/bravo) "roG" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -62702,6 +61746,24 @@ icon_state = "plate" }, /area/almayer/command/cichallway) +"rpM" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/delta) +"rpQ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N" + }, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "rpW" = ( /obj/structure/prop/invuln/overhead_pipe{ pixel_x = 12 @@ -62739,17 +61801,6 @@ icon_state = "green" }, /area/almayer/hallways/port_hallway) -"rqE" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/delta) "rra" = ( /obj/structure/machinery/door/poddoor/almayer/locked{ dir = 8; @@ -62770,18 +61821,19 @@ /obj/structure/window/framed/almayer, /turf/open/floor/plating, /area/almayer/living/offices/flight) -"rrq" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/status_display{ - pixel_y = 30 +"rrA" = ( +/obj/structure/machinery/door_control{ + id = "ARES Operations Left"; + name = "ARES Operations Shutter"; + pixel_x = -24; + pixel_y = -8; + req_one_access_txt = "90;91;92" }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" +/turf/open/floor/almayer/no_build{ + dir = 8; + icon_state = "silver" }, -/area/almayer/squads/alpha) +/area/almayer/command/airoom) "rrB" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/comdoor/reinforced{ name = "\improper Cryogenics Bay" @@ -62861,6 +61913,35 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/grunt_rnr) +"rsN" = ( +/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/blue{ + layer = 3.2 + }, +/obj/item/bedsheet/blue{ + pixel_y = 13 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/port_emb) "rsO" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/almayer, @@ -62878,41 +61959,62 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_s) +"rsZ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/machinery/light, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 2 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "cargo_arrow" + }, +/area/almayer/hallways/port_hallway) +"rtb" = ( +/turf/open/floor/almayer{ + dir = 8; + icon_state = "silvercorner" + }, +/area/almayer/hallways/port_hallway) "rtd" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, /turf/open/floor/almayer, /area/almayer/engineering/upper_engineering/starboard) -"rth" = ( -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) "rtj" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/squads/req) -"rtA" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/device/flashlight/pen{ - pixel_x = 7; - pixel_y = 3 +"rtM" = ( +/obj/structure/reagent_dispensers/beerkeg, +/obj/structure/machinery/light{ + dir = 4 }, -/obj/item/paper_bin/uscm{ - pixel_x = -5; - pixel_y = 8 +/turf/open/floor/wood/ship, +/area/almayer/living/auxiliary_officer_office) +"rtX" = ( +/obj/structure/machinery/firealarm{ + pixel_y = -28 }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) -"rtV" = ( -/obj/structure/surface/table/almayer, -/obj/item/pizzabox{ - pixel_x = 6; - pixel_y = 6 +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/delta) +/area/almayer/hallways/port_hallway) "rtY" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/ashtray/bronze, @@ -62968,6 +62070,29 @@ icon_state = "cargo" }, /area/almayer/hallways/hangar) +"ruI" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_x = -1; + pixel_y = 1 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/port_hallway) "rvo" = ( /obj/structure/machinery/power/apc/almayer{ dir = 4 @@ -62979,30 +62104,31 @@ "rvA" = ( /turf/open/floor/almayer, /area/almayer/living/numbertwobunks) -"rvT" = ( -/obj/structure/pipes/standard/manifold/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "emerald" - }, -/area/almayer/squads/charlie) "rwb" = ( /obj/structure/largecrate/random/barrel/white, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_s) -"rwv" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/bed/chair/comfy/bravo, +"rwI" = ( /turf/open/floor/almayer{ - icon_state = "orangefull" + icon_state = "cargo" }, -/area/almayer/living/briefing) +/area/almayer/hallways/port_hallway) "rwS" = ( /obj/structure/machinery/light/small, /obj/structure/largecrate/random/case/double, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_s) +"rwV" = ( +/obj/structure/sign/safety/bathunisex{ + pixel_x = 8; + pixel_y = -32 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/tankerbunks) "rwY" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/shutters/almayer{ @@ -63046,6 +62172,17 @@ icon_state = "silverfull" }, /area/almayer/command/computerlab) +"rxS" = ( +/obj/structure/machinery/cryopod{ + pixel_y = 6 + }, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/hallways/port_hallway) "rxV" = ( /obj/structure/barricade/handrail, /obj/structure/largecrate/supply/generator, @@ -63099,6 +62236,15 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/main_office) +"rzp" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "plating_striped" + }, +/area/almayer/hallways/port_hallway) "rzM" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 1 @@ -63201,17 +62347,6 @@ icon_state = "orange" }, /area/almayer/hallways/port_umbilical) -"rBx" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/tool/stamp/ro{ - name = "spare quartermaster's rubber stamp"; - pixel_x = -7; - pixel_y = 11 - }, -/turf/open/floor/almayer{ - icon_state = "bluefull" - }, -/area/almayer/command/cichallway) "rBH" = ( /obj/structure/machinery/constructable_frame, /turf/open/floor/almayer{ @@ -63259,17 +62394,16 @@ }, /area/almayer/command/airoom) "rCD" = ( -/obj/structure/machinery/light/small{ - dir = 4 +/obj/effect/decal/warning_stripes{ + icon_state = "W" }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, /turf/open/floor/almayer{ - dir = 4; - icon_state = "orange" + icon_state = "plate" }, -/area/almayer/engineering/upper_engineering/port) +/area/almayer/hallways/hangar) "rCK" = ( /obj/structure/machinery/cryopod/right, /turf/open/floor/almayer{ @@ -63336,6 +62470,15 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_a_p) +"rDj" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blue" + }, +/area/almayer/living/port_emb) "rDr" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/almayer{ @@ -63417,19 +62560,6 @@ icon_state = "plate" }, /area/almayer/hallways/vehiclehangar) -"rEv" = ( -/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{ - icon_state = "plate" - }, -/area/almayer/squads/delta) "rEL" = ( /obj/structure/machinery/cm_vending/gear/intelligence_officer, /turf/open/floor/almayer{ @@ -63492,6 +62622,12 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) +"rFV" = ( +/obj/structure/foamed_metal, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "rFY" = ( /turf/open/floor/almayer{ dir = 5; @@ -63537,13 +62673,6 @@ "rHc" = ( /turf/open/floor/carpet, /area/almayer/command/cichallway) -"rHf" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha_bravo_shared) "rHo" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ layer = 1.9 @@ -63578,6 +62707,15 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) +"rHE" = ( +/obj/structure/machinery/door/airlock/almayer/marine/delta/smart{ + req_access = list(14,18); + req_one_access = list() + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/squads/delta) "rHN" = ( /obj/structure/pipes/vents/pump/on, /turf/open/floor/plating/plating_catwalk, @@ -63651,6 +62789,13 @@ icon_state = "cargo" }, /area/almayer/living/synthcloset) +"rIX" = ( +/obj/structure/pipes/vents/pump, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "blue" + }, +/area/almayer/living/briefing) "rJb" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -63680,21 +62825,6 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) -"rJu" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orange" - }, -/area/almayer/living/briefing) -"rJx" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/shared/charlie_delta/blue{ - dir = 2 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/charlie_delta_shared) "rJD" = ( /obj/structure/prop/invuln/overhead_pipe{ pixel_x = 12 @@ -63702,15 +62832,17 @@ /obj/structure/machinery/cm_vending/own_points/experimental_tools, /turf/open/floor/almayer, /area/almayer/living/synthcloset) -"rJK" = ( -/obj/structure/pipes/vents/pump, -/turf/open/floor/almayer, -/area/almayer/living/briefing) "rKd" = ( /turf/open/floor/almayer/uscm/directional{ dir = 5 }, /area/almayer/command/cic) +"rKh" = ( +/obj/structure/machinery/cm_vending/clothing/marine/delta, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/delta) "rKn" = ( /obj/structure/machinery/door_control{ id = "agentshuttle"; @@ -63724,6 +62856,13 @@ icon_state = "rasputin15" }, /area/almayer/powered/agent) +"rKp" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/platform{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/port_hallway) "rKs" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -63739,17 +62878,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/port_hallway) -"rKA" = ( -/obj/structure/bed{ - can_buckle = 0 - }, -/obj/item/bedsheet/brown{ - layer = 3.1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/auxiliary_officer_office) "rKO" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -63789,6 +62917,36 @@ dir = 8 }, /area/almayer/medical/containment/cell/cl) +"rMC" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "silver" + }, +/area/almayer/living/cryo_cells) +"rMW" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_x = -1; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "red" + }, +/area/almayer/squads/alpha) +"rNu" = ( +/obj/structure/machinery/cm_vending/clothing/tl/delta{ + density = 0; + pixel_x = 32 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/port_hallway) "rNF" = ( /obj/structure/machinery/light{ unacidable = 1; @@ -63798,6 +62956,14 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) +"rNM" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "blue" + }, +/area/almayer/squads/delta) "rNW" = ( /obj/structure/machinery/door_control{ id = "Secretroom"; @@ -63824,15 +62990,6 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"rOj" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "blue" - }, -/area/almayer/hallways/port_hallway) "rOs" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/clipboard, @@ -63856,6 +63013,14 @@ icon_state = "plate" }, /area/almayer/living/gym) +"rPf" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "rPh" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -63877,15 +63042,12 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_f_s) -"rPE" = ( -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 - }, +"rPG" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/squads/delta) +/area/almayer/living/cryo_cells) "rPO" = ( /turf/open/floor/almayer{ dir = 10; @@ -63920,21 +63082,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_f_p) -"rQV" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) "rQW" = ( /obj/item/tool/screwdriver, /turf/open/floor/almayer, @@ -63991,14 +63138,27 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"rSj" = ( -/obj/structure/bed/chair{ - dir = 4 +"rSy" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, /turf/open/floor/almayer{ - icon_state = "orangefull" + dir = 9; + icon_state = "red" + }, +/area/almayer/squads/alpha) +"rSE" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/airlock/almayer/maint{ + req_one_access_txt = "19;21"; + access_modified = 1; + req_one_access = null + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, -/area/almayer/squads/alpha_bravo_shared) +/area/almayer/hallways/port_hallway) "rSG" = ( /obj/structure/toilet{ pixel_y = 16 @@ -64058,6 +63218,15 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering/port) +"rTL" = ( +/obj/structure/bed{ + icon_state = "psychbed" + }, +/obj/item/bedsheet/brown{ + layer = 3.1 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/auxiliary_officer_office) "rTV" = ( /obj/structure/sign/safety/security{ pixel_x = 32 @@ -64085,12 +63254,6 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/starboard) -"rUh" = ( -/turf/open/floor/almayer{ - dir = 10; - icon_state = "emerald" - }, -/area/almayer/squads/charlie) "rUk" = ( /obj/structure/bed/chair/wood/normal{ dir = 1 @@ -64138,12 +63301,35 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_a_s) +"rVu" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/squads/alpha) "rVN" = ( /turf/open/floor/almayer{ dir = 8; icon_state = "red" }, /area/almayer/shipboard/port_missiles) +"rVW" = ( +/obj/structure/bed/chair/office/dark{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/almayer/living/auxiliary_officer_office) +"rWl" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/squads/delta) "rWs" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -64151,12 +63337,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cic_hallway) -"rWL" = ( -/obj/structure/barricade/metal, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/living/cryo_cells) "rWT" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/manifold/hidden/supply{ @@ -64164,29 +63344,18 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/briefing) +"rXb" = ( +/obj/structure/machinery/cm_vending/gear/medic, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/cryo_cells) "rXd" = ( /obj/structure/machinery/vending/security, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/shipboard/brig/general_equipment) -"rXj" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/squads/delta) -"rXk" = ( -/obj/structure/barricade/plasteel/metal{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/living/cryo_cells) "rXv" = ( /obj/structure/machinery/door/airlock/almayer/maint, /obj/structure/disposalpipe/segment{ @@ -64203,18 +63372,6 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/general_equipment) -"rXS" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/delta{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/delta) "rYi" = ( /obj/structure/bed/chair, /obj/structure/machinery/power/apc/almayer{ @@ -64238,6 +63395,18 @@ icon_state = "plate" }, /area/almayer/squads/delta) +"rYu" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/airlock/multi_tile/almayer/almayer{ + dir = 1; + name = "\improper Auxiliary Combat Support Secondary Preparations"; + req_one_access = "19;27;22"; + welded = 1 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/port_hallway) "rYv" = ( /obj/structure/surface/table/almayer, /obj/effect/decal/warning_stripes{ @@ -64246,6 +63415,9 @@ /obj/structure/machinery/computer/station_alert{ dir = 1 }, +/obj/structure/machinery/light/small{ + dir = 4 + }, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -64276,6 +63448,16 @@ icon_state = "plate" }, /area/almayer/hallways/port_hallway) +"rZN" = ( +/obj/structure/surface/rack, +/obj/item/tool/weldingtool, +/obj/item/tool/wrench, +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/port_hallway) "rZP" = ( /obj/structure/surface/table/almayer, /obj/item/tool/weldpack, @@ -64311,6 +63493,14 @@ icon_state = "test_floor4" }, /area/almayer/hallways/aft_hallway) +"saZ" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/living/briefing) "sbq" = ( /obj/structure/machinery/door/poddoor/almayer/locked{ icon_state = "almayer_pdoor"; @@ -64320,6 +63510,24 @@ icon_state = "test_floor4" }, /area/almayer/engineering/upper_engineering/notunnel) +"sby" = ( +/obj/structure/machinery/light, +/turf/open/floor/almayer, +/area/almayer/living/auxiliary_officer_office) +"sbH" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/firealarm{ + pixel_y = -29 + }, +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/squads/alpha) "sbJ" = ( /turf/closed/wall/almayer/white/hull, /area/almayer/powered/agent) @@ -64384,6 +63592,16 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/shipboard/brig/general_equipment) +"scE" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/bed/chair/comfy{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/living/captain_mess) "scH" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -64460,14 +63678,6 @@ icon_state = "test_floor4" }, /area/almayer/hull/upper_hull/u_a_p) -"sdC" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "blue" - }, -/area/almayer/squads/delta) "sdF" = ( /obj/structure/machinery/firealarm{ dir = 8; @@ -64493,6 +63703,22 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_p) +"sej" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/obj/structure/bed/chair/comfy{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/living/captain_mess) "seO" = ( /obj/structure/sign/safety/terminal{ pixel_x = 8; @@ -64573,22 +63799,23 @@ icon_state = "cargo" }, /area/almayer/engineering/engine_core) -"sgR" = ( -/obj/structure/surface/table/almayer, -/obj/item/toy/deck{ - pixel_x = 8; - pixel_y = 8 - }, -/turf/open/floor/almayer{ - icon_state = "blue" - }, -/area/almayer/squads/delta) "sgU" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south1) +"sgX" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "shb" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/almayer, @@ -64676,6 +63903,19 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) +"siX" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/firstaid/adv, +/obj/structure/machinery/light{ + dir = 8; + invisibility = 101; + unacidable = 1; + unslashable = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha) "sjc" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, @@ -64731,11 +63971,6 @@ icon_state = "plating_striped" }, /area/almayer/shipboard/sea_office) -"skF" = ( -/turf/open/floor/almayer{ - icon_state = "cargo_arrow" - }, -/area/almayer/squads/charlie_delta_shared) "sld" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -64747,6 +63982,13 @@ icon_state = "sterile_green" }, /area/almayer/medical/lower_medical_lobby) +"slx" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "slP" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_full" @@ -64778,6 +64020,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/engineering_workshop) +"smA" = ( +/turf/open/floor/almayer{ + dir = 1; + icon_state = "cargo_arrow" + }, +/area/almayer/squads/alpha) "snb" = ( /obj/structure/ladder{ height = 1; @@ -64785,12 +64033,6 @@ }, /turf/open/floor/plating/almayer, /area/almayer/living/briefing) -"sni" = ( -/turf/open/floor/almayer{ - dir = 9; - icon_state = "orange" - }, -/area/almayer/command/cic) "snm" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -64815,6 +64057,12 @@ icon_state = "plate" }, /area/almayer/squads/req) +"snA" = ( +/obj/structure/pipes/vents/pump{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "snE" = ( /obj/structure/machinery/cryopod/right, /obj/effect/decal/warning_stripes{ @@ -64829,6 +64077,11 @@ icon_state = "cargo" }, /area/almayer/engineering/upper_engineering/port) +"snJ" = ( +/turf/open/floor/almayer{ + icon_state = "silvercorner" + }, +/area/almayer/hallways/port_hallway) "snM" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -64842,10 +64095,10 @@ icon_state = "green" }, /area/almayer/squads/req) -"snR" = ( +"snU" = ( /obj/structure/surface/table/almayer, /turf/open/floor/almayer{ - icon_state = "blue" + icon_state = "plate" }, /area/almayer/squads/delta) "soa" = ( @@ -64969,15 +64222,6 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering/starboard) -"spS" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "emerald" - }, -/area/almayer/squads/charlie) "spT" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -65060,6 +64304,33 @@ icon_state = "test_floor4" }, /area/almayer/hallways/repair_bay) +"ssm" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/machinery/door_control{ + id = "ARES Interior"; + indestructible = 1; + name = "ARES Chamber Lockdown"; + pixel_x = -24; + pixel_y = 8; + req_one_access_txt = "90;91;92" + }, +/obj/structure/machinery/door/poddoor/railing{ + closed_layer = 4; + density = 0; + id = "ARES Railing"; + layer = 2.1; + open_layer = 2.1; + unacidable = 0; + unslashable = 0 + }, +/turf/open/floor/almayer/no_build{ + dir = 8; + icon_state = "silver" + }, +/area/almayer/command/airoom) "ssD" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -65158,6 +64429,12 @@ }, /turf/open/floor/almayer, /area/almayer/command/computerlab) +"suD" = ( +/obj/structure/machinery/cm_vending/sorted/tech/comtech_tools, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/cryo_cells) "suT" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -65230,24 +64507,6 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) -"swH" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_x = -12; - pixel_y = 28 - }, -/obj/structure/machinery/computer/cameras/almayer/vehicle{ - dir = 4; - pixel_x = -17 - }, -/obj/item/device/flashlight/lamp, -/obj/item/clothing/glasses/hud/health, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/cic) "swM" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 8; @@ -65265,6 +64524,14 @@ icon_state = "cargo" }, /area/almayer/engineering/upper_engineering) +"swR" = ( +/obj/structure/surface/table/almayer, +/obj/item/tool/hand_labeler, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "blue" + }, +/area/almayer/squads/delta) "sxe" = ( /obj/structure/prop/invuln/lattice_prop{ dir = 1; @@ -65298,15 +64565,12 @@ icon_state = "plate" }, /area/almayer/living/bridgebunks) -"syH" = ( -/obj/structure/machinery/firealarm{ - pixel_y = -28 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 +"syh" = ( +/turf/open/floor/almayer{ + dir = 1; + icon_state = "redcorner" }, -/turf/open/floor/almayer, -/area/almayer/squads/delta) +/area/almayer/squads/alpha) "syM" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -65343,33 +64607,12 @@ icon_state = "test_floor4" }, /area/almayer/living/offices) -"szM" = ( -/obj/structure/flora/pottedplant{ - desc = "It is made of Fiberbush(tm). It contains asbestos."; - icon_state = "pottedplant_22"; - name = "synthetic potted plant"; - pixel_y = 8 - }, -/turf/open/floor/almayer{ - dir = 6; - icon_state = "emerald" - }, -/area/almayer/squads/charlie) "szO" = ( /obj/structure/machinery/cm_vending/sorted/cargo_guns/pilot_officer, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/living/pilotbunks) -"sAc" = ( -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 - }, -/turf/open/floor/almayer{ - icon_state = "blue" - }, -/area/almayer/squads/delta) "sAm" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer{ @@ -65387,20 +64630,6 @@ icon_state = "orange" }, /area/almayer/engineering/ce_room) -"sBp" = ( -/obj/structure/sign/safety/escapepod{ - pixel_x = -17; - pixel_y = -8 - }, -/obj/structure/sign/safety/stairs{ - pixel_x = -17; - pixel_y = 7 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "red" - }, -/area/almayer/hallways/starboard_hallway) "sBF" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -65451,20 +64680,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_m_p) -"sCD" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_x = -1; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha) "sCI" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -65483,6 +64698,18 @@ icon_state = "dark_sterile" }, /area/almayer/engineering/laundry) +"sDv" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/living/cryo_cells) "sDy" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -65508,29 +64735,11 @@ icon_state = "blue" }, /area/almayer/squads/delta) -"sDQ" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "emeraldcorner" - }, -/area/almayer/hallways/port_hallway) "sEa" = ( /turf/open/floor/almayer{ icon_state = "redcorner" }, /area/almayer/shipboard/brig/chief_mp_office) -"sEd" = ( -/obj/structure/machinery/cryopod/right, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/squads/bravo) "sEi" = ( /obj/structure/bed/chair{ can_buckle = 0; @@ -65592,25 +64801,6 @@ icon_state = "tcomms" }, /area/almayer/command/airoom) -"sEM" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_x = -12; - pixel_y = -28 - }, -/obj/item/device/flashlight/lamp, -/obj/structure/machinery/computer/cameras/almayer/vehicle{ - dir = 4; - layer = 3.3; - pixel_x = -17 - }, -/obj/item/clothing/glasses/hud/health, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/cic) "sFf" = ( /turf/open/floor/almayer{ icon_state = "cargo" @@ -65625,6 +64815,29 @@ }, /turf/open/floor/plating, /area/almayer/shipboard/brig/main_office) +"sFD" = ( +/obj/structure/surface/table/almayer, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/item/facepaint/black, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/port_hallway) +"sFE" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/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 = "plate" + }, +/area/almayer/squads/delta) "sFF" = ( /obj/structure/closet/secure_closet/engineering_welding, /obj/item/stack/tile/carpet{ @@ -65662,6 +64875,11 @@ "sGh" = ( /turf/open/floor/almayer/uscm/directional, /area/almayer/command/lifeboat) +"sGK" = ( +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/hull/lower_hull/l_a_s) "sGL" = ( /obj/structure/machinery/cryopod/right{ layer = 3.1; @@ -65738,14 +64956,6 @@ icon_state = "red" }, /area/almayer/shipboard/starboard_missiles) -"sHY" = ( -/obj/structure/sign/poster{ - pixel_y = -32 - }, -/turf/open/floor/almayer{ - icon_state = "red" - }, -/area/almayer/squads/alpha) "sIf" = ( /obj/effect/step_trigger/teleporter_vector{ name = "Almayer_AresDown"; @@ -65810,6 +65020,31 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_a_p) +"sIW" = ( +/obj/structure/machinery/light, +/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/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 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "cargo_arrow" + }, +/area/almayer/hallways/port_hallway) "sIY" = ( /obj/structure/machinery/brig_cell/perma_1{ pixel_x = -32; @@ -65839,15 +65074,16 @@ icon_state = "bluefull" }, /area/almayer/living/briefing) -"sJY" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +"sJV" = ( +/obj/structure/surface/table/almayer, +/obj/item/prop/magazine/boots/n117{ + pixel_x = -4; + pixel_y = 6 }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "orange" + icon_state = "bluefull" }, -/area/almayer/living/port_emb) +/area/almayer/living/briefing) "sKa" = ( /turf/open/floor/almayer{ dir = 4; @@ -65893,18 +65129,18 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south1) -"sNb" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +"sNm" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/disposalpipe/segment, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 }, -/obj/structure/machinery/light, /turf/open/floor/almayer{ - icon_state = "orange" + icon_state = "test_floor4" }, -/area/almayer/squads/bravo) +/area/almayer/hull/lower_hull/l_a_p) "sNz" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -66048,6 +65284,15 @@ icon_state = "plate" }, /area/almayer/command/lifeboat) +"sQR" = ( +/obj/structure/bed/chair/comfy{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/living/bridgebunks) "sQS" = ( /obj/structure/surface/table/almayer, /obj/item/tool/stamp{ @@ -66066,6 +65311,27 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_p) +"sQX" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/device/camera_film{ + pixel_x = 4; + pixel_y = -2 + }, +/obj/item/device/camera/siliconcam{ + pixel_x = -6; + pixel_y = 11 + }, +/obj/structure/machinery/light{ + dir = 4; + invisibility = 101; + unacidable = 1; + unslashable = 1 + }, +/turf/open/floor/almayer{ + dir = 6; + icon_state = "blue" + }, +/area/almayer/squads/delta) "sRI" = ( /obj/structure/surface/table/almayer, /obj/item/tool/wirecutters/clippers, @@ -66126,12 +65392,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) -"sSC" = ( -/turf/open/floor/almayer{ - dir = 6; - icon_state = "blue" - }, -/area/almayer/squads/delta) "sSR" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out"; @@ -66192,16 +65452,6 @@ icon_state = "silverfull" }, /area/almayer/shipboard/brig/cic_hallway) -"sUj" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "bluefull" - }, -/area/almayer/squads/delta) "sUs" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -66212,12 +65462,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) -"sUE" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/turf/open/floor/almayer{ - icon_state = "bluefull" - }, -/area/almayer/command/cichallway) "sUF" = ( /obj/structure/sign/safety/distribution_pipes{ pixel_x = 8; @@ -66228,21 +65472,6 @@ icon_state = "orangecorner" }, /area/almayer/hallways/stern_hallway) -"sUO" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/sign/safety/hvac_old{ - pixel_x = 8; - pixel_y = -32 - }, -/turf/open/floor/almayer{ - icon_state = "blue" - }, -/area/almayer/squads/delta) "sVc" = ( /obj/structure/machinery/portable_atmospherics/hydroponics, /obj/item/seeds/orangeseed, @@ -66273,6 +65502,22 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cryo) +"sVC" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "green" + }, +/area/almayer/command/cichallway) +"sVZ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/largecrate/random/barrel/blue, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/lower_hull/l_a_s) "sWW" = ( /obj/structure/machinery/flasher{ alpha = 1; @@ -66297,6 +65542,15 @@ icon_state = "dark_sterile" }, /area/almayer/medical/containment) +"sXr" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) "sXs" = ( /obj/structure/surface/table/almayer, /obj/item/device/flashlight/lamp{ @@ -66311,21 +65565,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_f_p) -"sXt" = ( -/obj/structure/machinery/cm_vending/clothing/tl/alpha{ - density = 0; - pixel_x = 32 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/squads/alpha) -"sXw" = ( -/obj/effect/landmark/start/marine/engineer/bravo, -/obj/effect/landmark/late_join/bravo, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/bravo) "sXB" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -66339,14 +65578,6 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"sXE" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - name = "\improper Auxiliary Support Officer's Room" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/living/auxiliary_officer_office) "sXK" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -66441,6 +65672,22 @@ icon_state = "plate" }, /area/almayer/command/lifeboat) +"sYH" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/delta{ + dir = 1; + req_one_access = list(18,19) + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/squads/delta) "sYP" = ( /obj/structure/reagent_dispensers/fueltank/custom, /turf/open/floor/almayer{ @@ -66457,15 +65704,6 @@ /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/plating, /area/almayer/medical/upper_medical) -"sZq" = ( -/obj/structure/machinery/cm_vending/sorted/marine_food{ - density = 0; - pixel_y = 16 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) "sZy" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -66480,33 +65718,15 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) -"sZH" = ( -/obj/structure/surface/table/almayer, -/obj/item/ashtray/bronze{ - pixel_x = 7; - pixel_y = 9 - }, -/obj/item/trash/semki{ - layer = 2; - pixel_x = -13; - pixel_y = 14 - }, -/obj/item/prop/magazine/boots/n054{ - pixel_x = 29 - }, -/obj/item/prop/magazine/dirty/torn{ - pixel_x = -6; - pixel_y = 6 - }, -/obj/item/clothing/glasses/disco_fever{ - pixel_x = 5; - pixel_y = 4 +"sZK" = ( +/obj/structure/machinery/light{ + dir = 1 }, /turf/open/floor/almayer{ - dir = 5; - icon_state = "blue" + dir = 10; + icon_state = "green" }, -/area/almayer/living/port_emb) +/area/almayer/command/cichallway) "tab" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/storage/box/flashbangs{ @@ -66525,6 +65745,21 @@ icon_state = "plate" }, /area/almayer/living/briefing) +"taj" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad{ + req_access = null; + req_one_access = null; + req_one_access_txt = "17;18;21"; + vend_x_offset = 0; + vend_y_offset = 0 + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "tak" = ( /turf/open/floor/almayer{ dir = 8; @@ -66540,15 +65775,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/aft_hallway) -"taA" = ( -/obj/structure/machinery/light{ - dir = 4 - }, +"tav" = ( /turf/open/floor/almayer{ - dir = 4; - icon_state = "red" + dir = 5; + icon_state = "blue" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/living/gym) "taH" = ( /obj/structure/machinery/door/airlock/almayer/research/glass/reinforced{ id = "Containment Cell 2"; @@ -66577,6 +65809,22 @@ icon_state = "test_floor4" }, /area/almayer/medical/containment/cell) +"tbe" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/safety/hvac_old{ + pixel_x = 8; + pixel_y = 32 + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blue" + }, +/area/almayer/squads/delta) "tbD" = ( /obj/structure/ladder{ height = 2; @@ -66588,6 +65836,12 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_p) +"tbT" = ( +/obj/structure/machinery/cm_vending/sorted/marine_food, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "tce" = ( /obj/structure/closet/emcloset, /turf/open/floor/almayer{ @@ -66641,19 +65895,16 @@ icon_state = "orangecorner" }, /area/almayer/engineering/engine_core) -"tdE" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4; - health = 80 +"tdF" = ( +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "Hangar Lockdown"; + name = "\improper Hangar Lockdown Blast Door" }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "cargo_arrow" + icon_state = "plate" }, -/area/almayer/squads/alpha_bravo_shared) +/area/almayer/living/auxiliary_officer_office) "tdI" = ( /turf/open/floor/almayer{ icon_state = "sterile_green_corner" @@ -66696,13 +65947,6 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/north1) -"teu" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/weapon/gun/shotgun/pump{ - starting_attachment_types = list(/obj/item/attachable/stock/shotgun) - }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) "tez" = ( /obj/effect/landmark/ert_spawns/distress_cryo, /obj/effect/landmark/late_join, @@ -66802,28 +66046,43 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) -"thv" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 8; - name = "ship-grade camera" +"thp" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + dir = 2 + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "Hangar Lockdown"; + name = "\improper Hangar Lockdown Blast Door" }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/command/telecomms) -"thA" = ( -/obj/structure/window/reinforced{ +/area/almayer/living/auxiliary_officer_office) +"thq" = ( +/obj/structure/machinery/door_control{ + id = "laddersoutheast"; + name = "South East Ladders Shutters"; + pixel_x = 25; + req_one_access_txt = "2;3;12;19"; + throw_range = 15 + }, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/almayer{ dir = 4; - health = 80 + icon_state = "green" }, -/obj/structure/window/reinforced{ - dir = 8 +/area/almayer/hallways/port_hallway) +"thv" = ( +/obj/structure/machinery/camera/autoname/almayer{ + dir = 8; + name = "ship-grade camera" }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "cargo_arrow" + icon_state = "plate" }, -/area/almayer/squads/alpha_bravo_shared) +/area/almayer/command/telecomms) "thL" = ( /turf/open/floor/wood/ship, /area/almayer/shipboard/brig/cells) @@ -66853,14 +66112,6 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) -"tig" = ( -/obj/structure/surface/table/almayer, -/obj/item/reagent_container/food/condiment/hotsauce/tabasco{ - pixel_x = 14; - pixel_y = 20 - }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha) "tii" = ( /obj/structure/machinery/firealarm{ pixel_x = 6; @@ -66891,6 +66142,12 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) +"tiv" = ( +/obj/structure/machinery/cm_vending/clothing/smartgun/delta, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "tiw" = ( /obj/structure/machinery/constructable_frame{ icon_state = "box_2" @@ -66927,6 +66184,17 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) +"tiL" = ( +/obj/structure/machinery/cm_vending/gear/tl{ + density = 0; + pixel_x = -32; + vend_x_offset = 1 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" + }, +/area/almayer/squads/alpha) "tiM" = ( /obj/structure/machinery/door/airlock/almayer/maint, /turf/open/floor/almayer{ @@ -66969,13 +66237,11 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) -"tjw" = ( -/obj/structure/machinery/cm_vending/clothing/vehicle_crew{ - density = 0; - pixel_y = 16 +"tjq" = ( +/turf/open/floor/almayer{ + icon_state = "bluecorner" }, -/turf/open/floor/almayer, -/area/almayer/living/tankerbunks) +/area/almayer/squads/delta) "tjU" = ( /obj/structure/bed/chair/wood/normal, /obj/item/bedsheet/brown, @@ -66988,17 +66254,10 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/weapon_room) -"tkN" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_ammo/squad{ - req_access = null; - req_one_access = null; - req_one_access_txt = "15;16;21"; - vend_x_offset = 0 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha_bravo_shared) +"tkB" = ( +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "tkV" = ( /obj/structure/bed/chair, /turf/open/floor/almayer{ @@ -67076,12 +66335,6 @@ icon_state = "orange" }, /area/almayer/engineering/lower_engineering) -"tmB" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 - }, -/turf/open/floor/almayer, -/area/almayer/living/briefing) "tmK" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1; @@ -67148,6 +66401,13 @@ icon_state = "cargo" }, /area/almayer/squads/alpha) +"toh" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/squads/alpha) "tou" = ( /obj/structure/bed/chair{ dir = 4 @@ -67295,6 +66555,30 @@ icon_state = "red" }, /area/almayer/command/lifeboat) +"tqP" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep{ + req_one_access = list() + }, +/obj/structure/machinery/light{ + dir = 4; + invisibility = 101; + unacidable = 1; + unslashable = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha) +"tqT" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/surface/table/almayer, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/alpha) "tqV" = ( /obj/structure/extinguisher_cabinet{ pixel_y = 26 @@ -67370,6 +66654,14 @@ /obj/item/clothing/suit/chef/classic, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/grunt_rnr) +"tsj" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) "tst" = ( /obj/structure/machinery/cryopod/right, /obj/effect/decal/warning_stripes{ @@ -67392,17 +66684,6 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/north1) -"tsy" = ( -/obj/structure/filingcabinet{ - pixel_x = 8 - }, -/obj/structure/filingcabinet{ - pixel_x = -8 - }, -/turf/open/floor/almayer{ - icon_state = "bluefull" - }, -/area/almayer/command/cichallway) "tsC" = ( /obj/item/storage/box/bodybags, /obj/item/storage/box/bodybags, @@ -67418,6 +66699,12 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/upper_medical) +"tsD" = ( +/obj/structure/disposalpipe/junction{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/delta) "tsH" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -67427,20 +66714,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/command/corporateliason) -"tsM" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_side" - }, -/area/almayer/medical/medical_science) "tsX" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/brig/lobby) @@ -67470,6 +66743,11 @@ icon_state = "green" }, /area/almayer/hallways/port_hallway) +"ttP" = ( +/turf/open/floor/almayer{ + icon_state = "cargo_arrow" + }, +/area/almayer/squads/delta) "ttS" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_sn_full_cap" @@ -67488,6 +66766,12 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) +"tum" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "tuo" = ( /obj/structure/machinery/portable_atmospherics/hydroponics, /obj/structure/sign/safety/hvac_old{ @@ -67499,42 +66783,6 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) -"tuv" = ( -/obj/item/bedsheet/purple{ - layer = 3.2 - }, -/obj/item/bedsheet/purple{ - pixel_y = 13 - }, -/obj/item/clothing/head/beret/centcom/captain{ - color = "#4b5320"; - desc = "Dusty beret bearing the logo of the royal marines. How did this get here?"; - name = "dusty beret"; - pixel_y = -6 - }, -/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 - }, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "emerald" - }, -/area/almayer/living/port_emb) "tuA" = ( /turf/closed/wall/almayer/outer, /area/almayer/shipboard/port_missiles) @@ -67543,6 +66791,30 @@ icon_state = "orange" }, /area/almayer/hallways/hangar) +"tuO" = ( +/obj/structure/pipes/vents/pump/on, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/squads/alpha) +"tuR" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 4 + }, +/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 = "plate" + }, +/area/almayer/hallways/port_hallway) "tuZ" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -67576,21 +66848,6 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) -"tvN" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 1; - name = "ship-grade camera" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/delta) "tvQ" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer{ @@ -67598,23 +66855,6 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) -"twq" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/tool/hand_labeler{ - pixel_x = 7 - }, -/obj/item/paper_bin/uscm{ - pixel_y = 5 - }, -/obj/item/tool/pen, -/obj/structure/machinery/computer/working_joe{ - dir = 8; - pixel_x = 17 - }, -/turf/open/floor/almayer{ - icon_state = "sterile_green_side" - }, -/area/almayer/medical/lower_medical_medbay) "twB" = ( /obj/structure/prop/almayer/name_stencil{ icon_state = "almayer2" @@ -67710,6 +66950,23 @@ icon_state = "cargo_arrow" }, /area/almayer/shipboard/starboard_missiles) +"tza" = ( +/obj/structure/disposalpipe/trunk{ + dir = 2 + }, +/obj/structure/machinery/disposal, +/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 = "plate" + }, +/area/almayer/squads/alpha) "tzf" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment, @@ -67733,6 +66990,12 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_p) +"tzs" = ( +/obj/structure/machinery/cm_vending/clothing/leader/delta, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "tzx" = ( /obj/structure/machinery/cm_vending/sorted/medical/blood, /obj/structure/machinery/light{ @@ -67803,27 +67066,16 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering/port) +"tAs" = ( +/obj/structure/closet/firecloset/full, +/turf/open/floor/almayer, +/area/almayer/living/auxiliary_officer_office) "tAL" = ( /obj/structure/machinery/cryopod, /turf/open/floor/almayer{ icon_state = "cargo" }, /area/almayer/living/pilotbunks) -"tAN" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orange" - }, -/area/almayer/squads/bravo) "tAR" = ( /obj/effect/spawner/random/toolbox, /obj/structure/largecrate/random/barrel/red, @@ -67876,12 +67128,15 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_f_s) -"tCN" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "orange" +"tCR" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 }, -/area/almayer/hallways/starboard_hallway) +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "tCT" = ( /obj/structure/bed/chair/comfy/blue{ dir = 8 @@ -67890,6 +67145,19 @@ icon_state = "plate" }, /area/almayer/command/cic) +"tCU" = ( +/obj/effect/step_trigger/clone_cleaner, +/obj/structure/machinery/door_control{ + id = "ARES StairsUpper"; + name = "ARES Core Access"; + pixel_x = -24; + pixel_y = 24; + req_one_access_txt = "90;91;92" + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) "tDx" = ( /obj/item/tool/wet_sign, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -67901,17 +67169,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_m_p) -"tDZ" = ( -/obj/structure/machinery/cryopod{ - pixel_y = 6 - }, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/squads/bravo) "tEi" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -67934,15 +67191,27 @@ icon_state = "plate" }, /area/almayer/command/combat_correspondent) -"tEO" = ( -/obj/effect/landmark/start/marine/medic/charlie, -/obj/effect/landmark/late_join/charlie, -/obj/structure/sign/safety/cryo{ - pixel_x = 8; - pixel_y = -26 +"tEL" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera" + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) +"tEZ" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/charlie) +/area/almayer/squads/alpha) "tFe" = ( /obj/effect/step_trigger/clone_cleaner, /obj/structure/machinery/door/poddoor/shutters/almayer{ @@ -67966,6 +67235,14 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/general_equipment) +"tFC" = ( +/obj/structure/surface/table/almayer, +/obj/item/trash/USCMtray{ + pixel_x = 6; + pixel_y = 4 + }, +/turf/open/floor/almayer, +/area/almayer/squads/alpha) "tFS" = ( /obj/structure/machinery/computer/supplycomp, /obj/structure/sign/safety/terminal{ @@ -68001,6 +67278,18 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) +"tGe" = ( +/obj/structure/machinery/alarm/almayer{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "silvercorner" + }, +/area/almayer/hallways/port_hallway) "tGf" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -68043,41 +67332,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/port_hallway) -"tHc" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/cameras/wooden_tv/prop{ - dir = 8; - layer = 3.2; - pixel_x = -3; - pixel_y = 6 - }, -/obj/structure/sign/poster{ - desc = "YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE."; - icon_state = "poster11"; - name = "YOU ALWAYS KNOW A WORKING JOE."; - pixel_x = 27; - serial_number = 11 - }, -/obj/item/trash/pistachios{ - layer = 2; - pixel_x = 6; - pixel_y = -6 - }, -/obj/structure/machinery/recharger{ - layer = 3.1; - pixel_y = 22 - }, -/obj/item/ammo_magazine/rifle/incendiary{ - current_rounds = 0; - desc = "A 10mm assault rifle magazine with ':D' drawn on the side"; - pixel_x = 10; - pixel_y = 2 - }, -/turf/open/floor/almayer{ - dir = 6; - icon_state = "blue" - }, -/area/almayer/living/port_emb) "tHh" = ( /obj/structure/sign/safety/ladder{ pixel_x = 8; @@ -68107,12 +67361,6 @@ icon_state = "silverfull" }, /area/almayer/command/airoom) -"tHv" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "orangecorner" - }, -/area/almayer/living/briefing) "tHB" = ( /obj/structure/surface/table/almayer, /obj/structure/reagent_dispensers/peppertank{ @@ -68130,15 +67378,6 @@ /obj/structure/window/framed/almayer, /turf/open/floor/plating, /area/almayer/shipboard/brig/cells) -"tIb" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "emerald" - }, -/area/almayer/living/port_emb) "tIp" = ( /obj/structure/machinery/door/airlock/almayer/generic{ name = "\improper Dorms" @@ -68165,15 +67404,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/basketball) -"tIQ" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha) "tIS" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out" @@ -68196,6 +67426,15 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_s) +"tIV" = ( +/obj/structure/pipes/vents/scrubber{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "blue" + }, +/area/almayer/living/briefing) "tJa" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 1 @@ -68249,12 +67488,6 @@ icon_state = "redcorner" }, /area/almayer/shipboard/brig/main_office) -"tJz" = ( -/obj/structure/machinery/firealarm{ - pixel_y = -28 - }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) "tJR" = ( /obj/structure/machinery/vending/cigarette, /obj/structure/sign/safety/medical{ @@ -68281,17 +67514,6 @@ icon_state = "test_floor4" }, /area/almayer/command/lifeboat) -"tKr" = ( -/obj/structure/machinery/cryopod/right{ - dir = 2 - }, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/living/bridgebunks) "tLc" = ( /obj/structure/surface/rack, /obj/item/storage/bag/plants{ @@ -68388,15 +67610,6 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering/port) -"tNR" = ( -/obj/structure/machinery/firealarm{ - pixel_y = 28 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha) "tNT" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -68442,6 +67655,12 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) +"tOX" = ( +/obj/structure/surface/table/almayer, +/turf/open/floor/almayer{ + icon_state = "bluefull" + }, +/area/almayer/hull/lower_hull/l_a_s) "tPj" = ( /obj/structure/machinery/door/airlock/almayer/marine/requisitions{ name = "\improper Requisition's Office"; @@ -68458,12 +67677,6 @@ icon_state = "test_floor4" }, /area/almayer/squads/req) -"tPI" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) "tQd" = ( /obj/structure/machinery/light{ dir = 8 @@ -68517,6 +67730,19 @@ icon_state = "bluecorner" }, /area/almayer/living/basketball) +"tRF" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/surface/table/almayer, +/obj/item/paper_bin, +/obj/item/tool/pen, +/obj/item/clothing/mask/rebreather/scarf, +/obj/item/clothing/mask/rebreather/scarf, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/tankerbunks) "tRV" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -68566,22 +67792,28 @@ icon_state = "redfull" }, /area/almayer/hallways/stern_hallway) -"tSB" = ( +"tSy" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "orangecorner" + icon_state = "silver" }, -/area/almayer/living/briefing) -"tTp" = ( -/obj/structure/surface/table/almayer, -/obj/item/reagent_container/food/condiment/hotsauce/sriracha{ - pixel_x = 7; - pixel_y = 7 +/area/almayer/hallways/port_hallway) +"tTo" = ( +/obj/structure/machinery/cryopod{ + pixel_y = 6 + }, +/obj/structure/machinery/light{ + dir = 8 }, /turf/open/floor/almayer{ - icon_state = "emeraldfull" + icon_state = "cargo" }, -/area/almayer/living/briefing) +/area/almayer/squads/delta) "tTu" = ( /turf/open/floor/almayer{ dir = 6; @@ -68601,6 +67833,16 @@ icon_state = "kitchen" }, /area/almayer/living/captain_mess) +"tTX" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera" + }, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "tUh" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -68608,23 +67850,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/req) -"tUo" = ( -/obj/item/clipboard, -/obj/structure/surface/table/reinforced/black, -/obj/item/tool/pen, -/turf/open/floor/almayer, -/area/almayer/command/cic) -"tUv" = ( -/obj/structure/machinery/iv_drip, -/obj/structure/machinery/computer/working_joe{ - dir = 8; - pixel_x = 17 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "sterile_green_corner" - }, -/area/almayer/medical/lower_medical_medbay) "tUx" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) @@ -68654,32 +67879,35 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_s) -"tVh" = ( -/obj/structure/bed/chair/comfy{ - dir = 8 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "bluefull" +"tVn" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 }, -/area/almayer/living/bridgebunks) -"tVq" = ( /obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 + icon_state = "E"; + pixel_x = 1 }, /turf/open/floor/almayer{ + dir = 8; icon_state = "cargo_arrow" }, -/area/almayer/squads/alpha) +/area/almayer/hallways/port_hallway) "tVB" = ( /obj/structure/closet/emcloset, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_p) +"tVV" = ( +/obj/structure/machinery/camera/autoname/almayer{ + dir = 8; + name = "ship-grade camera" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/tankerbunks) "tWg" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -68694,6 +67922,20 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/port) +"tWx" = ( +/obj/structure/machinery/cm_vending/clothing/medic/delta{ + density = 0; + pixel_y = -30 + }, +/obj/structure/machinery/cm_vending/gear/medic{ + density = 0; + pixel_x = -32 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "blue" + }, +/area/almayer/squads/delta) "tWY" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -68714,15 +67956,6 @@ icon_state = "test_floor4" }, /area/almayer/medical/upper_medical) -"tXb" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/bed/chair/comfy/charlie{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "emeraldfull" - }, -/area/almayer/living/briefing) "tXi" = ( /obj/structure/machinery/conveyor_switch{ id = "gym_2"; @@ -68740,6 +67973,12 @@ icon_state = "test_floor4" }, /area/almayer/squads/req) +"tXq" = ( +/turf/open/floor/almayer{ + dir = 1; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) "tXs" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -68770,43 +68009,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/shipboard/sea_office) -"tXT" = ( -/obj/item/bedsheet/blue{ - layer = 3.2 - }, -/obj/item/bedsheet/blue{ - pixel_y = 13 - }, -/obj/structure/sign/poster{ - desc = "This poster features Audrey Rainwater standing in a jacuzzi. She was the July 2182 centerfold in House Bunny Gentleman's Magazine. Don't ask how you know that."; - icon_state = "poster16"; - layer = 3.3; - name = "'Miss July' Pinup"; - pixel_y = 29; - serial_number = 16 - }, -/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 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/port_emb) "tXW" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -68885,6 +68087,18 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_s) +"tZs" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1; + req_access = null; + req_one_access = null; + req_one_access_txt = "3;22;19"; + access_modified = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/lower_hull/l_f_s) "tZB" = ( /obj/structure/machinery/light{ dir = 1 @@ -69013,6 +68227,41 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) +"ubO" = ( +/obj/structure/machinery/firealarm{ + pixel_y = -28 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/squads/alpha) +"ucd" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/tool/hand_labeler{ + pixel_x = 7 + }, +/obj/item/paper_bin/uscm{ + pixel_y = 5 + }, +/obj/item/tool/pen, +/obj/structure/machinery/computer/working_joe{ + dir = 8; + pixel_x = 17 + }, +/turf/open/floor/almayer{ + icon_state = "sterile_green_side" + }, +/area/almayer/medical/lower_medical_medbay) +"uci" = ( +/obj/structure/extinguisher_cabinet{ + pixel_x = 26 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "cargo_arrow" + }, +/area/almayer/squads/delta) "ucp" = ( /obj/structure/window/framed/almayer, /turf/open/floor/plating, @@ -69023,11 +68272,39 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south2) +"udh" = ( +/obj/structure/sign/safety/north{ + pixel_x = -17; + pixel_y = -8 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "green" + }, +/area/almayer/hallways/starboard_hallway) "udi" = ( /turf/open/floor/almayer{ icon_state = "red" }, /area/almayer/living/briefing) +"udm" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/clothing/head/cmcap{ + pixel_x = 8; + pixel_y = -1 + }, +/obj/item/ammo_box/magazine/misc/mre{ + pixel_x = -6; + pixel_y = 7 + }, +/obj/item/prop/helmetgarb/helmet_nvg/cosmetic{ + pixel_x = 5; + pixel_y = 7 + }, +/turf/open/floor/almayer{ + icon_state = "blue" + }, +/area/almayer/squads/delta) "udr" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -69040,12 +68317,15 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_lobby) -"udx" = ( -/obj/structure/machinery/vending/snack, +"udw" = ( +/obj/structure/sign/safety/distribution_pipes{ + pixel_x = -17 + }, /turf/open/floor/almayer{ - icon_state = "bluefull" + dir = 8; + icon_state = "green" }, -/area/almayer/command/cichallway) +/area/almayer/hallways/starboard_hallway) "udF" = ( /obj/structure/machinery/light{ dir = 1 @@ -69055,16 +68335,6 @@ icon_state = "green" }, /area/almayer/hallways/starboard_hallway) -"udG" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha) "udK" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk, @@ -69115,19 +68385,6 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/evidence_storage) -"ueG" = ( -/obj/item/bedsheet/orange, -/obj/structure/bed{ - icon_state = "psychbed" - }, -/obj/structure/machinery/cm_vending/clothing/senior_officer{ - density = 0; - pixel_y = 30; - req_access = list(); - req_access_txt = "6" - }, -/turf/open/floor/wood/ship, -/area/almayer/engineering/ce_room) "ueJ" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -69139,15 +68396,6 @@ 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{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/alpha) "ufh" = ( /obj/structure/stairs/perspective{ dir = 8; @@ -69365,13 +68613,6 @@ }, /turf/open/floor/almayer, /area/almayer/hull/upper_hull/u_f_p) -"ukV" = ( -/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) "ukW" = ( /obj/structure/machinery/door/airlock/almayer/security{ name = "\improper Security Checkpoint"; @@ -69401,6 +68642,18 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_m_s) +"ulk" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 2.5 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "uly" = ( /obj/structure/bed/stool, /turf/open/floor/almayer{ @@ -69463,6 +68716,15 @@ icon_state = "test_floor4" }, /area/almayer/hull/lower_hull/l_f_p) +"une" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/command/cic) "unh" = ( /obj/structure/surface/table/almayer, /obj/item/storage/firstaid/o2, @@ -69528,6 +68790,25 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/starboard_point_defense) +"uoD" = ( +/obj/structure/bed{ + can_buckle = 0 + }, +/obj/structure/bed{ + buckling_y = 13; + layer = 3.5; + pixel_y = 13 + }, +/obj/item/bedsheet/brown{ + layer = 3.1 + }, +/obj/item/bedsheet/brown{ + pixel_y = 13 + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/hallways/port_hallway) "uoH" = ( /obj/structure/machinery/firealarm{ dir = 1; @@ -69561,6 +68842,10 @@ icon_state = "cargo" }, /area/almayer/engineering/engine_core) +"upo" = ( +/obj/structure/machinery/status_display, +/turf/closed/wall/almayer, +/area/almayer/hallways/port_hallway) "upM" = ( /obj/structure/machinery/light{ dir = 4 @@ -69641,16 +68926,6 @@ icon_state = "green" }, /area/almayer/hallways/port_hallway) -"uqA" = ( -/obj/structure/machinery/firealarm{ - dir = 8; - pixel_x = -24 - }, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "orange" - }, -/area/almayer/squads/bravo) "uqH" = ( /obj/structure/machinery/light/small, /turf/open/floor/plating/plating_catwalk, @@ -69661,6 +68936,27 @@ }, /turf/open/floor/almayer, /area/almayer/command/lifeboat) +"uqU" = ( +/obj/structure/surface/table/almayer, +/obj/item/reagent_container/glass/beaker/cryoxadone{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/storage/box/autoinjectors{ + pixel_x = -6; + pixel_y = -1 + }, +/obj/item/storage/box/pillbottles{ + pixel_x = 6; + pixel_y = 7 + }, +/obj/item/device/mass_spectrometer{ + pixel_x = 8 + }, +/turf/open/floor/almayer{ + icon_state = "sterile_green_side" + }, +/area/almayer/medical/medical_science) "urM" = ( /obj/structure/machinery/light{ dir = 8 @@ -69670,11 +68966,6 @@ icon_state = "orangefull" }, /area/almayer/engineering/upper_engineering) -"urN" = ( -/obj/effect/landmark/start/marine/leader/charlie, -/obj/effect/landmark/late_join/charlie, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/charlie) "ush" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/cameras/almayer_network{ @@ -69756,14 +69047,6 @@ icon_state = "cargo" }, /area/almayer/engineering/upper_engineering) -"utK" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/auxiliary_officer_office) "utX" = ( /turf/closed/wall/almayer/research/containment/wall/connect_e2{ icon_state = "containment_wall_connect_e" @@ -69790,17 +69073,6 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/cryo) -"uuj" = ( -/obj/structure/surface/table/almayer, -/obj/item/trash/USCMtray{ - pixel_x = 5 - }, -/obj/item/reagent_container/food/condiment/hotsauce/cholula{ - pixel_x = -8; - pixel_y = 22 - }, -/turf/open/floor/almayer, -/area/almayer/squads/bravo) "uuq" = ( /obj/structure/bed, /obj/structure/machinery/flasher{ @@ -69889,18 +69161,6 @@ icon_state = "plate" }, /area/almayer/living/bridgebunks) -"uvu" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "orangecorner" - }, -/area/almayer/squads/bravo) "uvG" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -69995,22 +69255,6 @@ /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/wood/ship, /area/almayer/shipboard/brig/cells) -"uxp" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/light, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - icon_state = "emerald" - }, -/area/almayer/squads/charlie) "uxC" = ( /obj/structure/machinery/light{ dir = 4 @@ -70068,6 +69312,18 @@ icon_state = "dark_sterile" }, /area/almayer/medical/chemistry) +"uyT" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/effect/landmark/ert_spawns/distress_cryo, +/obj/effect/landmark/late_join, +/obj/effect/landmark/start/senior, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "silver" + }, +/area/almayer/living/cryo_cells) "uzg" = ( /obj/structure/sign/safety/water{ pixel_x = 8; @@ -70116,49 +69372,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/ce_room) -"uzP" = ( -/obj/item/bedsheet/blue{ - layer = 3.2 - }, -/obj/item/bedsheet/blue{ - pixel_y = 13 - }, -/obj/item/toy/farwadoll{ - desc = "A USCM approved plush doll. It's not soft and hardly comforting!"; - force = 15; - icon_state = "therapyred"; - layer = 4.1; - name = "Sergeant Huggs"; - pixel_y = 15; - throwforce = 15 - }, -/obj/item/clothing/head/cmcap{ - layer = 4.1; - pixel_x = -1; - pixel_y = 22 - }, -/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 - }, -/turf/open/floor/almayer{ - icon_state = "blue" - }, -/area/almayer/living/port_emb) "uzU" = ( /obj/structure/disposalpipe/segment, /obj/structure/surface/table/almayer, @@ -70195,6 +69408,15 @@ icon_state = "red" }, /area/almayer/shipboard/port_missiles) +"uAl" = ( +/obj/structure/machinery/firealarm{ + pixel_y = 28 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "uAs" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -70204,44 +69426,13 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_s) -"uAC" = ( -/obj/item/bedsheet/purple{ - layer = 3.2 - }, -/obj/item/bedsheet/purple{ - pixel_y = 13 - }, -/obj/structure/window/reinforced{ +"uAD" = ( +/obj/structure/disposalpipe/junction{ 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 - }, -/turf/open/floor/almayer{ - icon_state = "emerald" - }, -/area/almayer/living/port_emb) -"uAW" = ( -/obj/structure/machinery/cryopod{ - layer = 3.1; - pixel_y = 13 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" + icon_state = "pipe-j2" }, -/area/almayer/squads/bravo) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/alpha) "uBi" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer, @@ -70282,17 +69473,6 @@ }, /turf/open/floor/almayer, /area/almayer/living/briefing) -"uBO" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/toolbox/mechanical{ - pixel_x = 1; - pixel_y = 7 - }, -/obj/item/storage/toolbox/emergency{ - pixel_x = -3 - }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) "uCh" = ( /obj/structure/reagent_dispensers/watertank, /obj/structure/sign/safety/water{ @@ -70313,24 +69493,13 @@ icon_state = "sterile_green_side" }, /area/almayer/shipboard/brig/surgery) -"uCM" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/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/door/firedoor/border_only/almayer{ - dir = 2 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +"uCT" = ( +/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep, +/obj/structure/machinery/light{ + dir = 8 }, -/area/almayer/squads/charlie) +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "uCW" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 @@ -70338,6 +69507,15 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, /area/almayer/command/cichallway) +"uDg" = ( +/obj/structure/pipes/standard/manifold/hidden/supply, +/obj/structure/platform_decoration{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "uDn" = ( /obj/structure/ladder{ height = 1; @@ -70354,6 +69532,15 @@ icon_state = "red" }, /area/almayer/shipboard/brig/perma) +"uDv" = ( +/obj/structure/surface/rack, +/obj/item/tool/weldpack, +/obj/item/clothing/glasses/welding, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/port_hallway) "uDA" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -70371,27 +69558,59 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_s) -"uDW" = ( -/obj/structure/machinery/cm_vending/clothing/tl/delta{ - density = 0; - pixel_x = 32 - }, -/turf/open/floor/almayer{ - icon_state = "blue" - }, -/area/almayer/squads/delta) "uEc" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer{ icon_state = "test_floor4" }, /area/almayer/engineering/engine_core) +"uEr" = ( +/obj/structure/surface/table/almayer, +/obj/item/tool/stamp/denied{ + pixel_x = 2; + pixel_y = 10 + }, +/obj/item/device/eftpos{ + eftpos_name = "Cargo Bay EFTPOS scanner"; + pixel_x = -10 + }, +/obj/item/tool/stamp/ro{ + pixel_x = -8; + pixel_y = 10 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/item/storage/fancy/cigar{ + pixel_x = 6 + }, +/obj/item/ashtray/glass{ + pixel_x = 11; + pixel_y = 9 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/req) +"uEt" = ( +/obj/structure/machinery/power/apc/almayer, +/obj/structure/surface/table/almayer, +/obj/item/tool/hand_labeler, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "red" + }, +/area/almayer/squads/alpha) "uEv" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, /turf/open/floor/almayer, /area/almayer/hull/upper_hull/u_f_p) +"uEM" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "plating_striped" + }, +/area/almayer/hallways/port_hallway) "uFd" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -70405,6 +69624,13 @@ icon_state = "plate" }, /area/almayer/living/offices) +"uFj" = ( +/obj/structure/machinery/computer/ordercomp, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/port_hallway) "uFo" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/door/window/eastright{ @@ -70512,6 +69738,25 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering/starboard) +"uGR" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "silver" + }, +/area/almayer/living/port_emb) +"uHM" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/squads/alpha) "uId" = ( /obj/structure/bed/chair/comfy/teal{ dir = 8 @@ -70520,43 +69765,24 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south1) -"uIp" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/machinery/light{ - dir = 4 - }, -/obj/structure/sign/safety/maint{ - pixel_x = -17 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/lower_hull) "uIv" = ( /turf/open/floor/almayer{ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) +"uIz" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + layer = 2.5 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "uII" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) -"uIJ" = ( -/obj/structure/bed/chair{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "red" - }, -/area/almayer/squads/alpha) -"uIT" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/alpha_bravo_shared) "uJk" = ( /obj/structure/prop/almayer/name_stencil{ icon_state = "almayer4" @@ -70595,6 +69821,15 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/main_office) +"uJx" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/bed/chair/comfy/alpha{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/living/briefing) "uJU" = ( /obj/structure/machinery/cryopod/right{ pixel_y = 6 @@ -70641,16 +69876,18 @@ }, /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_f_p) -"uKv" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/device/multitool{ - desc = "A large handheld tool used to override various machine functions. Primarily used to pulse Airlock and APC wires on a shortwave frequency. It contains a small data buffer as well. This one is comically oversized. Made in Texas."; - icon_state = "multitool_big"; - name = "\improper Oversized Security Access Tuner"; - pixel_y = 8 +"uKu" = ( +/obj/structure/machinery/light{ + dir = 4; + invisibility = 101; + unacidable = 1; + unslashable = 1 }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) +/turf/open/floor/almayer{ + dir = 8; + icon_state = "plating_striped" + }, +/area/almayer/hull/lower_hull/l_a_s) "uKA" = ( /obj/effect/step_trigger/clone_cleaner, /obj/structure/machinery/light{ @@ -70658,6 +69895,37 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/starboard_hallway) +"uKM" = ( +/obj/structure/bed/chair{ + dir = 8; + pixel_y = 3 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 + }, +/obj/structure/disposalpipe/junction{ + dir = 1; + icon_state = "pipe-j2" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "blue" + }, +/area/almayer/squads/delta) +"uKO" = ( +/obj/structure/surface/table/almayer, +/obj/item/trash/USCMtray{ + pixel_x = 6; + pixel_y = 4 + }, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/living/briefing) "uKV" = ( /obj/structure/sign/safety/storage{ pixel_x = 32; @@ -70735,24 +70003,6 @@ icon_state = "bluefull" }, /area/almayer/living/briefing) -"uMl" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/squads/alpha) -"uMn" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "emerald" - }, -/area/almayer/living/port_emb) "uMS" = ( /turf/open/floor/almayer{ dir = 5; @@ -70793,15 +70043,15 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_f_p) +"uNK" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "silvercorner" + }, +/area/almayer/hallways/port_hallway) "uNL" = ( /turf/closed/wall/almayer, /area/almayer/hull/lower_hull/l_f_s) -"uNM" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "emeraldcorner" - }, -/area/almayer/living/briefing) "uNN" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -70888,13 +70138,6 @@ allow_construction = 0 }, /area/almayer/hallways/port_hallway) -"uRo" = ( -/obj/structure/surface/table/almayer, -/obj/item/trash/USCMtray{ - pixel_y = 7 - }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha) "uRr" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -70964,6 +70207,14 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_s) +"uRY" = ( +/obj/item/paper_bin/uscm{ + pixel_y = 4 + }, +/obj/structure/surface/table/reinforced/black, +/obj/item/device/whistle, +/turf/open/floor/almayer, +/area/almayer/command/cic) "uSq" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -70993,14 +70244,17 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lockerroom) -"uTv" = ( -/obj/structure/surface/table/almayer, -/obj/item/trash/USCMtray{ - pixel_x = 6; - pixel_y = 4 +"uTM" = ( +/obj/structure/machinery/light{ + dir = 8 }, -/turf/open/floor/almayer, -/area/almayer/squads/bravo) +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + icon_state = "silver" + }, +/area/almayer/living/bridgebunks) "uTN" = ( /obj/effect/landmark/start/liaison, /turf/open/floor/plating/plating_catwalk, @@ -71053,19 +70307,6 @@ }, /turf/open/floor/almayer, /area/almayer/living/gym) -"uUo" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/sign/safety/hvac_old{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "emerald" - }, -/area/almayer/squads/charlie) "uUs" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -71148,16 +70389,6 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) -"uVD" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 8; - name = "ship-grade camera" - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "plating_striped" - }, -/area/almayer/living/cryo_cells) "uVF" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -71186,12 +70417,6 @@ icon_state = "sterile" }, /area/almayer/living/pilotbunks) -"uWc" = ( -/obj/structure/surface/table/almayer, -/turf/open/floor/almayer{ - icon_state = "emeraldfull" - }, -/area/almayer/living/briefing) "uWC" = ( /obj/structure/sign/safety/maint{ pixel_x = -17 @@ -71223,21 +70448,6 @@ }, /turf/open/floor/almayer, /area/almayer/engineering/upper_engineering/port) -"uWY" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/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{ - icon_state = "plate" - }, -/area/almayer/squads/alpha) "uXf" = ( /obj/structure/machinery/door/airlock/almayer/medical/glass{ dir = 1; @@ -71262,13 +70472,10 @@ }, /area/almayer/medical/containment/cell) "uXL" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/structure/machinery/power/smes/buildable, -/turf/open/floor/almayer{ - icon_state = "tcomms" +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 }, +/turf/open/floor/almayer, /area/almayer/engineering/upper_engineering/starboard) "uYa" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ @@ -71289,16 +70496,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/starboard_hallway) -"uZo" = ( -/obj/structure/bed/stool, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "emerald" - }, -/area/almayer/living/port_emb) "uZH" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -71312,6 +70509,14 @@ /obj/structure/window/framed/almayer, /turf/open/floor/plating, /area/almayer/hallways/repair_bay) +"uZS" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "bluecorner" + }, +/area/almayer/squads/delta) "uZY" = ( /obj/structure/closet/secure_closet/guncabinet/riot_control, /obj/item/weapon/shield/riot, @@ -71343,6 +70548,12 @@ }, /turf/closed/wall/almayer, /area/almayer/hallways/starboard_umbilical) +"vas" = ( +/obj/structure/surface/table/almayer, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/hull/lower_hull/l_a_s) "vbf" = ( /obj/structure/machinery/landinglight/ds2/delaytwo{ dir = 8 @@ -71357,21 +70568,6 @@ "vbB" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south1) -"vbM" = ( -/obj/structure/flora/pottedplant{ - desc = "It is made of Fiberbush(tm). It contains asbestos."; - icon_state = "pottedplant_22"; - name = "synthetic potted plant"; - pixel_y = 8 - }, -/obj/structure/machinery/alarm/almayer{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "orange" - }, -/area/almayer/squads/bravo) "vbR" = ( /obj/structure/window/framed/almayer, /turf/open/floor/almayer{ @@ -71437,6 +70633,15 @@ icon_state = "red" }, /area/almayer/shipboard/brig/general_equipment) +"vcI" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/turf/open/floor/almayer, +/area/almayer/living/cryo_cells) "vdJ" = ( /obj/structure/surface/table/almayer, /obj/item/pipe{ @@ -71502,22 +70707,21 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/port_hallway) +"vem" = ( +/obj/structure/extinguisher_cabinet{ + pixel_x = 26 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "cargo_arrow" + }, +/area/almayer/hallways/port_hallway) "ven" = ( /obj/structure/bed/chair, /turf/open/floor/almayer{ icon_state = "green" }, /area/almayer/living/grunt_rnr) -"veu" = ( -/obj/structure/surface/table/almayer, -/obj/item/trash/USCMtray{ - pixel_x = 6; - pixel_y = 4 - }, -/turf/open/floor/almayer{ - icon_state = "emeraldfull" - }, -/area/almayer/living/briefing) "vez" = ( /obj/structure/surface/table/almayer, /obj/item/device/camera, @@ -71536,18 +70740,6 @@ }, /turf/open/floor/almayer, /area/almayer/living/port_emb) -"vfa" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer{ - dir = 6; - icon_state = "emerald" - }, -/area/almayer/squads/charlie) "vfo" = ( /obj/structure/machinery/door/airlock/almayer/secure/reinforced{ dir = 2; @@ -71570,22 +70762,6 @@ icon_state = "redcorner" }, /area/almayer/shipboard/brig/execution) -"vfx" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orange" - }, -/area/almayer/squads/bravo) "vfB" = ( /turf/open/floor/almayer/no_build{ dir = 4 @@ -71628,27 +70804,6 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/hydroponics) -"vgB" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/box/autoinjectors{ - pixel_x = -6; - pixel_y = -1 - }, -/obj/item/device/mass_spectrometer{ - pixel_x = 8 - }, -/obj/item/storage/box/pillbottles{ - pixel_x = -6; - pixel_y = 9 - }, -/obj/item/reagent_container/glass/beaker/cryoxadone{ - pixel_x = 8; - pixel_y = 10 - }, -/turf/open/floor/almayer{ - icon_state = "sterile_green_side" - }, -/area/almayer/medical/medical_science) "vgC" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -71741,18 +70896,6 @@ /obj/structure/closet/firecloset, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_p) -"vhR" = ( -/obj/structure/flora/pottedplant{ - desc = "It is made of Fiberbush(tm). It contains asbestos."; - icon_state = "pottedplant_22"; - name = "synthetic potted plant"; - pixel_y = 8 - }, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "emerald" - }, -/area/almayer/squads/charlie) "vhX" = ( /obj/structure/window/framed/almayer/white, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -71786,24 +70929,6 @@ icon_state = "plate" }, /area/almayer/medical/morgue) -"vil" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) "vim" = ( /obj/structure/sign/safety/water{ pixel_x = 8; @@ -71854,13 +70979,18 @@ dir = 5 }, /area/almayer/living/briefing) -"viS" = ( -/obj/effect/landmark/start/marine/engineer/bravo, -/obj/effect/landmark/late_join/bravo, +"viU" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad{ + req_access = null; + req_one_access = null; + req_one_access_txt = "15;16;21"; + vend_x_offset = 0; + vend_y_offset = 0 + }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/squads/bravo) +/area/almayer/living/cryo_cells) "vjb" = ( /obj/structure/sign/safety/restrictedarea{ pixel_x = -17 @@ -72000,16 +71130,10 @@ icon_state = "redfull" }, /area/almayer/shipboard/port_missiles) -"vlX" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha_bravo_shared) -"vme" = ( -/obj/structure/bed/chair, +"vlN" = ( +/obj/structure/machinery/vending/cigarette, /turf/open/floor/almayer{ - dir = 1; + dir = 4; icon_state = "red" }, /area/almayer/squads/alpha) @@ -72022,6 +71146,31 @@ icon_state = "cargo" }, /area/almayer/hallways/hangar) +"vmu" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 + }, +/obj/item/clipboard{ + base_pixel_x = 20; + pixel_x = 5 + }, +/obj/item/paper{ + pixel_x = 5 + }, +/obj/item/tool/pen/blue{ + pixel_x = 5 + }, +/obj/structure/surface/table/reinforced/black, +/obj/structure/transmitter/rotary{ + name = "CIC Reception Telephone"; + phone_category = "Command"; + phone_id = "CIC Reception"; + pixel_x = -7; + pixel_y = 4 + }, +/turf/open/floor/almayer, +/area/almayer/command/cic) "vmK" = ( /obj/structure/prop/invuln/overhead_pipe{ pixel_x = 12 @@ -72044,6 +71193,28 @@ icon_state = "red" }, /area/almayer/shipboard/port_missiles) +"vnb" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "redcorner" + }, +/area/almayer/squads/alpha) +"vnf" = ( +/obj/structure/machinery/disposal, +/obj/structure/machinery/power/apc/almayer{ + dir = 1; + pixel_y = 25 + }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/living/cryo_cells) "vnD" = ( /obj/structure/barricade/handrail{ dir = 1; @@ -72059,6 +71230,26 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_p) +"vob" = ( +/obj/structure/machinery/door_control{ + id = "laddernortheast"; + name = "North East Ladders Shutters"; + pixel_x = 25; + req_one_access_txt = "2;3;12;19"; + throw_range = 15 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "green" + }, +/area/almayer/hallways/starboard_hallway) +"vop" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/donut_box, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/cryo_cells) "vot" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -72100,22 +71291,63 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) +"vpq" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 2 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "vpI" = ( /obj/effect/landmark/start/police, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cryo) -"vpV" = ( -/turf/open/floor/almayer{ - dir = 10; - icon_state = "emerald" +"vpJ" = ( +/obj/effect/projector{ + name = "Almayer_AresDown"; + vector_x = 97; + vector_y = -65 }, -/area/almayer/command/cic) +/obj/structure/platform{ + dir = 4 + }, +/obj/structure/stairs{ + dir = 1; + icon_state = "ramptop" + }, +/obj/structure/machinery/door_control{ + id = "ARES StairsUpper"; + name = "ARES Core Access"; + pixel_x = 24; + req_one_access_txt = "90;91;92" + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) "vpW" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/hallways/hangar) +"vqg" = ( +/obj/structure/machinery/cryopod/right{ + layer = 3.1; + pixel_y = 13 + }, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/squads/alpha) "vqC" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -72190,9 +71422,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/medical_science) -"vra" = ( -/turf/closed/wall/almayer, -/area/almayer/squads/charlie_delta_shared) "vrx" = ( /obj/structure/machinery/status_display{ pixel_x = -32; @@ -72200,6 +71429,21 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) +"vrG" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/window/reinforced/toughened{ + dir = 8 + }, +/obj/structure/machinery/computer/shuttle/dropship/flight/remote_control{ + dir = 4; + name = "Normandy Remote Control Console"; + shuttleId = "dropship_normandy" + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/command/cic) "vrI" = ( /obj/structure/machinery/cryopod{ layer = 3.1; @@ -72248,6 +71492,12 @@ icon_state = "bluecorner" }, /area/almayer/living/briefing) +"vsd" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/port_hallway) "vse" = ( /obj/structure/machinery/cryopod/right{ pixel_y = 6 @@ -72318,6 +71568,16 @@ icon_state = "silver" }, /area/almayer/command/cichallway) +"vth" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/structure/surface/table/almayer, +/obj/item/device/binoculars/range, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha) "vti" = ( /turf/open/floor/almayer{ icon_state = "mono" @@ -72335,6 +71595,17 @@ icon_state = "dark_sterile" }, /area/almayer/medical/medical_science) +"vtq" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_ammo/squad{ + req_access = null; + req_one_access = null; + req_one_access_txt = "15;16;21"; + vend_x_offset = 0 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/cryo_cells) "vtr" = ( /obj/structure/machinery/mech_bay_recharge_port, /turf/open/shuttle/dropship{ @@ -72365,6 +71636,12 @@ /obj/effect/landmark/late_join/alpha, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/alpha) +"vup" = ( +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/port_hallway) "vuv" = ( /turf/closed/wall/almayer, /area/almayer/hull/upper_hull/u_a_p) @@ -72382,21 +71659,23 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north2) -"vuL" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, +"vuK" = ( /obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" + dir = 4 }, +/obj/structure/machinery/camera/autoname/almayer, /turf/open/floor/almayer{ - icon_state = "blue" + dir = 1; + icon_state = "silver" }, -/area/almayer/squads/delta) +/area/almayer/hallways/port_hallway) "vuR" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_a_p) +"vuY" = ( +/obj/structure/machinery/computer/ordercomp, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "vuZ" = ( /obj/structure/pipes/vents/scrubber{ dir = 4 @@ -72406,6 +71685,19 @@ icon_state = "redcorner" }, /area/almayer/shipboard/weapon_room) +"vvo" = ( +/obj/structure/surface/table/almayer, +/obj/item/trash/USCMtray{ + pixel_x = 6; + pixel_y = 4 + }, +/obj/item/reagent_container/food/condiment/hotsauce/cholula{ + pixel_y = 20 + }, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/living/briefing) "vvp" = ( /obj/structure/pipes/vents/pump, /obj/structure/sign/safety/intercom{ @@ -72436,6 +71728,47 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering/starboard) +"vvV" = ( +/obj/structure/machinery/camera/autoname/almayer{ + dir = 1; + name = "ship-grade camera" + }, +/obj/structure/sign/safety/hazard{ + pixel_x = 15; + pixel_y = -32 + }, +/obj/structure/sign/safety/ammunition{ + pixel_y = -32 + }, +/obj/structure/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha) +"vwg" = ( +/obj/structure/machinery/camera/autoname/almayer/containment/ares{ + dir = 1 + }, +/obj/structure/machinery/computer/working_joe{ + dir = 8; + pixel_x = 29 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) +"vwt" = ( +/obj/structure/machinery/cm_vending/sorted/tech/comp_storage{ + req_one_access_txt = "7;23;27" + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/port_hallway) "vwF" = ( /obj/structure/machinery/light{ dir = 1 @@ -72509,6 +71842,15 @@ /obj/structure/machinery/light, /turf/open/floor/almayer, /area/almayer/hallways/hangar) +"vxd" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) "vxC" = ( /turf/open/floor/almayer{ icon_state = "red" @@ -72517,26 +71859,6 @@ "vxM" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/brig/cryo) -"vxX" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/tool/wrench{ - pixel_x = 1; - pixel_y = 10 - }, -/obj/item/storage/bible{ - pixel_x = 7; - pixel_y = 4 - }, -/obj/item/storage/bible{ - pixel_x = 7; - pixel_y = 7 - }, -/obj/item/reagent_container/food/drinks/cans/souto/diet/grape{ - pixel_x = -6; - pixel_y = 4 - }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) "vyg" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/secure_data, @@ -72556,6 +71878,18 @@ }, /turf/open/floor/plating, /area/almayer/shipboard/brig/processing) +"vyo" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "cargo_arrow" + }, +/area/almayer/squads/delta) "vyp" = ( /obj/structure/machinery/cryopod{ pixel_y = 6 @@ -72633,15 +71967,6 @@ icon_state = "plate" }, /area/almayer/living/grunt_rnr) -"vAq" = ( -/obj/structure/bed/chair{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orange" - }, -/area/almayer/hallways/hangar) "vAE" = ( /obj/structure/machinery/cryopod/right{ layer = 3.1; @@ -72691,6 +72016,20 @@ icon_state = "silver" }, /area/almayer/living/briefing) +"vBv" = ( +/obj/structure/machinery/cm_vending/gear/smartgun{ + pixel_y = 32; + density = 0 + }, +/obj/structure/machinery/cm_vending/clothing/smartgun/alpha{ + density = 0; + pixel_x = 31 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "red" + }, +/area/almayer/squads/alpha) "vBJ" = ( /obj/structure/surface/table/almayer, /obj/item/tool/pen, @@ -72779,6 +72118,36 @@ /obj/item/weapon/dart/green, /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_f_p) +"vDZ" = ( +/obj/structure/bed{ + can_buckle = 0 + }, +/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{ + buckling_y = 13; + layer = 3.5; + pixel_y = 13 + }, +/obj/item/bedsheet/blue{ + layer = 3.2 + }, +/obj/item/bedsheet/blue{ + pixel_y = 13 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/living/port_emb) "vEf" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -72836,6 +72205,17 @@ icon_state = "test_floor4" }, /area/almayer/medical/lower_medical_medbay) +"vEJ" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper Mech Ops's Room" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "vFb" = ( /obj/item/tool/crowbar, /turf/open/floor/almayer, @@ -72870,13 +72250,14 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_m_p) "vGr" = ( -/obj/structure/closet/firecloset, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, +/obj/structure/machinery/light/small{ + dir = 8 + }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 9; + icon_state = "orange" }, -/area/almayer/hull/upper_hull/u_a_p) +/area/almayer/engineering/upper_engineering/port) "vGy" = ( /obj/structure/largecrate/supply/supplies/tables_racks, /turf/open/floor/plating, @@ -72888,12 +72269,12 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) -"vGG" = ( -/obj/structure/bed/chair/comfy/bravo, -/turf/open/floor/almayer{ - icon_state = "orangefull" +"vGB" = ( +/mob/living/simple_animal/cow{ + name = "Mumunya" }, -/area/almayer/living/briefing) +/turf/open/floor/almayer, +/area/almayer/living/grunt_rnr) "vHa" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/computer/ares_console{ @@ -72916,6 +72297,12 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, /area/almayer/living/port_emb) +"vHk" = ( +/obj/structure/machinery/cryopod/right, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/hallways/port_hallway) "vHO" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -73030,20 +72417,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_s) -"vJV" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/firealarm{ - pixel_y = -29 - }, -/turf/open/floor/almayer{ - icon_state = "orange" - }, -/area/almayer/squads/bravo) "vJZ" = ( /obj/structure/desertdam/decals/road_edge{ pixel_x = -12 @@ -73099,6 +72472,19 @@ allow_construction = 0 }, /area/almayer/hallways/aft_hallway) +"vKI" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/alpha) "vLh" = ( /obj/item/roller, /obj/structure/surface/rack, @@ -73122,20 +72508,6 @@ icon_state = "test_floor4" }, /area/almayer/medical/upper_medical) -"vLA" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "cargo_arrow" - }, -/area/almayer/squads/charlie) "vMn" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -73191,13 +72563,6 @@ icon_state = "silver" }, /area/almayer/command/cichallway) -"vND" = ( -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 - }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie) "vNF" = ( /obj/structure/reagent_dispensers/fueltank/custom, /turf/open/floor/almayer{ @@ -73287,17 +72652,6 @@ }, /turf/open/floor/plating/almayer, /area/almayer/living/briefing) -"vPK" = ( -/obj/structure/machinery/cryopod{ - pixel_y = 6 - }, -/obj/structure/sign/safety/maint{ - pixel_y = -26 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/squads/delta) "vPM" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -73338,6 +72692,12 @@ /obj/item/device/camera, /turf/open/floor/almayer, /area/almayer/command/computerlab) +"vQs" = ( +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "blue" + }, +/area/almayer/squads/delta) "vQN" = ( /obj/structure/machinery/door/airlock/almayer/generic{ dir = 1 @@ -73490,16 +72850,6 @@ icon_state = "cargo" }, /area/almayer/squads/delta) -"vTu" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22"; - pixel_y = 8 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "silver" - }, -/area/almayer/command/cic) "vTv" = ( /obj/structure/surface/table/almayer, /obj/item/circuitboard/airlock, @@ -73525,21 +72875,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/cryo_cells) -"vUb" = ( -/obj/effect/landmark/start/marine/alpha, -/obj/effect/landmark/late_join/alpha, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha) -"vUe" = ( -/obj/structure/bed/chair/comfy/charlie{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "emeraldfull" - }, -/area/almayer/living/briefing) "vUh" = ( /obj/structure/machinery/light, /turf/open/floor/almayer, @@ -73566,42 +72901,18 @@ icon_state = "plate" }, /area/almayer/shipboard/brig/main_office) -"vUU" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 8; - name = "ship-grade camera" - }, -/obj/structure/sign/safety/three{ - pixel_x = 31; - pixel_y = -8 - }, -/obj/structure/sign/safety/ammunition{ - pixel_x = 32; - pixel_y = 7 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "emerald" - }, -/area/almayer/hallways/port_hallway) -"vVb" = ( -/obj/structure/machinery/cm_vending/gear/tl{ - density = 0; - pixel_x = -32; - vend_x_offset = 1 - }, -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "red" - }, -/area/almayer/squads/alpha) "vVd" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/briefing) +"vVn" = ( +/obj/structure/surface/rack, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_m_s) "vVs" = ( /turf/open/floor/almayer{ icon_state = "sterile_green" @@ -73612,6 +72923,20 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering/port) +"vVx" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "mechdoor"; + name = "Vehicle Bay One"; + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "vVW" = ( /obj/effect/decal/medical_decals{ icon_state = "triagedecaltopright" @@ -73684,31 +73009,6 @@ /obj/item/prop/magazine/book/theartofwar, /turf/open/floor/almayer, /area/almayer/living/bridgebunks) -"vWB" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/ashtray/plastic, -/obj/item/trash/cigbutt/bcigbutt, -/obj/item/trash/cigbutt{ - pixel_x = -1; - pixel_y = 17 - }, -/obj/item/trash/cigbutt{ - icon_state = "ucigbutt"; - pixel_x = 2; - pixel_y = 8 - }, -/obj/item/tool/lighter/random{ - pixel_x = -8; - pixel_y = 7 - }, -/obj/structure/sign/prop3{ - pixel_x = 28 - }, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) "vWJ" = ( /obj/structure/machinery/landinglight/ds1/delaytwo{ dir = 4 @@ -73738,19 +73038,11 @@ }, /turf/open/floor/plating, /area/almayer/engineering/upper_engineering/port) -"vXh" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/structure/machinery/computer/working_joe{ - dir = 4; - pixel_x = -17 - }, -/turf/open/floor/almayer/no_build{ - icon_state = "ai_floors" +"vXm" = ( +/turf/open/floor/almayer{ + icon_state = "cargo_arrow" }, -/area/almayer/command/airoom) +/area/almayer/hallways/port_hallway) "vXQ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 1 @@ -73843,18 +73135,12 @@ icon_state = "plate" }, /area/almayer/command/cichallway) -"vZb" = ( -/obj/structure/machinery/cryopod{ - pixel_y = 6 - }, -/obj/structure/sign/safety/maint{ - pixel_x = 16; - pixel_y = 26 - }, +"vYT" = ( +/obj/structure/machinery/cm_vending/sorted/tech/comtech_tools, /turf/open/floor/almayer{ icon_state = "cargo" }, -/area/almayer/squads/alpha) +/area/almayer/hallways/port_hallway) "vZv" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/almayer, @@ -73862,6 +73148,13 @@ "vZw" = ( /turf/open/floor/almayer/research/containment/floor2, /area/almayer/medical/containment/cell/cl) +"vZx" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/item/tool/wirecutters, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "vZA" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/sign/safety/hvac_old{ @@ -73871,6 +73164,12 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull) +"vZM" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, +/turf/open/floor/almayer, +/area/almayer/living/tankerbunks) "wan" = ( /obj/structure/surface/table/almayer, /obj/item/facepaint/brown, @@ -73899,15 +73198,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/aft_hallway) -"wbh" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orange" - }, -/area/almayer/hallways/starboard_hallway) "wbj" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -73990,6 +73280,15 @@ icon_state = "silver" }, /area/almayer/command/cic) +"wbZ" = ( +/obj/structure/sign/poster{ + pixel_y = 32 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/squads/alpha) "wcn" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_s) @@ -74025,12 +73324,6 @@ allow_construction = 0 }, /area/almayer/hallways/starboard_hallway) -"wdf" = ( -/obj/structure/bed/chair{ - dir = 1 - }, -/turf/open/floor/almayer, -/area/almayer/living/auxiliary_officer_office) "wdo" = ( /obj/structure/machinery/door/airlock/almayer/research/reinforced{ dir = 8; @@ -74055,11 +73348,6 @@ icon_state = "red" }, /area/almayer/shipboard/brig/main_office) -"wdz" = ( -/obj/effect/landmark/start/marine/engineer/charlie, -/obj/effect/landmark/late_join/charlie, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/charlie) "wdF" = ( /turf/open/floor/almayer{ allow_construction = 0 @@ -74144,6 +73432,15 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_m_p) +"wfg" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "blue" + }, +/area/almayer/squads/delta) "wft" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -74250,6 +73547,30 @@ }, /turf/open/floor/almayer, /area/almayer/living/port_emb) +"wht" = ( +/obj/structure/surface/table/almayer, +/obj/item/reagent_container/food/drinks/bottle/orangejuice{ + layer = 3.1; + pixel_x = -12; + pixel_y = 14 + }, +/obj/item/toy/deck/uno{ + layer = 3.1; + pixel_x = -3; + pixel_y = -1 + }, +/obj/item/toy/handcard/uno_reverse_yellow{ + pixel_x = 6; + pixel_y = 5 + }, +/obj/item/spacecash/c10{ + pixel_x = 5; + pixel_y = 10 + }, +/turf/open/floor/almayer{ + icon_state = "blue" + }, +/area/almayer/living/port_emb) "whA" = ( /turf/open/floor/almayer/uscm/directional, /area/almayer/living/briefing) @@ -74376,15 +73697,6 @@ icon_state = "plate" }, /area/almayer/shipboard/port_point_defense) -"wka" = ( -/obj/structure/surface/table/almayer, -/obj/item/reagent_container/food/condiment/hotsauce/sriracha{ - pixel_x = 4 - }, -/turf/open/floor/almayer{ - icon_state = "emeraldfull" - }, -/area/almayer/living/briefing) "wkc" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/door/window/eastright{ @@ -74399,6 +73711,13 @@ icon_state = "sterile_green" }, /area/almayer/medical/lockerroom) +"wkj" = ( +/obj/structure/bed/stool, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "silver" + }, +/area/almayer/living/port_emb) "wky" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -74410,18 +73729,6 @@ icon_state = "test_floor4" }, /area/almayer/medical/medical_science) -"wkH" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/device/whistle{ - pixel_y = 4 - }, -/obj/structure/machinery/status_display{ - pixel_y = 30 - }, -/turf/open/floor/almayer{ - icon_state = "bluefull" - }, -/area/almayer/command/cichallway) "wkM" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ id = "ARES StairsLower"; @@ -74446,6 +73753,20 @@ icon_state = "test_floor4" }, /area/almayer/command/airoom) +"wkT" = ( +/obj/structure/machinery/cm_vending/clothing/leader/delta{ + density = 0; + pixel_y = -31 + }, +/obj/structure/machinery/cm_vending/gear/leader{ + density = 0; + pixel_x = 31 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "blue" + }, +/area/almayer/squads/delta) "wkX" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -74454,6 +73775,13 @@ icon_state = "mono" }, /area/almayer/engineering/upper_engineering/starboard) +"wkY" = ( +/obj/item/clipboard, +/obj/item/tool/pen/blue, +/obj/structure/surface/table/reinforced/black, +/obj/effect/landmark/map_item, +/turf/open/floor/almayer, +/area/almayer/command/cic) "wlb" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -74540,6 +73868,13 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_p) +"wlS" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep/training, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "plating_striped" + }, +/area/almayer/hull/lower_hull/l_a_s) "wmg" = ( /obj/structure/machinery/power/apc/almayer{ dir = 1 @@ -74603,14 +73938,6 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) -"wnY" = ( -/obj/item/tool/crowbar/red, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) "woh" = ( /turf/closed/wall/almayer/research/containment/wall/corner{ dir = 4 @@ -74626,18 +73953,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/starboard_hallway) -"wos" = ( -/obj/structure/machinery/cm_vending/sorted/marine_food{ - density = 0; - pixel_y = 16 - }, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) "woy" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -74649,6 +73964,10 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) +"woC" = ( +/obj/effect/landmark/start/mech_crew, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/port_hallway) "woG" = ( /obj/structure/machinery/light/small, /turf/open/floor/plating/plating_catwalk, @@ -74665,18 +73984,6 @@ icon_state = "rasputin3" }, /area/almayer/powered/agent) -"wpw" = ( -/obj/structure/bed/chair/comfy/ares{ - dir = 1 - }, -/obj/structure/pipes/vents/pump/no_boom{ - name = "Security Vent"; - desc = "Has a valve and pump attached to it, connected to multiple gas tanks." - }, -/turf/open/floor/almayer/no_build{ - icon_state = "plating" - }, -/area/almayer/command/airoom) "wpz" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -74694,15 +74001,6 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) -"wqc" = ( -/obj/structure/sign/poster{ - pixel_y = 32 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "emerald" - }, -/area/almayer/squads/charlie) "wqh" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -74712,6 +74010,12 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) +"wqk" = ( +/obj/structure/bed/chair{ + dir = 1 + }, +/turf/open/floor/almayer, +/area/almayer/squads/alpha) "wqq" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -74766,6 +74070,25 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/upper_medical) +"wrf" = ( +/obj/structure/reagent_dispensers/water_cooler/stacks{ + density = 0; + pixel_y = 16 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) +"wrn" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) "wrC" = ( /obj/structure/sign/safety/distribution_pipes{ pixel_x = -17 @@ -74803,12 +74126,16 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cic_hallway) -"wsR" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, +"wsV" = ( +/obj/structure/extinguisher_cabinet{ + pixel_x = 26 + }, +/obj/structure/machinery/vending/cola, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 6; + icon_state = "red" }, -/area/almayer/squads/bravo) +/area/almayer/squads/alpha) "wta" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -74826,15 +74153,6 @@ }, /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_f_p) -"wty" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "cargo_arrow" - }, -/area/almayer/squads/delta) "wtM" = ( /obj/structure/machinery/light{ unacidable = 1; @@ -74876,18 +74194,6 @@ /obj/structure/supply_drop/echo, /turf/open/floor/almayer, /area/almayer/squads/req) -"wuq" = ( -/obj/structure/machinery/cryopod/right{ - layer = 3.1; - pixel_y = 13 - }, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/squads/bravo) "wuH" = ( /obj/structure/closet/crate/freezer, /obj/item/reagent_container/food/snacks/sliceable/pizza/vegetablepizza, @@ -74954,15 +74260,6 @@ icon_state = "cargo" }, /area/almayer/living/synthcloset) -"wwr" = ( -/obj/structure/machinery/cryopod{ - layer = 3.1; - pixel_y = 13 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/squads/charlie) "wwD" = ( /obj/structure/bed/chair/comfy/orange, /turf/open/floor/almayer{ @@ -75003,9 +74300,14 @@ /obj/structure/machinery/light{ dir = 4 }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/structure/surface/rack, +/obj/item/clothing/ears/earmuffs, +/obj/item/clothing/ears/earmuffs, /turf/open/floor/almayer{ - dir = 5; - icon_state = "orange" + icon_state = "plate" }, /area/almayer/engineering/upper_engineering/starboard) "wxq" = ( @@ -75052,30 +74354,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_s) -"wyt" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/microwave{ - pixel_x = -2; - pixel_y = 7 - }, -/turf/open/floor/almayer{ - icon_state = "bluefull" - }, -/area/almayer/command/cichallway) -"wyv" = ( -/obj/structure/machinery/door_control{ - id = "ARES JoeCryo"; - name = "Working Joe Cryogenics Lockdown"; - pixel_x = -24; - pixel_y = -8; - req_one_access_txt = "91;92" - }, -/obj/effect/landmark/late_join/working_joe, -/obj/effect/landmark/start/working_joe, -/turf/open/floor/almayer/no_build{ - icon_state = "ai_floors" - }, -/area/almayer/command/airoom) "wyK" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -75093,6 +74371,14 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_s) +"wyP" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep{ + req_one_access = list() + }, +/turf/open/floor/almayer{ + icon_state = "cargo_arrow" + }, +/area/almayer/squads/alpha) "wyQ" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/door_control{ @@ -75105,14 +74391,6 @@ icon_state = "plating" }, /area/almayer/command/airoom) -"wzg" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/lower_hull/l_a_s) "wzx" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -75133,6 +74411,13 @@ icon_state = "sterile_green" }, /area/almayer/medical/lower_medical_medbay) +"wAJ" = ( +/obj/structure/surface/rack, +/obj/effect/spawner/random/gun/smg/lowchance, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/squads/req) "wAR" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -75144,6 +74429,13 @@ icon_state = "green" }, /area/almayer/hallways/port_hallway) +"wBT" = ( +/obj/structure/surface/rack, +/obj/effect/spawner/random/gun/shotgun/lowchance, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/squads/req) "wBY" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/almayer, @@ -75203,6 +74495,13 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) +"wCY" = ( +/obj/structure/largecrate/guns/merc, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/port_hallway) "wDl" = ( /obj/effect/decal/cleanable/blood/oil/streak, /turf/open/floor/almayer{ @@ -75254,21 +74553,6 @@ icon_state = "plate" }, /area/almayer/medical/morgue) -"wDJ" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "emerald" - }, -/area/almayer/squads/charlie_delta_shared) -"wDK" = ( -/obj/structure/machinery/cryopod/right{ - layer = 3.1; - pixel_y = 13 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/squads/bravo) "wDR" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1 @@ -75278,17 +74562,6 @@ icon_state = "test_floor4" }, /area/almayer/hull/upper_hull/u_a_s) -"wEd" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha) "wEg" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ id = "agentshuttle"; @@ -75324,6 +74597,12 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south2) +"wEU" = ( +/obj/structure/machinery/cm_vending/clothing/leader/bravo, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/cryo_cells) "wFb" = ( /turf/open/floor/almayer{ dir = 4; @@ -75363,6 +74642,19 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/hangar) +"wFO" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + dir = 6; + icon_state = "silver" + }, +/area/almayer/living/bridgebunks) "wFR" = ( /turf/open/floor/almayer, /area/almayer/living/gym) @@ -75381,6 +74673,12 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) +"wGh" = ( +/turf/open/floor/almayer{ + dir = 10; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) "wGi" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -75397,12 +74695,14 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/starboard_hallway) -"wGE" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/landmark/start/marine/leader/delta, -/obj/effect/landmark/late_join/delta, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/delta) +"wGG" = ( +/obj/structure/platform_decoration{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "wGI" = ( /obj/structure/machinery/light{ dir = 4 @@ -75412,18 +74712,6 @@ icon_state = "red" }, /area/almayer/shipboard/port_missiles) -"wGX" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 - }, -/obj/structure/surface/table/almayer, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/auxiliary_officer_office) -"wHo" = ( -/turf/open/floor/almayer{ - icon_state = "emerald" - }, -/area/almayer/living/briefing) "wHp" = ( /obj/structure/bed/sofa/vert/grey, /obj/structure/bed/sofa/vert/grey{ @@ -75431,19 +74719,6 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) -"wIr" = ( -/obj/structure/machinery/cm_vending/clothing/senior_officer{ - req_access = list(); - req_access_txt = "26" - }, -/obj/structure/sign/safety/hvac_old{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/squads/req) "wIC" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/brig/chief_mp_office) @@ -75499,24 +74774,6 @@ icon_state = "plate" }, /area/almayer/hallways/vehiclehangar) -"wJD" = ( -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 1 - }, -/obj/structure/disposalpipe/segment, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "emerald" - }, -/area/almayer/squads/charlie) "wJH" = ( /turf/closed/wall/almayer/research/containment/wall/east, /area/almayer/medical/containment/cell/cl) @@ -75573,12 +74830,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_m_p) -"wLm" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "plating_striped" - }, -/area/almayer/living/cryo_cells) "wLu" = ( /obj/structure/stairs/perspective{ dir = 1; @@ -75589,6 +74840,12 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south2) +"wLv" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "greencorner" + }, +/area/almayer/hallways/starboard_hallway) "wLy" = ( /obj/structure/pipes/vents/pump/no_boom{ welded = 1; @@ -75598,35 +74855,14 @@ dir = 1 }, /area/almayer/medical/containment/cell) -"wLG" = ( -/obj/item/bedsheet/blue{ - layer = 3.2 - }, -/obj/item/bedsheet/blue{ - pixel_y = 13 - }, -/obj/item/clothing/head/ushanka{ - layer = 3.3 - }, -/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, -/obj/structure/bed{ - buckling_y = 13; - layer = 3.5; - pixel_y = 13 +"wLC" = ( +/obj/item/device/assembly/mousetrap/armed, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, /turf/open/floor/almayer{ - dir = 6; - icon_state = "blue" + dir = 10; + icon_state = "red" }, /area/almayer/living/port_emb) "wLK" = ( @@ -75674,43 +74910,6 @@ icon_state = "test_floor4" }, /area/almayer/medical/medical_science) -"wNl" = ( -/obj/structure/surface/table/almayer, -/obj/item/trash/USCMtray{ - layer = 3.2; - pixel_x = 4; - pixel_y = 17 - }, -/obj/item/reagent_container/food/drinks/cans/souto{ - pixel_x = -10; - pixel_y = 1 - }, -/obj/item/reagent_container/food/snacks/grown/orange{ - layer = 3.3; - pixel_x = 1; - pixel_y = 13 - }, -/obj/item/prop/magazine/book/starshiptroopers{ - pixel_x = 8; - pixel_y = -3 - }, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "orange" - }, -/area/almayer/living/port_emb) -"wNm" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/lower_hull) -"wNT" = ( -/obj/structure/platform, -/turf/open/floor/almayer, -/area/almayer/living/briefing) "wNU" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 2; @@ -75743,6 +74942,16 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) +"wOL" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/bed/chair/comfy{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/living/captain_mess) "wPf" = ( /obj/structure/sign/safety/reception{ pixel_x = 32; @@ -75763,18 +74972,6 @@ icon_state = "mono" }, /area/almayer/medical/hydroponics) -"wPC" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "cargo_arrow" - }, -/area/almayer/squads/charlie) "wPF" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/computer/cameras/almayer_network/vehicle{ @@ -75831,6 +75028,23 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) +"wRw" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/shared/alpha_bravo{ + dir = 2; + req_one_access = list(15,18,19); + req_access = list(9) + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/squads/alpha) +"wRI" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/tankerbunks) "wRN" = ( /obj/structure/machinery/portable_atmospherics/hydroponics, /obj/item/seeds/goldappleseed, @@ -75893,12 +75107,31 @@ icon_state = "dark_sterile" }, /area/almayer/engineering/laundry) +"wSq" = ( +/obj/structure/closet/secure_closet/guncabinet/red, +/obj/item/weapon/gun/shotgun/combat/guard, +/obj/item/ammo_magazine/shotgun/buckshot, +/obj/item/ammo_magazine/shotgun/incendiary, +/obj/item/ammo_magazine/shotgun/slugs, +/obj/item/ammo_magazine/shotgun/flechette, +/turf/open/floor/almayer, +/area/almayer/living/auxiliary_officer_office) "wSR" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cic_hallway) +"wSW" = ( +/obj/structure/sign/safety/water{ + pixel_x = 8; + pixel_y = -32 + }, +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/lower_hull/l_a_s) "wSX" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -75937,17 +75170,6 @@ icon_state = "red" }, /area/almayer/living/briefing) -"wTw" = ( -/obj/structure/machinery/cm_vending/sorted/attachments/squad{ - req_access = null; - req_one_access = null; - req_one_access_txt = "17;18;21"; - vend_y_offset = 0 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie_delta_shared) "wTy" = ( /obj/item/reagent_container/glass/rag, /turf/open/floor/almayer{ @@ -75966,14 +75188,6 @@ "wTM" = ( /turf/closed/wall/almayer/research/containment/wall/south, /area/almayer/medical/containment/cell) -"wTN" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/auxiliary_officer_office) "wUd" = ( /obj/structure/surface/table/almayer, /obj/item/storage/box/gloves{ @@ -75983,6 +75197,21 @@ /obj/item/storage/fancy/candle_box, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/morgue) +"wUi" = ( +/obj/structure/surface/table/almayer, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/cryo_cells) +"wUv" = ( +/obj/structure/pipes/vents/pump{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "red" + }, +/area/almayer/living/briefing) "wUz" = ( /obj/structure/sign/safety/life_support{ pixel_x = 8; @@ -76012,8 +75241,17 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_p) +"wUE" = ( +/turf/open/floor/almayer{ + dir = 1; + icon_state = "greencorner" + }, +/area/almayer/hallways/starboard_hallway) "wUN" = ( /obj/structure/machinery/optable, +/obj/structure/machinery/light/small{ + dir = 8 + }, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -76083,46 +75321,12 @@ /obj/item/weapon/gun/smg/m39, /turf/open/floor/plating/almayer, /area/almayer/shipboard/brig/armory) -"wVy" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 1; - name = "ship-grade camera" - }, -/obj/structure/sign/safety/hazard{ - pixel_x = 15; - pixel_y = -32 - }, -/obj/structure/sign/safety/ammunition{ - pixel_y = -32 - }, -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie_delta_shared) "wVz" = ( /obj/structure/machinery/light/small{ dir = 4 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_p) -"wVB" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/bed/chair/comfy{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "bluefull" - }, -/area/almayer/living/bridgebunks) "wVD" = ( /obj/structure/surface/rack, /obj/item/tool/wirecutters, @@ -76249,12 +75453,46 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_s) -"wXH" = ( -/obj/structure/bed/chair{ - dir = 1 +"wXB" = ( +/obj/item/clothing/head/helmet/marine/tech{ + layer = 4.1; + pixel_y = 12 }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) +/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/structure/sign/safety/bathunisex{ + pixel_x = -16; + pixel_y = 8 + }, +/mob/living/simple_animal/mouse/brown{ + name = "rat" + }, +/obj/item/bedsheet/brown{ + layer = 3.1 + }, +/obj/item/bedsheet/brown{ + pixel_y = 13 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/port_emb) "wXI" = ( /turf/open/floor/almayer{ dir = 1; @@ -76269,6 +75507,14 @@ icon_state = "test_floor4" }, /area/almayer/hallways/hangar) +"wYj" = ( +/obj/structure/machinery/shower{ + dir = 4 + }, +/obj/structure/machinery/door/window/eastright, +/obj/structure/window/reinforced/tinted/frosted, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/tankerbunks) "wYA" = ( /obj/structure/bed/chair/comfy/teal{ dir = 8 @@ -76349,14 +75595,12 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/operating_room_four) -"wZH" = ( -/obj/structure/machinery/light/small{ +"wZI" = ( +/obj/structure/machinery/light{ dir = 4 }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/lower_hull/l_a_s) +/turf/open/floor/almayer, +/area/almayer/living/cryo_cells) "wZM" = ( /obj/structure/bed/sofa/south, /turf/open/floor/almayer{ @@ -76400,19 +75644,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_m_p) -"xaC" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/tool/kitchen/utensil/pfork{ - pixel_x = -6; - pixel_y = 5 - }, -/obj/item/reagent_container/food/snacks/mre_pack/meal5{ - desc = "How long has this been sitting here?"; - pixel_x = 7; - pixel_y = 7 - }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) "xaF" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -76469,9 +75700,27 @@ dir = 5 }, /area/almayer/command/lifeboat) -"xba" = ( -/turf/closed/wall/almayer/reinforced, -/area/almayer/living/cryo_cells) +"xaZ" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/prop/ice_colony/tiger_rug{ + desc = "A beat up beer stained, incredibly garish, polyester tiger rug. No one knows how it got here. Written on the wash tag are the words 'From Thedus, with love <3', in Sharpie."; + icon_state = "HotlineAlt"; + layer = 2.9; + name = "Richard the tiger" + }, +/turf/open/floor/almayer{ + dir = 9; + icon_state = "silver" + }, +/area/almayer/living/port_emb) +"xbc" = ( +/turf/open/floor/almayer{ + dir = 8; + icon_state = "green" + }, +/area/almayer/command/cichallway) "xbd" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -76495,6 +75744,19 @@ /obj/item/tool/mop, /turf/open/floor/plating, /area/almayer/command/airoom) +"xbS" = ( +/obj/structure/window/reinforced{ + dir = 4; + health = 80 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "cargo_arrow" + }, +/area/almayer/hallways/port_hallway) "xcp" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_ew_full_cap"; @@ -76552,6 +75814,15 @@ }, /turf/open/floor/almayer, /area/almayer/living/grunt_rnr) +"xfb" = ( +/obj/structure/machinery/cm_vending/clothing/medic/delta{ + density = 0; + pixel_y = -30 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/delta) "xfc" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/sign/safety/cryo{ @@ -76591,19 +75862,6 @@ icon_state = "green" }, /area/almayer/squads/req) -"xfO" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "silver" - }, -/area/almayer/living/bridgebunks) "xfT" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -76733,6 +75991,13 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cells) +"xhA" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "xhE" = ( /obj/structure/bed/chair/bolted{ dir = 8 @@ -76752,18 +76017,24 @@ icon_state = "test_floor4" }, /area/almayer/hull/upper_hull/u_f_s) -"xhQ" = ( -/obj/structure/window/framed/almayer, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) "xhU" = ( /turf/open/floor/almayer{ dir = 8; icon_state = "red" }, /area/almayer/hull/upper_hull/u_a_p) +"xhW" = ( +/obj/structure/bed/chair/comfy/ares{ + dir = 1 + }, +/obj/structure/pipes/vents/pump/no_boom{ + name = "Security Vent"; + desc = "Has a valve and pump attached to it, connected to multiple gas tanks." + }, +/turf/open/floor/almayer/no_build{ + icon_state = "plating" + }, +/area/almayer/command/airoom) "xhZ" = ( /obj/structure/bed/chair/comfy/beige{ dir = 4 @@ -76780,6 +76051,27 @@ }, /turf/open/floor/almayer, /area/almayer/engineering/engine_core) +"xiD" = ( +/obj/structure/machinery/cm_vending/sorted/tech/electronics_storage{ + req_access = null; + req_one_access_txt = "7;23;27" + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/port_hallway) +"xiE" = ( +/obj/structure/machinery/cm_vending/sorted/attachments/squad{ + req_access = null; + req_one_access = null; + req_one_access_txt = "17;18;21"; + vend_y_offset = 0 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "xjw" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -76855,6 +76147,12 @@ "xkd" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/brig/cells) +"xki" = ( +/obj/structure/machinery/cm_vending/clothing/specialist/bravo, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/cryo_cells) "xkw" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -76867,10 +76165,15 @@ icon_state = "greencorner" }, /area/almayer/hallways/port_hallway) -"xlk" = ( -/obj/structure/surface/table/almayer, -/turf/open/floor/almayer, -/area/almayer/squads/bravo) +"xkG" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "cargo_arrow" + }, +/area/almayer/squads/delta) "xlC" = ( /obj/structure/machinery/power/apc/almayer{ dir = 1 @@ -76888,6 +76191,19 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_s) +"xlK" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "silver" + }, +/area/almayer/living/cryo_cells) "xlX" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_a_s) @@ -76950,6 +76266,12 @@ icon_state = "cargo" }, /area/almayer/medical/lower_medical_medbay) +"xnc" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "red" + }, +/area/almayer/squads/alpha) "xne" = ( /obj/structure/machinery/door/poddoor/almayer/blended{ id = "RoomDivider"; @@ -76989,21 +76311,6 @@ /obj/structure/largecrate/random/barrel/yellow, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_s) -"xoe" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/status_display{ - pixel_y = -29 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "bluecorner" - }, -/area/almayer/squads/delta) "xoh" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -77025,6 +76332,17 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) +"xoR" = ( +/obj/structure/machinery/cm_vending/gear/tl{ + density = 0; + pixel_x = -32; + vend_x_offset = 1 + }, +/turf/open/floor/almayer{ + dir = 9; + icon_state = "blue" + }, +/area/almayer/squads/delta) "xoS" = ( /obj/effect/decal/warning_stripes{ icon_state = "N" @@ -77222,6 +76540,12 @@ icon_state = "plating" }, /area/almayer/medical/upper_medical) +"xsP" = ( +/turf/open/floor/almayer{ + dir = 1; + icon_state = "silver" + }, +/area/almayer/living/port_emb) "xsW" = ( /obj/structure/machinery/cm_vending/gear/vehicle_crew, /turf/open/floor/almayer{ @@ -77274,6 +76598,15 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) +"xue" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/surface/table/almayer, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha) "xuB" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -77320,6 +76653,18 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, /area/almayer/living/port_emb) +"xuR" = ( +/obj/structure/flora/pottedplant{ + desc = "It is made of Fiberbush(tm). It contains asbestos."; + icon_state = "pottedplant_22"; + name = "synthetic potted plant"; + pixel_y = 8 + }, +/turf/open/floor/almayer{ + dir = 6; + icon_state = "blue" + }, +/area/almayer/squads/delta) "xuU" = ( /obj/structure/machinery/light{ dir = 8 @@ -77356,48 +76701,6 @@ icon_state = "red" }, /area/almayer/shipboard/brig/perma) -"xvE" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/charlie{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/charlie) -"xvM" = ( -/obj/structure/machinery/door_control{ - id = "ARES StairsLower"; - name = "ARES Core Lockdown"; - pixel_x = 24; - pixel_y = 8; - req_one_access_txt = "90;91;92" - }, -/obj/effect/step_trigger/clone_cleaner, -/turf/open/floor/almayer/no_build{ - dir = 4; - icon_state = "silver" - }, -/area/almayer/command/airoom) -"xvX" = ( -/obj/structure/machinery/cm_vending/gear/leader, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) -"xwl" = ( -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, -/obj/structure/window/reinforced{ - dir = 8; - health = 80 - }, -/turf/open/floor/almayer{ - icon_state = "cargo_arrow" - }, -/area/almayer/squads/alpha_bravo_shared) "xwp" = ( /obj/item/storage/box/matches{ pixel_x = -11; @@ -77425,6 +76728,25 @@ /obj/structure/largecrate/supply/supplies/mre, /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_f_p) +"xwr" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/machinery/camera/autoname/almayer{ + dir = 1; + name = "ship-grade camera" + }, +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/squads/alpha) +"xwt" = ( +/obj/structure/sign/nosmoking_1, +/turf/closed/wall/almayer, +/area/almayer/hallways/port_hallway) "xwv" = ( /obj/structure/bed/chair{ dir = 1 @@ -77571,26 +76893,6 @@ "xys" = ( /turf/closed/wall/almayer, /area/almayer/shipboard/brig/main_office) -"xyt" = ( -/obj/structure/surface/table/almayer, -/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/structure/machinery/computer/working_joe{ - pixel_y = 16 - }, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/medical/hydroponics) "xyw" = ( /turf/open/floor/almayer{ icon_state = "plate" @@ -77651,14 +76953,6 @@ icon_state = "red" }, /area/almayer/shipboard/brig/main_office) -"xAt" = ( -/obj/structure/bed/chair/comfy/charlie{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "emeraldfull" - }, -/area/almayer/living/briefing) "xAB" = ( /obj/structure/surface/table/almayer, /obj/item/paper_bin/uscm, @@ -77669,11 +76963,29 @@ }, /area/almayer/squads/req) "xAC" = ( -/obj/structure/surface/rack, -/turf/open/floor/prison{ - icon_state = "kitchen" +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 }, -/area/almayer/engineering/upper_engineering/port) +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/hangar) +"xAF" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/bed/chair{ + dir = 8; + pixel_y = 3 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "red" + }, +/area/almayer/squads/alpha) "xAI" = ( /obj/structure/platform{ dir = 1 @@ -77690,6 +77002,12 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) +"xAL" = ( +/obj/structure/pipes/vents/pump{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/living/cryo_cells) "xAY" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -77709,13 +77027,6 @@ icon_state = "test_floor4" }, /area/almayer/engineering/upper_engineering/port) -"xBQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) "xBV" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -77791,12 +77102,41 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_f_s) +"xDs" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper Cryogenics Bay" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/squads/delta) +"xDx" = ( +/turf/open/floor/almayer{ + icon_state = "green" + }, +/area/almayer/command/cichallway) "xDC" = ( /obj/structure/pipes/standard/simple/hidden/supply/no_boom, /turf/open/floor/almayer/no_build{ icon_state = "ai_floors" }, /area/almayer/command/airoom) +"xDK" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "bluecorner" + }, +/area/almayer/squads/delta) "xEc" = ( /turf/open/floor/almayer{ dir = 9; @@ -77915,27 +77255,6 @@ icon_state = "cargo" }, /area/almayer/squads/req) -"xGE" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply{ - pixel_y = -1 - }, -/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 - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/bravo) "xGJ" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22"; @@ -77954,11 +77273,6 @@ icon_state = "red" }, /area/almayer/shipboard/brig/main_office) -"xHp" = ( -/turf/open/floor/almayer{ - icon_state = "orange" - }, -/area/almayer/squads/alpha_bravo_shared) "xHG" = ( /obj/structure/machinery/door/airlock/almayer/secure/reinforced{ dir = 2; @@ -77988,6 +77302,22 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_m_p) +"xIc" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, +/obj/structure/mirror{ + pixel_x = 29 + }, +/obj/structure/machinery/light{ + unacidable = 1; + unslashable = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/tankerbunks) "xId" = ( /obj/structure/surface/rack, /obj/item/mortar_shell/he, @@ -77996,6 +77326,18 @@ icon_state = "cargo" }, /area/almayer/squads/req) +"xIh" = ( +/obj/structure/surface/rack, +/obj/item/stack/sheet/metal/large_stack, +/obj/item/stack/sheet/plasteel/large_stack, +/obj/structure/machinery/light{ + dir = 8; + invisibility = 101 + }, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/command/cic) "xIi" = ( /obj/item/stool{ pixel_x = 15; @@ -78024,6 +77366,12 @@ icon_state = "cargo" }, /area/almayer/medical/lower_medical_medbay) +"xIt" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "blue" + }, +/area/almayer/living/briefing) "xIw" = ( /obj/structure/machinery/brig_cell/cell_2{ pixel_x = 32 @@ -78072,11 +77420,6 @@ icon_state = "test_floor4" }, /area/almayer/command/corporateliason) -"xJH" = ( -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/squads/charlie_delta_shared) "xJR" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -78087,6 +77430,13 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/hangar) +"xKL" = ( +/obj/structure/surface/rack, +/obj/effect/spawner/random/gun/pistol/lowchance, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/squads/req) "xKM" = ( /obj/structure/machinery/status_display{ pixel_x = 16; @@ -78178,6 +77528,11 @@ allow_construction = 0 }, /area/almayer/hallways/aft_hallway) +"xMq" = ( +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/squads/alpha) "xMs" = ( /turf/closed/wall/almayer/white, /area/almayer/medical/operating_room_two) @@ -78190,6 +77545,27 @@ icon_state = "plating_striped" }, /area/almayer/squads/req) +"xMy" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply{ + pixel_y = -1 + }, +/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 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/squads/delta) "xMA" = ( /obj/structure/machinery/computer/med_data, /obj/structure/sign/safety/terminal{ @@ -78205,12 +77581,6 @@ dir = 6 }, /area/almayer/command/cic) -"xMK" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "emeraldcorner" - }, -/area/almayer/hallways/port_hallway) "xML" = ( /obj/structure/machinery/computer/cameras/wooden_tv/prop{ pixel_x = -4; @@ -78229,12 +77599,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) -"xMR" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/bravo) "xNb" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -78274,21 +77638,6 @@ icon_state = "silver" }, /area/almayer/command/computerlab) -"xNz" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/microwave{ - pixel_y = 7 - }, -/obj/item/storage/box/cups{ - pixel_x = 3 - }, -/obj/item/storage/box/donkpockets{ - pixel_y = 19 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/auxiliary_officer_office) "xNB" = ( /obj/structure/machinery/light, /obj/structure/sign/safety/security{ @@ -78332,6 +77681,12 @@ icon_state = "green" }, /area/almayer/hallways/starboard_hallway) +"xPB" = ( +/obj/structure/machinery/cm_vending/clothing/engi/bravo, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/cryo_cells) "xPE" = ( /obj/structure/largecrate/random/barrel/white, /turf/open/floor/plating/plating_catwalk, @@ -78340,10 +77695,7 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "orange" - }, +/turf/open/floor/almayer, /area/almayer/engineering/upper_engineering/port) "xQa" = ( /obj/structure/bed/chair/office/dark{ @@ -78362,6 +77714,12 @@ dir = 1 }, /area/almayer/medical/containment/cell) +"xQo" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/auxiliary_officer_office) "xQD" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ @@ -78408,26 +77766,6 @@ icon_state = "mono" }, /area/almayer/medical/upper_medical) -"xRj" = ( -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - icon_state = "emeraldcorner" - }, -/area/almayer/squads/charlie) "xRk" = ( /obj/structure/machinery/light{ dir = 8 @@ -78467,14 +77805,6 @@ icon_state = "tcomms" }, /area/almayer/command/telecomms) -"xRJ" = ( -/obj/structure/bed/chair/comfy/bravo{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "orangefull" - }, -/area/almayer/living/briefing) "xRU" = ( /obj/structure/sign/safety/maint{ pixel_x = -17 @@ -78490,16 +77820,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_p) -"xSw" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/window/framed/almayer, -/obj/structure/curtain/open/shower{ - name = "cryo curtain" - }, -/turf/open/floor/plating, -/area/almayer/squads/charlie) "xSz" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/status_display{ @@ -78597,6 +77917,23 @@ icon_state = "test_floor4" }, /area/almayer/hallways/stern_hallway) +"xTN" = ( +/obj/structure/machinery/door_control{ + id = "ARES StairsLower"; + name = "ARES Core Lockdown"; + pixel_x = 24; + pixel_y = -8; + req_one_access_txt = "90;91;92" + }, +/obj/structure/machinery/camera/autoname/almayer/containment/ares{ + dir = 8; + pixel_y = 2 + }, +/turf/open/floor/almayer/no_build{ + dir = 4; + icon_state = "silver" + }, +/area/almayer/command/airoom) "xTR" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/almayer/open{ @@ -78606,36 +77943,6 @@ }, /turf/open/floor/plating, /area/almayer/command/cichallway) -"xTW" = ( -/obj/structure/bed{ - can_buckle = 0 - }, -/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{ - buckling_y = 13; - layer = 3.5; - pixel_y = 13 - }, -/obj/item/bedsheet/yellow{ - layer = 3.2 - }, -/obj/item/bedsheet/red{ - pixel_y = 13 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orange" - }, -/area/almayer/living/port_emb) "xUA" = ( /obj/structure/surface/table/almayer, /obj/item/storage/pouch/tools/tank, @@ -78669,19 +77976,6 @@ icon_state = "plate" }, /area/almayer/command/combat_correspondent) -"xVc" = ( -/obj/effect/step_trigger/clone_cleaner, -/obj/structure/machinery/door_control{ - id = "ARES StairsUpper"; - name = "ARES Core Access"; - pixel_x = 24; - pixel_y = 24; - req_one_access_txt = "90;91;92" - }, -/turf/open/floor/almayer/no_build{ - icon_state = "ai_floors" - }, -/area/almayer/command/airoom) "xVj" = ( /obj/structure/surface/table/almayer, /obj/item/tool/weldingtool{ @@ -78694,6 +77988,14 @@ "xVk" = ( /turf/open/space, /area/space/almayer/lifeboat_dock) +"xVq" = ( +/obj/structure/sign/safety/rewire{ + pixel_x = -17; + pixel_y = 8 + }, +/obj/structure/machinery/computer/ordercomp, +/turf/open/floor/almayer, +/area/almayer/squads/alpha) "xVI" = ( /obj/structure/largecrate/random/case, /turf/open/floor/almayer{ @@ -78721,22 +78023,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south2) -"xVT" = ( -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 - }, -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12; - pixel_y = 12 - }, -/turf/closed/wall/almayer, -/area/almayer/living/tankerbunks) -"xWd" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer{ - icon_state = "orange" - }, -/area/almayer/squads/alpha_bravo_shared) "xWo" = ( /obj/structure/machinery/door/airlock/almayer/maint{ req_one_access_txt = "19;21"; @@ -78850,6 +78136,10 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south1) +"xYW" = ( +/obj/structure/surface/table/almayer, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "xYZ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -78881,17 +78171,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_a_p) -"xZU" = ( -/obj/structure/machinery/cryopod{ - pixel_y = 6 - }, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/squads/charlie) "yac" = ( /obj/structure/platform_decoration{ dir = 8 @@ -78972,6 +78251,18 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_a_p) +"ybD" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad{ + req_access = null; + req_one_access = null; + req_one_access_txt = "15;16;18;21"; + vend_x_offset = 0; + vend_y_offset = 0 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha) "ybO" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/stack/sheet/mineral/phoron/medium_stack, @@ -78996,6 +78287,15 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/port_hallway) +"ybW" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/bed/chair/comfy/delta{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "bluefull" + }, +/area/almayer/living/briefing) "ybZ" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/transmitter{ @@ -79009,13 +78309,6 @@ icon_state = "redfull" }, /area/almayer/shipboard/port_missiles) -"ycd" = ( -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/delta) "ycj" = ( /obj/structure/machinery/medical_pod/sleeper{ dir = 8 @@ -79041,19 +78334,17 @@ /obj/structure/machinery/computer/secure_data, /turf/open/floor/almayer, /area/almayer/shipboard/brig/processing) +"ycM" = ( +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/port_hallway) "ycV" = ( /obj/structure/curtain/red, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_s) -"ycZ" = ( -/obj/structure/sign/poster{ - pixel_y = 32 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "blue" - }, -/area/almayer/squads/delta) "ydh" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -79187,13 +78478,15 @@ }, /turf/open/floor/wood/ship, /area/almayer/shipboard/brig/chief_mp_office) -"yfm" = ( -/obj/effect/landmark/start/marine/delta, -/obj/effect/landmark/late_join/delta, +"yeV" = ( +/obj/structure/machinery/cryopod/right{ + layer = 3.1; + pixel_y = 13 + }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "cargo" }, -/area/almayer/squads/delta) +/area/almayer/hallways/port_hallway) "yfv" = ( /obj/structure/sign/safety/maint{ pixel_x = -17 @@ -79229,6 +78522,14 @@ }, /turf/open/floor/plating, /area/almayer/living/grunt_rnr) +"ygd" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/squads/delta) "yge" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/cameras/almayer/vehicle{ @@ -79264,16 +78565,6 @@ "yhQ" = ( /turf/closed/wall/almayer/outer, /area/almayer/hull/lower_hull/l_m_p) -"yiq" = ( -/obj/structure/sign/safety/north{ - pixel_x = -17; - pixel_y = -8 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "red" - }, -/area/almayer/hallways/starboard_hallway) "yit" = ( /obj/structure/machinery/light{ dir = 4 @@ -79285,6 +78576,15 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) +"yix" = ( +/obj/structure/bed/chair{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/hallways/hangar) "yiC" = ( /obj/structure/surface/table/almayer, /obj/structure/flora/pottedplant{ @@ -79302,15 +78602,6 @@ }, /turf/open/floor/almayer, /area/almayer/engineering/engineering_workshop/hangar) -"yiW" = ( -/obj/structure/machinery/cryopod/right{ - layer = 3.1; - pixel_y = 13 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/squads/charlie) "yiX" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 8; @@ -79357,6 +78648,14 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south2) +"ykc" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "silverfull" + }, +/area/almayer/hallways/port_hallway) "ykj" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -79378,6 +78677,15 @@ icon_state = "cargo" }, /area/almayer/hull/lower_hull/l_m_s) +"ykL" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/lower_hull/l_a_s) "ykP" = ( /obj/structure/filingcabinet{ density = 0; @@ -92198,9 +91506,9 @@ uNL tVf mGL oxp -kcp -bWJ -nar +bSv +wYj +qtE alU bXo oCi @@ -92401,9 +91709,9 @@ mGL poR mGL pNp -kcp -bTS -bIA +bSv +hkE +xIc alU uDn bKf @@ -92600,13 +91908,13 @@ hJp oPI uNL hJp -kcp -kcp -iqp -kcp -kcp -jgl -kcp +bSv +bSv +eGu +bSv +bSv +mHt +bSv alU alU alU @@ -92803,13 +92111,13 @@ mGL dqd uNL hJp -kcp -bBD -bTS -bTS -lxo -qcy -kcp +bSv +mci +hkE +ivA +elO +rwV +bSv bAg edM egq @@ -92827,11 +92135,11 @@ jjs jjs jjs jYd -bSv -bSv -bSv -bSv -bSv +bzy +fIH +nqU +vhq +nqU nqU vRz aag @@ -93006,13 +92314,13 @@ pzZ ijp uNL mGL -kcp -bTR -iEg -oQM -aqI -aqI -kcp +bSv +tRF +bTH +cIn +njX +bTH +bSv bzA bBB bBB @@ -93030,11 +92338,11 @@ afz afz afz iDd -qih -bTH -foN -cDZ -bSv +bzy +oBU +wlL +vhq +vhq pch vRz aag @@ -93209,13 +92517,13 @@ uNL uNL uNL mGL -kcp -lxW -hPh -wGX -bFr -ppe -kcp +bSv +maV +qjo +qVQ +pCF +vZM +bSv bzA bKh bKh @@ -93233,11 +92541,11 @@ afz afz afz iDd -bSv -tjw -bTH -bTV -bSv +bzy +mzo +mzo +mzo +vhq nqU vRz aag @@ -93412,13 +92720,13 @@ qDv aLk uNL xCR -kcp -wTN -kZN -rgK -hbu -iYe -bJl +bSv +ghu +bTH +hbz +bTH +qZJ +hzD bKa bKa bKa @@ -93436,11 +92744,11 @@ afC afz afz bRx -bSv -ifb -bTH -bSv -xVT +bzy +cEY +fIH +mzo +rpW kAs vRz aag @@ -93615,13 +92923,13 @@ kmM eqk uNL hJp -kcp -oMi -bAZ -bTS -bTS -niR -kcp +bSv +qKp +tVV +hkE +hkE +ifC +bSv bzA bKh bKh @@ -93639,11 +92947,11 @@ afz afz afz iDd -bSv -aIX -aIX -bSv -ehZ +bzy +dcr +mzK +mzo +fsi eXo vRz aag @@ -93818,13 +93126,13 @@ hJp hJp uNL hJp -kcp -kcp -kcp -sXE -kcp -kcp -kcp +bSv +bSv +bSv +cQj +bSv +bSv +bSv bzA bBB bBB @@ -93842,10 +93150,10 @@ afz afz afz iDd -bSv -cop -cop -bSv +bzy +vhq +wqE +mzo vhq nqU vRz @@ -94021,13 +93329,13 @@ aSY hJp uNL hJp -dqd -kcp -bTU -gZK -bTS -lyX -kcp +ots +bSv +kCu +mIZ +aIX +aIX +bSv bAr bKh bBB @@ -94045,10 +93353,10 @@ eGg eGg eGg jYd -bSv -kBY -bTn -bSv +bzy +nqU +pbL +mzo vhq vhq vRz @@ -94224,13 +93532,13 @@ uNL lgY uNL mGL -hJp -kcp -onY -wdf -bTS -kcp -kcp +cop +bSv +prz +ozH +bXO +bXO +bSv bzy bKh bBB @@ -94248,10 +93556,10 @@ hdh hdh hdh bRD -bSv -bSv -bSv -bSv +bzy +qOU +mzo +mzo mzo qOU vRz @@ -94427,13 +93735,13 @@ crc hJp qee mGL -hzM -kcp -xNz -utK -rKA -kcp -kcp +wRI +bSv +bTV +aDN +kBY +bTn +bSv bzy bXs bBB @@ -94537,13 +93845,13 @@ wSR mMV awz awz -aJp -jgJ -jgJ -jgJ -jgJ -jgJ -mZb +oVx +sVC +sVC +sVC +sVC +sVC +qlD awz awz woy @@ -94630,13 +93938,13 @@ aQv aQv bcm bcm -kcp -kcp -kcp -kcp -kcp -kcp -kcp +bSv +bSv +bSv +bSv +bSv +bSv +bSv bzy bZL cat @@ -94739,15 +94047,15 @@ pZS pEB jUY qwp -aVI -jmY +ijd +xDx rHc xhZ xhZ xhZ rHc -qyo -udx +lHv +kON qwp pZS jHh @@ -94842,11 +94150,11 @@ bIo bKt bLD aYt -btO +eet btN -xyw -aYt -btO +rOc +bPr +eet aYt mIz xyw @@ -94942,15 +94250,15 @@ vkR wsD jUY qwp -eei -jmY +hEm +xDx iwW sTm oSq sTm tdT -qyo -itX +lHv +naM qwp vGA uwN @@ -95145,15 +94453,15 @@ kfE wsD jUY qwp -rBx -jmY +oHa +xDx iwW sTm gwR sTm tdT -qyo -pbW +lHv +gAR qwp cDn uwN @@ -95348,15 +94656,15 @@ xDn pEB jUY awz -wkH -hmS +hNY +pFX mWV jZu sco fqO lIp -hWO -fqc +dXI +paA awz gGr jHh @@ -95465,7 +94773,7 @@ aYu aYu aYu aYu -aYu +rCD btO cdc nEs @@ -95551,15 +94859,15 @@ nNv pEB jUY qwp -wyt -jmY +neU +xDx iwW dCr gwR sTm tdT -qyo -tsy +lHv +gkz qwp ora laO @@ -95668,7 +94976,7 @@ bdL bvf bvf bvf -bdL +xAC bvf cdd cdy @@ -95754,15 +95062,15 @@ xSz pEB jUY qwp -sUE -jmY +kYc +xDx iwW dCr oSq sTm tdT -qyo -tsy +lHv +gkz qwp pZS jHh @@ -95871,7 +95179,7 @@ xpT xyw xyw xyw -bHB +kff osx bJh cdz @@ -95957,15 +95265,15 @@ jnD wsD jUY qwp -iiZ -jmY +qlG +xDx rHc lAy wjq wjq -rHc -qyo -tsy +mHH +lHv +gkz qwp vGA uwN @@ -96161,13 +95469,13 @@ rTk nRH awz awz -fRr -dmv -cHE -dmv -dmv -dmv -olU +sZK +xbc +mlv +xbc +xbc +xbc +pGm awz awz vSN @@ -97290,7 +96598,7 @@ baI baI baI baI -baI +eqi bGH bHB btO @@ -97395,8 +96703,8 @@ qnh aKa rrB aGr -eDu -tKr +aGr +uTM uNg cLN aES @@ -97598,8 +96906,8 @@ gtp qfA tYX tpD -xfO -iTD +tpD +wFO vCO vCO jxB @@ -97989,11 +97297,11 @@ sEp wVW wVW wVW -swH -ayy wVW -aBV -sEM +jPT +xIh +ozP +wVW wVW wVW wVW @@ -98192,11 +97500,11 @@ fHh wVW lZs gHl -sni -ayz -dAX -aQg -vpV +wVW +une +une +une +wVW eSV aGp wVW @@ -98383,7 +97691,7 @@ aew bCO hvH hvH -hvH +aCJ kcN cod oqA @@ -98395,11 +97703,11 @@ alX auQ awm avS -nwD -asR -pbs -pbV -aPB +wVW +wVW +hDj +wVW +wVW aJG aGq auQ @@ -98414,7 +97722,7 @@ aRq bHG ceK sxD -bhJ +hHA bHG ayP aES @@ -98593,16 +97901,16 @@ oqA aic aov wVW -arG +asc alX lQG oPE alZ -auT -aBR -awD -bZJ -aRt +alX +alX +alX +alX +alX axp aPI lQG @@ -99019,11 +98327,11 @@ aKq aKz mKq ceK -lcy -iTw +pCE +sQR ceK sxD -bhJ +hHA bHG nis aES @@ -99411,9 +98719,9 @@ aqN alX asc abk -azV -aAB -aBZ +vrG +mIr +lXS avY awk alX @@ -99609,14 +98917,14 @@ aic aov wVW awA -ayr +dvL awH aPD asc azW -aqN -aAC -aCa +lay +giK +cWn bPs xUB gkK @@ -99628,11 +98936,11 @@ aKn aKz mKq ceK -wVB -psa +doV +qrQ ceK sxD -bhJ +hHA bHG brS aES @@ -99720,7 +99028,7 @@ pcl fNi aYt xyw -vAq +yix hYG aYt gGs @@ -99817,9 +99125,9 @@ wVW wVW rOC soX -azX -aAD -aCb +gqG +puU +lqH aDv aEC wVW @@ -99831,8 +99139,8 @@ aKn aKz mKq ceK -lcy -iTw +pCE +sQR ceK aES tJi @@ -99923,7 +99231,7 @@ pcl oRJ fTm fPu -vAq +yix hYG hYG aYt @@ -100241,7 +99549,7 @@ jUb qjz ceK sxD -bhJ +hHA bHG gCP aES @@ -100329,7 +99637,7 @@ pcl xNb aYt fPu -leg +eQT hYG hYG aYt @@ -100440,8 +99748,8 @@ aKn aKz mKq oKx -tVh -psa +gLp +qrQ ceK aES mhm @@ -100532,7 +99840,7 @@ pcl uuu fTm xyw -lqK +oqf hYG hYG hYG @@ -100629,9 +99937,9 @@ ato wVW aKF alX -hxm +uRY deD -tUo +wkY aIf aEB wVW @@ -100850,7 +100158,7 @@ aXb aGr ceK sxD -bhJ +hHA bHG cWy aES @@ -101033,7 +100341,7 @@ atx jvX ato wVW -vTu +bqv alX alX avY @@ -101646,7 +100954,7 @@ aCj ayK aAd aAP -hvv +vmu ayu aCj bYY @@ -102260,7 +101568,7 @@ wVW wVW wVW lgK -aGZ +hXr awF cST aTz @@ -102539,7 +101847,7 @@ hJp dpy uNL acZ -aeN +aeJ azl ahS ajA @@ -102742,7 +102050,7 @@ hJp fkW uNL vhw -khD +aeh azw xWp aAK @@ -102871,10 +102179,10 @@ aGY rvA aKO awF -aRx -aRx -aUo -aVi +mUh +mUh +sej +scE pbp pMj awS @@ -102945,7 +102253,7 @@ fpd nVS uNL eXq -eXq +czk eXq eXq eXq @@ -103147,13 +102455,13 @@ nXP hJp dnX uNL -aRu -aRu -aRu -aRu -aRu -aRu -bcm +wSq +fsw +pmb +jjX +iEn +jbW +tdF aXj bHB aZW @@ -103350,13 +102658,13 @@ nXP mGL dnX uNL -aRu -aRu -aRu -aRu -aRu -aRu -bcm +eMx +msy +dNc +dNc +dNc +pmg +tdF xyw bHB aZX @@ -103480,10 +102788,10 @@ aHk rvA aLp awF -jss -aTB -aUq -aVk +noY +bOu +ixX +wOL ldC vkb aET @@ -103553,13 +102861,13 @@ nXP mGL fJX uNL -aRu -aRu -aRu -aRu -aRu -aRu -bcm +jCB +lSM +bTS +bTS +bTS +gZK +tdF hmy bHB aZL @@ -103756,13 +103064,13 @@ nXP tRV dnX uNL -aRu -aRu -aRu -aRu -aRu -aRu -bcm +pEj +xQo +bTS +bTS +bTS +sby +kcp xyw bHB wqh @@ -103959,14 +103267,14 @@ nXP nun vJM uNL -aRu -aRu -aRu -aRu -aRu -aRu -bcm -bGQ +tAs +fEp +juF +ppe +mfJ +gZK +thp +xyw bHB tdc rOc @@ -104162,13 +103470,13 @@ nXP hJp qNG uNL -aRu -aRu -aRu -aRu -aRu -aRu -bcm +kcp +kcp +qhX +kFV +kcp +kcp +kcp bGR bHB xyw @@ -104365,14 +103673,14 @@ nXP mGL kKG uNL -aRu -aRu -aRu -aRu -aRu -aRu -bcm -xyw +nWn +cTB +cTB +lxV +cTB +cQQ +kcp +bGQ bHB xyw bkA @@ -104567,14 +103875,14 @@ hJp mGL mGL eKO -uNL -aRu -aRu -aRu -aRu -aRu -aRu -bcm +tZs +gEd +nsD +lBD +rVW +nsD +fMW +kcp aYu wTg bGq @@ -104771,13 +104079,13 @@ cmk xJi cIi uNL -aRu -aRu -aRu -aRu -aRu -aRu -bcm +rTL +rtM +qqm +hbF +lIy +jex +kcp aZZ aYC aZZ @@ -106189,9 +105497,9 @@ wfE fHz opD aGn -nTZ +tav wFR -lah +iSd vnD iRy esM @@ -107025,7 +106333,7 @@ vVW vhX unU rlZ -twq +ucd vhX jCK nyj @@ -108041,7 +107349,7 @@ rlZ tiI hDR oZV -rlZ +iSv rlZ xMj biA @@ -109785,8 +109093,8 @@ iBt iBt iUZ awE -pQu -kmL +jZU +gnQ qVM csz qVM @@ -109860,7 +109168,7 @@ kan avW bZn dXr -tUv +kLl vhX gDW rlZ @@ -109988,7 +109296,7 @@ iBt iBt iBt awE -jZU +cvj rjH qVM vGk @@ -110191,8 +109499,8 @@ iBt iBt iBt awE -cvj -iiz +hRT +dbM qVM oLw qVM @@ -110569,7 +109877,7 @@ ayT ajt avm vOy -xyt +oJA wiW tOr dBj @@ -110785,7 +110093,7 @@ aCC kXw vtm emK -fGu +mrB hPe sdu btC @@ -111191,7 +110499,7 @@ kBo kBP naR vOy -hrn +rld vOy aRd aIo @@ -111394,7 +110702,7 @@ lou eBO pRn vOy -ayZ +hOD aCD hFC qmy @@ -111597,10 +110905,10 @@ wdo vOy vOy vOy -qqQ +aTc aoM aoM -vgB +uqU kgs ayT aii @@ -111800,10 +111108,10 @@ mWs lmw vOy dyb -tsM -prx -fpT -eVT +vkp +eUW +aoM +goP kgs ayT aii @@ -112002,9 +111310,9 @@ rDr usy nDo vOy -glB +gWm vkp -ger +iEi aoM aFf mmN @@ -112412,7 +111720,7 @@ hRa vti vti vti -aEZ +kRO vOy ayT akU @@ -112781,7 +112089,7 @@ bdH aaa aaa lYA -aiH +vVn aao aar awi @@ -114123,19 +113431,19 @@ bdg bqZ beH aLJ -bmr -beH -beH -beH +wUv +wTm +wTm +wTm eGB jMR ufh mEE sTw -beH -beH -beH -rJK +xIt +xIt +xIt +rIX gBo beH bqZ @@ -114154,7 +113462,7 @@ oqS nsY hxZ rsM -iMm +vGB gzV bJt oDf @@ -114325,21 +113633,21 @@ beB bCx bqZ beH -bgO +saZ boq boq boq boq -wNT +hZb pVB hsg iPv -kbV +qey uMk uMk uMk uMk -bgO +lGx beH bqZ bCx @@ -114528,21 +113836,21 @@ aLG nyw bqZ beH -bgO +saZ boq boq boq boq -wNT +hZb vBp kNl nhi -kbV +qey uMk uMk uMk uMk -tmB +fBk eBg vKe eVv @@ -114731,21 +114039,21 @@ aLG bdg bqZ beH -bgO +saZ boq boq boq boq -wNT +hZb vBp hWs nhi -kbV +qey uMk uMk uMk uMk -bgO +lGx beH bqZ bdg @@ -114921,12 +114229,12 @@ hfk aLf nsY tUS -bNh -wNl +oZW +gWU nGh -fPp -lqN -kjV +dqO +wLC +oqx nsY aLG awb @@ -114934,21 +114242,21 @@ aLG iuy bqZ beH -bgO +saZ boq boq boq boq -wNT +hZb pUA wga mfM -kbV +qey uMk uMk uMk uMk -bgO +lGx beH bqZ bdg @@ -114956,12 +114264,12 @@ buH hOR buH nsY -aaq -lEL -tuv +wXB +xaZ +jXd eYv -iQt -uZo +opS +iIo xmJ nsY hTf @@ -115124,12 +114432,12 @@ lQu aSm nsY lru -sJY -qJY +rDj +wht qLH -xTW -oGP -cnM +vDZ +dTJ +rsN nsY aLG awb @@ -115138,19 +114446,19 @@ bdg bqZ bqZ bgO -beH -beH -duv -beH +kCK +kCK +rfZ +kCK htI cCD shp oAB gyv -beH -duv -beH -beH +fYB +tIV +fYB +fYB bgO bqZ bqZ @@ -115159,12 +114467,12 @@ buH hOR buH nsY -mKJ -tIb -uAC +laH +uGR +mmD rhQ -pyc -uMn +wkj +orZ ivz nsY gKB @@ -115327,7 +114635,7 @@ ugV vUi nsY weB -axc +feA juD twW vHh @@ -115341,19 +114649,19 @@ bdd bdd bDQ bgO -vGG -vGG +boq +boq bgO -xRJ -xRJ +bDP +bDP xRw bPO whA -xAt -xAt +iXb +iXb bgO -gAj -gAj +uMk +uMk bgO cab bdd @@ -115530,7 +114838,7 @@ qce aSm nsY wpz -oEX +lFh irT tyb xxm @@ -115544,19 +114852,19 @@ beB bdd bqZ bgO -vGG -vGG +boq +boq bgO -xRJ -xRJ +bDP +bDP viO gMU ksN -xAt -xAt +iXb +iXb bgO -gAj -gAj +uMk +uMk bgO bqZ bdd @@ -115565,12 +114873,12 @@ bJz bHT bJz nsY -kzK -lFh -uzP +osN +hKO +iRA pVA -mzV -pML +xsP +mko ivz nsY pEl @@ -115747,19 +115055,19 @@ aLG bdg bqZ qMR -rwv -rwv +kzv +kzv dRT -dqD -dqD -bUb +uJx +uJx +qLq dRT -eWp -eWp -eWp +hMQ +hMQ +hMQ dRT -tXb -tXb +ybW +ybW fOk bqZ bdg @@ -115768,12 +115076,12 @@ buH bHL buH nsY -tXT -kOH -wLG +qUd +bhO +kSR tyb -sZH -tHc +fFb +ppD ivz nsY pcO @@ -115950,19 +115258,19 @@ aLG bdg bqZ beH -vGG -vGG +boq +boq beH -xRJ -xRJ -xRJ +bDP +bDP +bDP beH -xAt -xAt -xAt +iXb +iXb +iXb beH -gAj -gAj +uMk +uMk beH bqZ bdg @@ -116132,18 +115440,18 @@ akX akX cqa bdp -dRG -yiq -sBp -aMV -aMV +fmJ +udh +nuz +akX +akX bBh -tCN -tCN -kNQ +akX +akX +wUE awb -iLQ -lDJ +nxS +udw bBh aLG aLG @@ -116175,18 +115483,18 @@ bHL buH buH cbD -iZH -sDQ +iGF +gyU hOR -xMK -njL -njL +rtb +mfb +mfb cbD -bUM -bUM -mYw -iAT -rdY +eXE +eXE +pcS +nBy +pwk clR eXE gte @@ -116335,9 +115643,9 @@ aNO uYO xqg bdq +enO aQt -aQt -aQt +bhn aQt aQt sOm @@ -116387,7 +115695,7 @@ buI rpd buI buI -buI +bCE buI buI feC @@ -116538,18 +115846,18 @@ aQt bbJ csw bdp -aMM -aNG -bga -taA -aSr -bBh -gyC -wbh -bsX -bAa -bKE -eBj +vob +aLG +iJq +aLG +rdL +iJG +gJh +ooi +wLv +bAV +rdL +iba bBh aLG aNO @@ -116567,12 +115875,12 @@ wCI moQ flW fvf -rgW -vUe -vUe -vUe -vUe -kuw +rAb +sCA +sCA +sCA +sCA +bVw cab bdd bGe @@ -116581,18 +115889,18 @@ bHT bHa buH cbD -bMt -bMt -bOv -bOX -jLK -vUU -cbD -ciU -rOj -bUd -bUF -bUR +rnU +rnU +uNK +snJ +wrn +lvv +osO +leQ +cbv +iEb +iEK +thq clR uqr xkw @@ -116739,21 +116047,21 @@ jUx aLG aNO cmc -jeb -jeb -jeb -uIT -lKb -jeb -jeb -jeb -jeb -jeb -uIT -mWy -jeb -jeb -jeb +aLT +aLT +aLT +rVu +wRw +aLT +aLT +aLT +bSJ +bSJ +moM +iTC +bSJ +bSJ +bSJ aLG aNO aYT @@ -116770,12 +116078,12 @@ cQc nlB ugu oQH -wHo -uWc -wka -tTp -veu -mDW +mnI +qnC +pyR +oYa +vSK +dVe bqZ bdg buH @@ -116783,21 +116091,21 @@ bHa bHT bHa buH -vra -vra -vra -mDT -cgl -vra -vra -vra -vra -vra -mDT -rJx -vra -vra -vra +bGb +bGb +bGb +cbz +rYu +bGb +bGb +bGb +bGb +mMo +vVx +mMo +bGb +bGb +bGb jJe bHa buH @@ -116942,21 +116250,21 @@ aLB dEC aNO qHl -jeb -vlX -aNx -qGc -jhD -jeb -osc -cMV -osc -jeb -aIq -xHp -hmF -vlX -jeb +aLT +bzm +aLT +syh +aOz +csQ +wyP +fme +pFE +sDM +bTy +qCu +bSJ +lyJ +bSJ aNn aNO aYT @@ -116973,12 +116281,12 @@ cQc nlB ugu oQH -wHo -uWc -duw -uWc -fIZ -mDW +mnI +qnC +sJC +qnC +sJV +dVe bqZ bdg buH @@ -116986,21 +116294,21 @@ bHa bHT bHa deH -vra -asX -chf -wDJ -tJz -vra -ukV -oNj -ukV -vra -gll -lpt -mgF -asX -vra +bGb +aZb +jnb +tXq +eCy +bGb +uCT +bGb +aHW +ggp +muP +pml +uDv +uDv +bGb tfw bHa sVf @@ -117145,21 +116453,21 @@ aLB udF aNO nVU -jeb -obE -tdE -qGc -rth -rth -oef -oef -oef -nny -rth -xHp -xwl -rHf -jeb +aLT +xMq +xVq +bdr +bdr +rGj +gsy +gsy +rQA +ckX +clg +clg +duM +fyC +bSJ jgU aNO aYT @@ -117176,12 +116484,12 @@ nBw moQ hGO fvf -uNM -xAt -xAt -xAt -xAt -nNH +vrW +iXb +iXb +iXb +iXb +pzV bqZ bdg buH @@ -117189,21 +116497,21 @@ bHa bHT bHa bKc -vra -bMq -qUq -wDJ -nyQ -nyQ -xJH -xJH -xJH -miV -nyQ -lpt -qYQ -ptj -vra +bGb +qnp +jBc +tXq +buH +vuY +rwI +bGb +wCY +rpQ +cbS +uIz +sgX +vup +bGb lSO bHa haT @@ -117348,21 +116656,21 @@ aLB rlG aNO nFy -jeb -vlX -thA -gAA -gAA -bfn -oMH -coB -rSj -bfn -gAA -gAA -fFD -vlX -jeb +aLT +qSq +aMz +bdC +bdC +rGj +loD +xMq +jLv +ckX +clK +clK +bTA +nQS +bSJ kEb aNO aYT @@ -117392,21 +116700,21 @@ bHa bHT bHa rKy -vra -asX -drj -cgo -cgo -hyk -qyW -khd -kaI -hyk -cgo -cgo -hQc -asX -vra +bGb +aZb +xbS +bHa +bHa +bJz +gsu +bGb +aWy +kXy +uDg +buH +xhA +ycM +bGb hNL bHa rLF @@ -117476,9 +116784,9 @@ mOi rCw rCw lin -oJR +elJ tFe -asD +tCU xQV avK aqU @@ -117551,21 +116859,21 @@ aLB enx aQt xPg -jeb -vlX -tdE -qGc -rth -rth -hNM -vxX -uBO -rth -rth -xHp -xwl -vlX -jeb +bwe +hWK +aMz +bdC +bdC +rGj +loD +xMq +jLv +ckX +clK +clK +lLK +udm +hfQ pGM aNO aYT @@ -117573,12 +116881,12 @@ aNO bad bdd bDQ -lnm -iLh -iLh -iLh -iLh -grR +mng +bCu +bCu +bCu +bCu +wCI moQ ovp fvf @@ -117595,21 +116903,21 @@ bHa bHT bHa bIR -vra -asX -qUq -wDJ -nyQ -lrT -bqW -xaC -qeY -nyQ -nyQ -lpt -qYQ -asX -vra +bGb +aZb +jBc +tXq +buH +pmr +raI +bGb +rPf +bJz +dQJ +bHa +xhA +rtX +bGb mYZ buI lQQ @@ -117754,21 +117062,21 @@ aLB ewo aNO jJs -jeb -obE -thA -qGc -rth -rth -rth -aTW -aTW -rth -rth -xHp -diJ -rHf -jeb +kJS +syh +aMz +bdr +bdr +rGj +iav +iav +dhS +ckX +clg +clg +bTA +cTS +mxb aLG aNO aYT @@ -117776,12 +117084,12 @@ aNO aLG bCx bqZ -cNf -dll -dll -lRs -dll -rJu +udi +ddk +ddk +vvo +ddk +cQc nlB ugu oQH @@ -117798,21 +117106,21 @@ bHa rrV bHa buH -vra -bMq -drj -wDJ -nyQ -nyQ -nyQ -obQ -obQ -nyQ -nyQ -lpt -eBV -ptj -vra +bGb +qnp +xbS +tXq +buH +buH +iTL +bGb +bwb +vXm +dQJ +bJz +tTX +vup +bGb fsH bHa pBn @@ -117882,11 +117190,11 @@ mOi kbH kbH pgH -jDV +vpJ tFe -xVc +kUi xQV -eYz +vwg aqU gjB wDy @@ -117957,21 +117265,21 @@ cmC aLG aNO jJs -jeb -vlX -tdE -qGc -rth -rth -tPI -tPI -iXT -rth -rth -xHp -xwl -vlX -jeb +hxI +nLC +aMz +aMz +aMz +rGj +wyP +tqP +pFE +ckX +bTA +bTA +bTA +uZS +ygd aLG aNO aYV @@ -117979,12 +117287,12 @@ bai bbg bCy bDS -cNf -dll -qSE -nff -dll -rJu +udi +ddk +kpK +uKO +ddk +cQc nlB ugu oQH @@ -118001,21 +117309,21 @@ bHb bHV bHa rbX -vra -asX -qUq -wDJ -nyQ -nyQ -pHA -pHA -nyQ -nyQ -nyQ -lpt -qYQ -asX -vra +bGb +aZb +jBc +tXq +buH +buH +gsu +bGb +vpq +dUf +kPp +dXE +xhA +nKV +bGb mqc ybV buH @@ -118160,21 +117468,21 @@ aLB fTU bbO cmg -jeb -jeb -hfa -jwK -wnY -cLC -eGh -rtA -uKv -nFK -lEO -xWd -oSL -jeb -jeb +bwe +qGR +wqk +lWT +bmm +vvV +aLT +aLT +bSJ +mkg +lOU +eRF +bTA +kev +hfQ aLG aNO aYW @@ -118182,12 +117490,12 @@ sLE bbh bdd bDT -tHv -xRJ -xRJ -xRJ -xRJ -tSB +ngI +bDP +bDP +bDP +bDP +nBw moQ caO fvf @@ -118204,21 +117512,21 @@ iEb bHW bHa buH -vra -vra -eUh -jTI -lzq -nyQ -nhx -eiq -teu -wXH -xBQ -mSU -wVy -vra -vra +bGb +bGb +nGC +fCB +bIS +buH +nkC +bGb +pRo +vXm +cbS +ijR +xhA +mVH +bGb cmd cmh wAR @@ -118363,21 +117671,21 @@ aLB ahj ahj ahj -jeb -tkN -qHg -gAA -beP -bfn -pkz -qfh -ipE -bfn -moI -gAA -cGV -tkN -jeb +aLT +dWN +bdC +bfy +aMz +rGj +qnn +ybD +pso +fGy +ckX +cIr +clK +qBU +bSJ aWM aNO aYX @@ -118407,21 +117715,21 @@ bHd bHX bHa buH -vra -gNq -hXb -cgo -fwY -hyk -nNV -hyk -mBc -hyk -fwY -cgo -skF -gNq -vra +bGb +bvn +hos +bHa +bHY +bJz +nMN +bGb +rwI +vXm +kmR +rKp +tCR +aVm +bGb ajX ajX ajX @@ -118493,7 +117801,7 @@ gfE gfE kpc aqU -gjw +dcy cnp avM aqU @@ -118566,21 +117874,21 @@ aKW wdb ahj ahj -jeb -aMx -qHg -qGc -hxe -aPf -rth -rth -rth -rth -hxe -xHp -cGV -nBa -jeb +aLT +mFX +aMz +bfy +aMz +rGj +xMq +xMq +fyC +fGy +ckX +cIr +bTA +hYe +bSJ beB beB aYW @@ -118610,21 +117918,21 @@ cbS bHW bJz bJz -vra -bMu -hXb -wDJ -ivs -nyQ -nyQ -pHA -nyQ -nyQ -ivs -lpt -skF -pQF -vra +bGb +taj +hos +tXq +bIT +buH +buH +bGb +ulk +fxL +pOo +wGG +xhA +qCk +bGb ajX ajX hBC @@ -118769,21 +118077,21 @@ cno ahj ahj ahj -jeb -iow -aMO -qGc -hxe -rth -hXd -guW -aQM -rth -hxe -xHp -aUi -iow -jeb +aLT +pOp +pSQ +hxF +vlN +wsV +qnn +fNK +pso +uci +uMS +xDK +tjq +sQX +bSJ aLG aNO aYY @@ -118813,21 +118121,21 @@ iEb bHW bHa vMx -vra -wTw -bNE -wDJ -ivs -nyQ -gZr -vWB -bSK -nyQ -ivs -bUi -bUT -wTw -vra +bGb +xiE +vem +tXq +bIT +snJ +eeM +bGb +huA +vXm +dQJ +bJz +xhA +lEc +bGb ajX ajX ajX @@ -118973,20 +118281,20 @@ ahj ahj ahj aLT +aPK +rVu +lbx aLT aLT aLT -ozq -ueZ -aPK aLT -aQN -wsR -dAq -aQL -aQL -aQL -aQL +bSJ +bSJ +bSJ +osg +gFF +bSL +bSJ pGM aNO aYW @@ -119016,21 +118324,21 @@ iEb bHW bHa bIR -bJC -bJC -bJC -bJC -cib -xvE -bQZ -bJC -bSL -moM -rXS -bSJ -bSJ -bSJ -bSJ +bGb +bGb +bGb +bGb +ccu +rYu +xwt +bGb +rPf +bJz +dQJ +vZx +xhA +eeL +bGb ajX ajX ajX @@ -119176,20 +118484,20 @@ ahj ahj ahj aLT -kaB -vVb -aLT -aOy -aOz -mKb +fRY +syh +jdI aLT -vbM -aRP -aSH -aQL -mJP -bSn -aQL +tiL +nsx +fNF +xoR +bhb +bSJ +cEp +cTS +eQZ +bSJ aLG aNO aYZ @@ -119219,21 +118527,21 @@ iEb bHY bHa buH -bJC -jSp -lAQ -bJC -bOZ -bPa -vhR -bJC -mWQ -bTy -bUf -bSJ -hII -iJS -bSJ +bGb +iCi +hwD +bGb +pWW +rtb +dSI +bGb +fEs +mYI +fJh +qYo +igD +gpv +bGb ajX ajX ajX @@ -119379,20 +118687,20 @@ aKW aKW hhw aLT -sXt -aMQ -aNI -bfy +wbZ aMz -sHY -aLT -msm -aRT -xMR -aTw -aUj -kLk -aQL +bfy +qsU +aMQ +iOZ +qug +cuM +bUU +kXm +cIr +bTA +bVb +bSJ aWN aLG aYZ @@ -119422,22 +118730,22 @@ iEb bHY buH fBx -bJC -ojF -bNG -bOx -chR -bJD -mzg -bJC -ycZ -bTA -cIr -gHo -bUU -uDW -bSJ -bSJ +bGb +knG +rNu +pUe +bHY +buH +jRB +bGb +vwt +iDZ +cmw +vup +vup +rZN +bGb +bGb fiq yhQ yhQ @@ -119579,24 +118887,24 @@ aaF aaF aaF aKW -hhw -aLT +aSm +bPV aLT +htd +pSQ +ubO aLT aLT aLT -tNR -aMP -eAg aLT -qoJ -aRZ -aSI -aQL -aQL -aQL -aQL -aQL +bSJ +bSJ +bSJ +jby +tjq +xuR +bSJ +bSJ aLG aYZ sLE @@ -119624,23 +118932,23 @@ bGi iEb bHY buH -bJC -bJC -bJC -bJC -bJC -mjS -bNF -szM -bJC -qrc -bTE -syH -bSJ -bSJ -bSJ -bSJ -bSJ +bGb +bGb +bGb +bGb +bGb +uAl +buH +eOj +bGb +xiD +lbZ +gCq +uFj +bGb +bGb +bGb +bGb fiq yhQ anm @@ -119782,24 +119090,24 @@ aaF aaF aaF aKW -hhw +aSm +aLT aLT -bbY +qKX +toh +uAD bdr bdz bdr -bft -bgU -bhG -aLT -bjs -blA -bno -bpC -brn -aRT -buM -aQL +fNF +clg +rHE +clg +tsD +grw +dXg +bSJ +bSJ aLG aYZ sLE @@ -119827,23 +119135,23 @@ bGj iEb bHY buH -bJC -cdT -cfo -cgq -cfo -chM -cjd -cjA -bJC -ckr -ckQ -clh -clg -clI -clg -clW -bSJ +bGb +tiv +bHa +pUe +bHa +jQT +buJ +jpA +bGb +bGb +bGb +vEJ +bGb +bGb +hpx +hpx +bGb fiq yhQ anm @@ -119985,24 +119293,24 @@ aaF aaF aaF aKW -hhw -aLT -bca -aMC +aSm aLT -avv -bfu -rGj -aQT +jiW +smA +nTl +hxF +uEt aLT -aTv -blB -bnp -aTx -aQL -aUY -buN -aQL +vBv +cWM +hmR +bSJ +swR +xDK +bVb +ttP +rKh +bSJ aLG aYZ sLE @@ -120030,23 +119338,23 @@ bGk iEb bHY buH -bJC -cdU -bMy -bJC -cog -chN -mzg -cdP -bJC -dpO -ckX -cli -coj -bSJ -bVo -clX -bSJ +bGb +pfx +wrn +bGb +kJq +mPQ +buH +vXm +eMt +bGb +oHD +muP +bSd +fpk +woC +woC +bGb fiq yhQ anm @@ -120188,24 +119496,24 @@ aKW aKW aKW aKW -hhw -aLT +aSm aLT +jiW +smA +nTl +iSo aLT aLT aLT -bfx -rGj -aQT aLT -aTv -blB -kiU -aQL -aQL -aQL -aQL -aQL +bSJ +bSJ +bSJ +cxf +bVb +ttP +rKh +bSJ pGM aYZ sLE @@ -120233,23 +119541,23 @@ bGl iEb bHY bIR -bJC -bJC -bJC -bJC -bJC -chO -mzg -cdP -bJC -dpO -ckX -clj -bSJ -bSJ -bSJ -bSJ -bSJ +bGb +bGb +bGb +bGb +bGb +qnX +buH +vXm +eMt +bGb +pWa +gmu +mDY +buH +bHa +hVs +bGb fiq yhQ yhQ @@ -120391,24 +119699,24 @@ bPV aaz bPT eko -bPV -aLT -bco -aMB -bdA +aSm aLT -ial -rGj -aPl +jiW +smA +tuO +daK aLT -aPn -aRU -bnr -aQL -brr -aUZ -buO -aQL +kvx +xSW +siX +nFR +tWx +bSJ +mJC +ntB +ttP +rKh +bSJ aLG aYZ sLE @@ -120420,11 +119728,11 @@ bri bLX bdl rTY -bNP +wAJ bmD -bNP +osV bmD -bNP +bqg bmD mYv doP @@ -120436,23 +119744,23 @@ bII iEb bHY buH -bJC -cdV -bMx -cgr -bJC -raK -mzg -bgW -bJC -ckR -ckX -iyS -bSJ -clJ -bVn -clY -bSJ +bGb +iUl +iDk +flV +bGb +tEL +buH +vXm +eMt +bGb +nno +rwI +mON +eYI +uoD +rwI +bGb fiq iFm anb @@ -120594,24 +119902,24 @@ aSm aLf bbx eko -lLV -aLT -bco -bdr -bdA +aLf aLT -bfw -rGj -aQT +jiW +smA +nTl +sbH aLT -aTv -blB -vJV -aQL -brr -aRT -buO -aQL +ieC +bdr +oYw +clg +xfb +bSJ +aIs +rNM +ttP +rKh +bSJ aLG aYZ sLE @@ -120625,9 +119933,9 @@ bdl bEt bNP bmD -bNP +wBT bmD -bNP +oeN byu obo tiE @@ -120639,23 +119947,23 @@ rqw iEb bHY buH -bJC -cdV -cfo -cgr -bJC -chQ -mzg -cdP -bJC -dpO -ckX -clk -bSJ -clJ -clg -clY -bSJ +bGb +iUl +bHa +flV +bGb +qTG +buH +vXm +eMt +bGb +bGb +hnF +bGb +bGb +upo +bGb +bGb fiq wUS tbK @@ -120797,24 +120105,24 @@ aSm aLf aSm aSm -eko +aLf aLT -bcZ -bdr -bdC +jiW +smA +nTl +tEZ beR -bfy -rGj -aQT -aLT -aTv -blB -bnt -bpG -brs -aRT -bew -aQL +bdC +bdr +fVq +clg +clK +clE +cIr +rNM +ttP +rKh +bSJ beB aYW bzV @@ -120828,9 +120136,9 @@ pWA pXV bNP bmD -bNP +cPG bmD -bNP +xKL bmD lyk bOR @@ -120842,23 +120150,23 @@ bJz cbS bHW bJz -bJC -bKX -cfo -cgs -chk -chR -mzg -cdP -bJC -dpO -ckX -cll -clE -clK -clg -bVy -bSJ +bGb +cAL +bHa +bJz +pUe +bHY +buH +vXm +eMt +bGb +qxw +hmz +qxw +rFV +rfL +rfL +bGb fiq fiq fiq @@ -121002,22 +120310,22 @@ bzF aSm aLf aLT -bco -bdr -bdA -aLT -bfD -aPj -aPl +jiW +smA +nTl +kft aLT -aPn -blB -sNb -aQL -brr -aRT -buO -aQL +ieC +bdr +joa +clg +xfb +bSJ +xDK +rNM +ttP +rKh +bSJ aXS aYZ kfP @@ -121045,23 +120353,23 @@ qLp lYi bIb mHm -bJC -cdV -cfo -cgr -bJC -foL -mzg -bgW -bJC -ckR -ckX -loS -bSJ -clJ -clg -clY -bSJ +bGb +iUl +bHa +flV +bGb +hBL +buH +vXm +eMt +bGb +lWm +jqE +jqE +ggC +bHa +bHa +bGb iGK tbK tbK @@ -121205,22 +120513,22 @@ aSm aSm aLf aLT -bco -aMC -bdA -aLT -bfx -bgY -aQT +jiW +smA +nTl +lFu aLT -aTv -blB -nCp -aQL -brr -aUY -buO -aQL +nxJ +xnc +cxi +hXY +phD +bSJ +mJC +rNM +ttP +rKh +bSJ aLG aYZ sLE @@ -121248,23 +120556,23 @@ pJJ iEb bHY buH -bJC -cdV -bMy -cgr -bJC -chP -mzg -cdP -bJC -dpO -ckX -cln -bSJ -clJ -bVo -clY -bSJ +bGb +iUl +wrn +flV +bGb +vuK +buH +vXm +eMt +bGb +jqE +jqE +jqE +ggC +bHa +bHa +bGb pNG oed oed @@ -121408,28 +120716,28 @@ aKW ycV ktP aLT +jiW +smA +nTl +kzg aLT aLT aLT aLT -hQW -bgY -aQT -aLT -aTv -blB -qhU -aQL -aQL -aQL -aQL -aQL +bSJ +bSJ +bSJ +tbe +rNM +ttP +rKh +bSJ aLG aYZ sLE qFb bdl -bEi +cVH bZr bmD ngw @@ -121451,23 +120759,23 @@ lgX iEb bHY buH -bJC -bJC -bJC -bJC -bJC -uUo -mzg -cdP -bJC -dpO -ckX -sUO -bSJ -bSJ -bSJ -bSJ -bSJ +bGb +bGb +bGb +bGb +bGb +gbd +buH +vXm +eMt +bGb +qxw +qxw +qxw +rFV +hpx +hpx +bGb scI oed yhQ @@ -121611,28 +120919,28 @@ wVb eFH hlz aLT -bcE -aMB -bdD -aLT -bfz -bgY -aPl +jiW +smA +nTl +xwr aLT -aPn -blB -bnu -aQL -brt -aUZ -buS -aQL +bdD +xSW +mXX +nFR +clL +bSJ +owu +rNM +ttP +rKh +bSJ aLG aYZ sLE jJs bdl -brp +imf bZr bmD xId @@ -121654,23 +120962,23 @@ cbw iEb bHY buH -bJC -cdX -bMx -cgt -bJC -chS -bQA -bgW -bJC -ckR -ckX -meu -bSJ -clL -bVn -clZ -bSJ +bGb +eBc +iDk +cem +bGb +dRR +snA +vXm +eMt +bGb +rFV +rFV +rFV +quR +upo +bGb +bGb dGz cAH vTK @@ -121814,22 +121122,22 @@ wVb iDm hlz aLT +jiW +smA +nTl +lOi +aLT bcE bdr -bdD -aLT -rrq -bgY -aQT -aLT -aTv -blB -mtr -aQL -brt -bpC -buS -aQL +ohk +clg +clZ +bSJ +aGu +rNM +ttP +rKh +bSJ aNn aYZ sLE @@ -121857,23 +121165,23 @@ buH iEb bHY buH -bJC -cdX -cfo -cgt -bJC -chQ -cjf -cdP -bJC -dpO -ckX -xoe -bSJ -clL -clg -clZ -bSJ +bGb +eBc +bHa +cem +bGb +qTG +nxP +vXm +eMt +bGb +qxw +qxw +qxw +rFV +rfL +rfL +bGb xRE ebO vTK @@ -122017,28 +121325,28 @@ wVb eFH hlz aLT -abS -bdr -bdC +jiW +smA +nTl +tEZ beS -bfy -bgY -aQT -aLT -aTv -blB -bnt -bpH -brs -bpC -abT -aQL +bdC +bdr +dWi +clg +clK +clF +cIr +rNM +ttP +rKh +bSJ beB aYW bzV beB bdl -buz +iIO bZr bmD dmE @@ -122060,23 +121368,23 @@ cbv cbS bHW bJz -bJC -ack -cfo -cgs -chl -chR -cjf -cdP -bJC -dpO -ckX -cll -clF -clK -clg -acp -bSJ +bGb +vYT +bHa +bJz +pUe +bHY +nxP +vXm +eMt +bGb +jqE +jqE +jqE +ggC +bHa +bHa +bGb vMn vuR vTK @@ -122220,28 +121528,28 @@ wVb hlz eFH aLT -bcE -aMC -bdD +jiW +smA +jwP +kKC aLT -bfC -bgY -aPl -aLT -aPn -aRX -cSQ -aQL -brt -aUY -buS -aQL +bdD +xnc +nkK +hXY +clL +bSJ +ocX +rNM +ttP +rKh +bSJ aLG aYZ sLE uBw bdl -bEm +cVH bZr bmD hAc @@ -122263,23 +121571,23 @@ iRr iEb bHY buH -bJC -cdX -bMy -cgt -bJC -chV -cjf -bgW -bJC -ckR -bTC -mvl -bSJ -clL -bVo -clZ -bSJ +bGb +eBc +wrn +cem +bGb +tGe +nxP +vXm +eMt +bGb +jqE +jqE +jqE +ggC +bHa +bHa +bGb bob emG vTK @@ -122423,22 +121731,22 @@ wVb qnP jPf aLT +jiW +smA +nTl +hXs aLT aLT aLT aLT -bfx -bgY -aQT -aLT -aTv -blB -sNb -aQL -aQL -aQL -aQL -aQL +bSJ +bSJ +bSJ +pwJ +vQs +ttP +rKh +bSJ bxx byF bzW @@ -122466,23 +121774,23 @@ cbz cbU ccu cbz -bJC -bJC -bJC -bJC -bJC -chW -rvT -cdP -bJC -dpO -ckX -hAZ -bSJ -bSJ -bSJ -bSJ -bSJ +bGb +bGb +bGb +bGb +bGb +eSs +tkB +vXm +eMt +bGb +qxw +qxw +qxw +rFV +hpx +hpx +bGb cJP vuR vTK @@ -122626,22 +121934,22 @@ wVb hlz moE aLT -bdJ -bds -aLT -bpL -bfE -njd -aQT +jiW +smA +nTl +hNF +xSW aLT -aTv -blB -uvu -aUZ -aQL -bsS -mqK -aQL +msa +neM +nrB +bSJ +nFR +aIs +rNM +ttP +rKh +bSJ aLG aYZ sLE @@ -122669,23 +121977,23 @@ ttM iEb ccv bIS -bJC -cfp -cgu -bJC -bMx -chQ -cjf -cdP -bJC -dpO -ckX -clo -bVn -bSJ -clM -clS -bSJ +bGb +duK +jeg +bGb +iDk +qTG +nxP +vXm +eMt +bGb +rFV +rFV +rFV +quR +upo +bGb +bGb nOG vuR vTK @@ -122829,22 +122137,22 @@ wVb hlz eFH aLT -beT -bdr -bkg +jiW +smA +nTl +tEZ aMz -bfy -bgY -aPl -aLT -aPn -blB -bnt -aRT -ihY -bpC -dnE -aQL +bkg +bdr +vth +clg +clG +bTA +cIr +rNM +ttP +rKh +bSJ kgr aYW bzV @@ -122872,23 +122180,23 @@ bJz cbS bJz bHW -bJC -bMA -cfo -chm -bJD -chR -cjf -bgW -bJC -ckR -ckX -cll -bTA -clG -clg -bVq -bSJ +bGb +sXr +bHa +pUe +buH +bHY +nxP +vXm +eMt +bGb +qxw +qxw +qxw +rFV +rfL +rfL +bGb njT ydx vTK @@ -123032,22 +122340,22 @@ wVb tAi eFH aLT +jiW +smA +nTl +tEZ +iZr aLT aLT aLT -brv -nuA -bgY -aQT -aLT -aTv -blB -oiQ -lml -aQL -aQL -aQL -aQL +bSJ +bSJ +fLO +cIr +rNM +ttP +rKh +bSJ pGM aYZ sLE @@ -123075,23 +122383,23 @@ qYt iEb bHa bIT -bJC -bJC -bJC -bJC -cdf -jxx -cjf -cdP -bJC -dpO -ckX -rXj -gfo -bSJ -bSJ -bSJ -bSJ +bGb +bGb +bGb +bGb +bMm +bIT +nxP +vXm +eMt +bGb +jqE +jqE +jqE +ggC +bHa +bHa +bGb nOG cAH vTK @@ -123235,22 +122543,22 @@ wVb hlz eFH aLT -beT -bdr -bpK +jiW +smA +nTl +tEZ aMz -bfy -bgY -aQT -aLT -aTv -blB -bnt -aRT -mUx -bpC -dnE -aQL +bpK +bdr +xue +clg +clH +bTA +cIr +rNM +ttP +rKh +bSJ aLG aYZ sLE @@ -123278,23 +122586,23 @@ pJJ iEb bHa bIT -bJC -bMA -cfo -chn -bJD -chR -cjf -cdP -bJC -dpO -ckX -cll -bTA -clH -oFV -bVq -bSJ +bGb +sXr +bHa +pUe +buH +bHY +nxP +vXm +eMt +bGb +lWm +jqE +jqE +ggC +bHa +bHa +bGb fTx lGr vTK @@ -123438,22 +122746,22 @@ wVb eFH hlz aLT -beU -bdv -aLT -bry -bfu -bgY -jVr +jiW +smA +nTl +vnb +xnc aLT -kXa -blB -chL -lAl -aQL -bsW -xvX -aQL +axt +nLS +wkT +bSJ +knQ +xDK +rNM +kDN +rKh +bSJ aLG txe baq @@ -123461,7 +122769,7 @@ jJs bdl ntd iVj -eqb +uEr mLR hdE bdl @@ -123481,23 +122789,23 @@ pJJ vzu vYi bIT -bJC -cfq -cgv -bJC -wqc -chN -cjf -lok -bJC -ihM -ckX -clm -hXY -bSJ -clN -clT -bSJ +bGb +qyO +tzs +bGb +oHf +mPQ +nxP +jZT +eMt +bGb +jqE +jqE +jqE +rFV +hpx +hpx +bGb cJP vuR vTK @@ -123643,20 +122951,20 @@ hlz aLT aLT aLT -aLT +uHM +lIL bwe -cuY -aPo aLT aLT -aQL -aSa -bnA -xhQ -aQL -aQL -aQL -aQL +aLT +bSJ +bSJ +hfQ +rWl +sYH +bSJ +bSJ +bSJ aLG aYO aLG @@ -123684,23 +122992,23 @@ pJJ buH iEb bIT -bJC -bJC -bJC -bJC -qFG -pvJ -bQD -bJC -bJC -bSJ -hss -clp -hfQ -bSJ -bSJ -bSJ -bSJ +bGb +bGb +bGb +bGb +qwU +dFz +oSA +bGb +bGb +bGb +rSE +rSE +rSE +bGb +bGb +bGb +haq wGi woG vTK @@ -123835,7 +123143,7 @@ aaa aaa aaa aaa -aaa +wVb wVb wVb wVb @@ -123844,28 +123152,28 @@ wVb eFH eFH aLT -vZb +bdr tnY -rAN -tIQ -cic -ceg -mdo -mJj -tDZ -nYc -bnB -aVd -aUZ -uqA -bES -kcl +eHd +htH +bjA +aMB +qoL +hoJ +sDM +nFR +rPO +xkG +vyo +tTo +clg +fQA aLG aYO aLG bAX bdl -wIr +plx aQy jAB iYt @@ -123887,23 +123195,23 @@ dhU buH iEb bIT -hNw -wos -bMC -fcB -rUh -jLj -wPC -xZU -hNw -hmC -rQA -hjs -ivM -hcI -hcI -vPK -bSJ +ldq +cuq +kIH +mfb +wGh +iAO +aQl +rxS +ldq +tbT +rwI +buH +buH +oYB +buH +nse +haq nOG vuR vTK @@ -124038,8 +123346,8 @@ aaa aaa aaa aaa -aaa wVb +vjx fTR qaD jeU @@ -124047,22 +123355,22 @@ dHk hlz eFH aWT -aMH -beV -gWE -udG -aOK -dRv +bdr +oQA +rSy +nbh +gQa +cPB +rGj mdo -mJj -ljs -hsW -mFO -bJE -aSE -aVf -bES -kcl +ckX +iDX +gQZ +diy +mga +dbo +clg +fQA aLG aZg bar @@ -124090,23 +123398,23 @@ bdl cbV fpO bIT -hNw -sZq -jZv -cgy -nrw -spS -lBv -pXZ -hNw -bNC -sDM -clr -nvT -aMI -wGE -erG -ewO +ldq +mVG +tXq +mqu +fjB +cWw +iLK +bHa +ldq +tbT +rwI +hos +mqu +buH +slx +idB +sNm bWb cAH luk @@ -124241,31 +123549,31 @@ aaa aaa aaa aaa -aaa wVb -vjx +hlz +hlz eFH eFH eFH eFH eFH aLT -aZf -duV -duV -eUA -bfx -bgY +bdr +ehx +igY +tEZ +lvz +lfn +rGj mdo -mJj -byn -gip -bnt -bJH -iIR -aVf -bES -kcl +ckX +csj +cxS +cIr +rNM +eyh +clg +fQA aLG aYO bZK @@ -124274,12 +123582,12 @@ xfc bCH vZA bCH -bCH -uIp +ecK +cOY +bHm bHm bHm bHm -wNm bCH bCH bHm @@ -124293,23 +123601,23 @@ qic cbW iEb bIT -hNw -sZq -jZv -gnu -bOQ -chR -cjg -urN -hNw -bNC -ckX -vuL -fDh -jGR -jGR -oqu -bSJ +ldq +mVG +tXq +rcN +dHt +bHY +tsj +bHa +ldq +tbT +rwI +buH +lFo +buH +bIT +dnf +haq vuR vuR vuR @@ -124444,48 +123752,48 @@ aaa aaa aaa aaa -aaa wVb -ilZ -eFH -aLT -aLT -aLT -aLT -aLT -aLT -mhI -bjA -xSW -bAd -bCS -aLT +hlz +ejH +dRQ +ejH +ejH +ejH +ejH +ejH +ejH +wMG +igY +tEZ +pYq +pYq +rGj aLT -ksp -gip -brH -chp -chp -aVf -aQL -aQL +mmG +dOa +dOa +cIr +iET +kPJ +clg +bSJ beB aYT bzY aLd aLd bvS -aLd -aLd -aLd -aLd vub vub vub -owW +enh vub vub vub +eIh +aLd +aLd +aLd aLd aLd aLd @@ -124496,27 +123804,27 @@ aLd cbX cbS ccO -bJC -bJC -bMD -vND -vND -chR -cjg -kIP -bJC -bSJ -bTJ -pUf -hji -rPO -ixD -bSJ -bSJ -bSJ -bSJ -bSJ -bSJ +bGb +bGb +eVp +jBb +jBb +bHY +tSy +hpx +bGb +bGb +sXr +buH +tum +buH +bIT +qGJ +qGJ +qGJ +qGJ +qGJ +qGJ vuR ydx vTK @@ -124647,41 +123955,37 @@ aaa aaa aaa aaa -aaa wVb hlz -eFH -aLT -bBg -vPv -oTA -vPv -rAN -tIQ -vme -aNQ -aOL -uIJ -hRd +ejH +mrW +mrW +mrW +oHz +kpF +mrW +ejH aLT -aQL -bmh -bnX -aRo -brA -aVf -lQz -aQL +iPs +hNz +hzA +vKI +rGj +bdC +ckX +iDX +iDX +nqq +qbz +bSJ +clg +bSJ aLG aZi aLG bbs cbh xYP -bbs -gsm -bCM -rbF cJE bOT dLt @@ -124689,7 +123993,11 @@ bRe iFD vRa vub -bPL +reP +reP +pQw +bbs +cTq bCM xSM tez @@ -124699,27 +124007,27 @@ bbr buH iEb bIT -bJC -jht -jZv -cgy -cgy -lbX -uxp -bJC -bJC -bSZ -ckX -bUp -bUN -bVb -ivM -mAV -hzu -qNd -hzu -hcI -bSJ +bGb +pVa +tXq +mqu +mqu +dES +cpu +bGb +bGb +ivC +gNz +buH +buH +buH +bIT +iEG +uEM +ctG +uEM +uEM +qGJ cAH cAH vTK @@ -124850,49 +124158,49 @@ aaa aaa aaa aaa -aaa wVb hlz -hlz -aLT -nuN -nuN -rfa -ehx -ehx -tVq -vme -mLF -tig -uIJ -aPi -aLT -tDZ -gip -uTv -bKC -bOG -aVf -iaq -aQL +ejH +sGK +sGK +mMd +sGK +vas +sGK +ejH +tnY +igY +tFC +pRS +kxP +rGj +bdC +ckX +hmx +aLD +eIk +iET +hcI +clg +bSJ aLG aZi aLG bbs bKD vTS -bbs -ccQ -bCN -rbF -qlz +vub xYf skn bQX ijQ cLl qlz -tez +cgE +cgE +cgE +enN +ccQ bCN ccQ tez @@ -124902,27 +124210,27 @@ bbr buH iEb bIT -bJC -cjC -jZv -lLC -nEo -nZy -cjg -lbf -bJC -bTa -ckX -iWc -cqz -bVb -wty -pWb -pWb -rYp -oEo -oEo -bSJ +bGb +cVo +tXq +xYW +iXM +sFD +tSy +rfL +bGb +fvU +uNK +buH +bGb +bGb +bIT +oYO +iif +iif +iif +nsW +qGJ cAH cea vTK @@ -125053,49 +124361,49 @@ aaa aaa aaa aaa -aaa wVb -rVo hlz +ejH +sGK +sGK +sGK +sGK +vas +sGK +ejH +mfN +igY +hcY +ezA +tqT +rGj aLT -vug -vug -muy -vug -vug -tVq -vme -lJO -uRo -uIJ -aLT -aLT -hWr -gip -xlk -uuj -bRg -aVf -aQL -aQL +mLT +snU +mAv +gwM +iET +mCB +clg +bSJ fvK aZi aLG bbs ydM xYP -bbs -ccQ -cdn -rbF -qlz +vub gYe skn bTx bKQ tXM qlz -tez +moD +moD +cgE +cgE +ccQ bpV ccQ tez @@ -125105,27 +124413,27 @@ bbr buH iEb bIT -bJC -bJC -kGF -chq -bRf -onN -cjg -qki -bJC -bSJ -bTM -bUq -rPE -bVb -wty -wWX -wWX -yle -wWX -wWX -bSJ +bGb +bGb +wrf +aUS +gBB +iQP +tSy +bHa +bGb +bGb +sXr +buH +bGb +qOn +bIT +oYO +iif +iif +iif +iif +qGJ cAH bpJ vTK @@ -125256,49 +124564,49 @@ aaa aaa aaa aaa -aaa wVb -qnP -uia -aLT -iPS -vAE -iKw -vAE -wMG -tIQ -nTl -efK -aMz +hlz +ejH +sGK +mMd +sGK +sGK +vas +sGK +dbQ +tza +rMW +xAF +xAF +rev rGj mdo -mJj -bHp -bIU -tAN -tAN -jOi -aVf -bES -kcl +lIE +aUB +ooJ +uKM +dcI +jCT +clg +fQA aLG aZi aLG bbs dvs xYP -bbs -cdm -bCM -rbF -qlz +vub fOz skn bTx bTx dFF qlz -tez +wUi +vop +cgE +cgE +ccQ bCM ccQ tez @@ -125308,27 +124616,27 @@ bbr buH iEb bIT -hNw -sZq -lef -xRj -wJD -cjE -ozT -pDB -hNw -bNC -ckX -qgN -bTN -sdC -ivM -gEo -scy -vSW -scy -kPJ -bSJ +ldq +mVG +vxd +jbQ +jrU +kQd +lXe +gFy +ldq +tbT +rwI +buH +bGb +qOn +bIT +oYO +iif +nsW +iif +iif +qGJ cAH ubd vTK @@ -125459,79 +124767,79 @@ aaa aaa aaa aaa -aaa wVb -tAi -moE -aLT -aLT -aLT -aLT -aLT -aLT -fbb -nTl -bwf -aMP -bEG +hlz +lkA +hST +hST +hST +hST +jFb +hST +pNI +ehx +ehx +vug +vug +oZG +rGj mdo -mJj -fIM -fIM -sXw -sXw -vfx -aVf -bES -kcl +wfg +lqR +wWX +wWX +pWb +pWb +clg +fQA beB byI beB kFY jmK bDL -bbs -iit -bCN -rbF vub odN odN -gcN +fvn odN odN vub -tez +vnf +cgE +cgE +cgE +iit bCN ccQ tez -ccQ +fuP bCN jhb jiw cbS bHW -hNw -sZq -ltI -vfa -wdz -wdz -nCf -nCf -hNw -bNC -uMS -qmk -rtV -sgR -tvN -bSJ -bSJ -bSJ -bSJ -bSJ -bSJ +ldq +mVG +kne +rkt +bHa +bHa +bHa +bHa +ldq +tbT +rwI +hos +bGb +pvV +jqC +oYO +iif +iif +iif +iif +qGJ pUY emG vTK @@ -125662,31 +124970,31 @@ aaa aaa aaa aaa -aaa wVb -wzg -eFH -aLT -bBg -vPv -oTA -vPv -rAN -tIQ -aNc -aNT -rGj -bdC +hlz +ejH +gYc +pye +pye +pye +tOX +pye +dbQ +iKw +vAE +iPS +vqg +duB +bEG mdo -mJj -sEd -wDK -iMr -wuq -bRV -bSe -bES -kcl +kTT +nsT +vSW +scy +vSW +scy +clg +fQA aLG aZi aLG @@ -125694,18 +125002,18 @@ bBd aPr bfl bSb -byw -bkU -bAY -pur bxm -bPM -jmK -bRa bxm +jmK pur +bxm +bxm +pEd +bxm +bxm +bxm byw -bzI +uyT bAY bSb bEa @@ -125714,27 +125022,27 @@ bBd buH iEb bIT -hNw -sZq -lwJ -cgA -oaW -yiW -oaW -yiW -hNw -bNC -clK -jdm -pQN -snR -ivM -qNd -hzu -mAV -hzu -hcI -bSJ +ldq +mVG +ykc +mMJ +vHk +yeV +vHk +yeV +ldq +tbT +rwI +buH +bGb +qOn +hOR +oYO +iif +iif +iif +nsW +qGJ jea cAH vTK @@ -125791,7 +125099,7 @@ tfb tfb tfb tfb -ptK +ucp alG aYj apd @@ -125813,7 +125121,7 @@ xBe alG aYj apd -jWh +jlQ xXa xXa xXa @@ -125865,79 +125173,79 @@ aaa aaa aaa aaa -aaa wVb -jMi -eFH +hlz +ejH +pye +pye +pye +pye +tOX +pye +ejH aLT -cjc -cjc -vUb -nuN -nuN -cBs -kiV -iSZ -uIJ -kJi aLT aLT -aQL -aQL -aQL -aQL -csZ -odB -aQL -aQL +aLT +nxa +eNe +aLT +qaC +pxT +bSJ +bSJ +bSJ +bSJ +bSJ +bSJ aLG -aZg -tBF -bBe -bFq -bfm -bhg -bvF -cdo -bvF -bvF +cyt +tzf +lXP +hqc +lvL +fGa +rMC +gaj +kbk +rMC +rMC +rMC +xlK bvF -bRa -bRc -bPM bvF bvF bvF cdo bvF bCD -bEb +hMx bFq bBe bFu fpO bIT -bJC -bJC -rbH -cEC -bJC -bJC -bJC -bJC -bJC -bSJ -hTc -bUr -ycd -sAc -wty -oEo -oEo -yfm -fXN -fXN -bSJ +bGb +bGb +iLR +rsZ +bGb +bGb +bGb +bGb +bGb +bGb +buH +buH +bGb +qOn +hOR +oYO +iif +iif +iif +iif +qGJ vuR cAH vTK @@ -126068,79 +125376,79 @@ aaa aaa aaa aaa -aaa wVb -pQG -eFH -aLT -cjc -cjc -vUb -cjc -cjc -cBs -bsU -bwg -bCP -bdC -aLT +hlz +ejH +pye +gYc +pye +pye +tOX +pye +ejH +vPv bBg -uAW -pqK -uAW -tDZ -vil -bpC -qZX -aQL +vPv +tnY +dzX +bdr +rAN +oGI +ijS +mAV +hzu +qNd +hzu +hcI +bSJ kEb aZi bad bbs -cdp -cdp -cdp -cdp bbs -bJf -bJf -bJf -bJf -xba -dNt -dNt -dNt -dNt bbs -fJO -fJO -fJO -fJO +sDv +bMo +bbs +bbs +bbs +bbs +bbs +bbs +bbs +bbs +bbs +bbs +bbs +qKc +bMo +bbs +bbs bbs nmD iEb twT -bJC -lbf -cft -rQV -ohj -wwr -cDs -wwr -lbf -bSJ -gGf -qyi -hXY -sSC -wty -fXN -fXN -yfm -fXN -fXN -bSJ +bGb +rfL +iEb +nbI +dKa +gzO +aQc +gzO +rfL +bGb +bJz +bJz +bGb +bGb +bHT +oYO +iif +iif +nsW +iif +qGJ cAH ydx vTK @@ -126197,7 +125505,7 @@ owg nwU owg owg -ptK +ucp wOh ajP apd @@ -126219,7 +125527,7 @@ xBe alG aYj apd -jWh +jlQ iqH khE khE @@ -126271,79 +125579,79 @@ aaa aaa aaa aaa -aaa wVb -fhA -eFH -aLT -iPS -vAE -iKw -vAE -wMG -tIQ -btc -bwh -uMl -bdC -dII -oLi -fZZ -viS -sXw -sXw -vil -bpC -qDq -kbc +hlz +fJw +qwQ +qwQ +qwQ +uKu +wlS +qwQ +ejH +nuN +muy +vug +vug +dzX +bdr +pfK +oGI +ijS +wWX +wWX +yle +oEo +oEo +xDs aLG aYO aLG bbs -bdw -bfo -rWL -wLm -nHJ -wLm -wLm -wLm -bSa -xba -bSa -wLm -wLm -wLm -nHJ -wLm -lJu -bEd -bFs +rPG +gyA +dve +cgE +vtq +viU +bbs +bjE +bjE +avf +bjE +bjE +bbs +viU +vtq +cgE +cgE +qYq +rPG bbs buH iEb bIT -fzq -oXb -cft -rQV -wdz -wdz -fDJ -bKM -bKM -bZU -clK -qFK -pmq -sUj -ivM -vSW -scy -gEo -scy -kPJ -bSJ +ovN +bHa +iEb +nbI +bHa +bHa +bJz +bHa +bHa +cwM +bHa +bHa +bHa +bHa +bHL +iEG +elN +rzp +elN +elN +qGJ vuR ebO vTK @@ -126474,79 +125782,79 @@ aaa aaa aaa aaa -aaa wVb -vjx -eFH -aLT -aLT -aLT -aLT -aLT -aLT -sCD -pXl -bxB -uWY -wEd -jvp +hlz +ejH +dRQ +ejH +ejH +ejH +ejH +ejH +ejH +bdC +bdC +bdC +bdC +hmL +bjh izG -gBc -gBc -gBc -gBc -ngA -koC -koC -xGE +pBS +oWQ +sFE +sFE +sFE +sFE +sFE +xMy aem mUa aLG -lgy -ccb -xYP -bGn -mlm -mlm -mlm -bxn -mlm -mlm -xba -mlm -mlm -bxn -mlm -mlm -mlm -rXk -xYP -jew -laU +bbs +rPG +gyA +dve +cgE +cgE +cgE +enN +gfe +gfe +jmK +gfe +gfe +enN +cgE +cgE +cgE +cgE +qYq +rPG +bbs buH jGN bJb -uCM -lNw -eFj -iQi -lNw -lNw -lNw -lNw -lNw -erh -rqE -qWt -fXN -rEv -rll -bSJ -bSJ -bSJ -bSJ -bSJ -bSJ +jWS +hWx +tuR +dFw +hWx +hWx +hWx +hWx +hWx +ruI +mRF +mRF +mRF +mRF +gVW +qGJ +qGJ +qGJ +qGJ +qGJ +qGJ vuR tAR vTK @@ -126677,74 +125985,74 @@ aaa aaa aaa aaa -aaa wVb -fTR hlz hlz hlz hlz -fTR hlz -aLT -cjc -cjc -uJU +hlz +fTR +rdK +nuN +nuN +rfa cjc cjc -aLT -lDV -fZZ -hEb -qDq -qDq -jOx -bpC -qDq -aQL +nSu +bdr +pfK +clg +rpM +fXN +fXN +rYp +oEo +oEo +bSJ jKA aYT beB -lgy -bsG -xYP -rWL -dMB -dMB -dMB -dMB -dMB -fsV -xba -fsV -dMB -dMB -dMB -dMB -dMB -lJu -xYP -hLI -laU +bbs +rPG +gyA +vcI +ebs +ebs +ebs +ebs +ebs +ebs +xAL +cgE +cgE +cgE +cgE +cgE +cgE +cgE +qYq +rPG +bbs drt rZF bJz -bJC -oXb -cfo -lkM -oXb -oXb -oka -bKM -tEO -bSJ -fXN -fXN -kPJ -fXN -fXN -bSJ +bGb +bHa +bHa +qcS +bHa +bHa +bJz +bHa +bHa +bGb +pjH +pjH +vsd +pjH +pjH +bGb rHs ngs vuR @@ -126803,7 +126111,7 @@ bNM iEr fhH eNi -ueG +pUh rPt jyE eNi @@ -126880,74 +126188,74 @@ aaa aaa aaa aaa -aaa wVb wVb wVb wVb wVb -hlz -eFH -hlz -aLT +wVb +uia +wSW +rdK iPS vAE -meY iPS vAE -aLT -iPS -wDK -iMr -wDK -rou -jOx -bpC -ksp -aQL -aLG -bSY -aWR -cau -bCG -cgE -bJe -jmK -xYP -xYP -xYP -xYP -jmK -xba -jmK -xYP -xYP -xYP -xYP -jmK -hcw -cgE -hLI -blq -bIT -jHe -bIS -bJC -kIP -cfo -lkM -oaW -yiW -oaW -yiW -kIP -bSJ +uJU +nSu +bdr +wMG +clg +rpM vSW scy -oer vSW scy +kPJ bSJ +aLG +aYO +aLG +nWC +mMc +kbk +ktz +ovq +kbk +ovq +ovq +ovq +kbk +ovq +ovq +ovq +kbk +ovq +ovq +kbk +dMJ +kbk +kNz +bbs +bIT +jHe +bIS +bGb +hpx +bHa +qcS +vHk +yeV +vHk +yeV +hpx +bGb +mRQ +aUS +mJz +eer +aUS +bGb tSr pUY lGr @@ -127002,7 +126310,7 @@ qJx hsr mDJ ptK -bNM +aeM iEr owg eNi @@ -127091,66 +126399,66 @@ aaa wVb rVo eFH -hlz +rdK +aLT +aLT +aLT aLT -meY -meY -meY -meY -meY -meY aLT -aQL -aQL -aQL -aQL -pyl -pDt -aQL -aQL +fFF +gXg +aLT +hyV +iar +bSJ +bSJ +bSJ +bSJ +bSJ +bSJ aLG aYO aLG -lgy -ccN -xYP -rWL -wLm -wLm -wLm -wLm -wLm -bSa -xba -bSa -wLm -wLm -wLm -wLm -wLm -lJu -xYP -hLI -laU +bbs +bbs +cNT +bbs +bbs +cNT +bbs +bbs +bbs +cNT +bbs +bbs +bbs +cNT +bbs +bbs +cNT +bbs +cNT +bbs +bbs eUz iEb bIT -bJC -bJC -vLA -oHc -bJC -bJC -bJC -bJC -bJC -oer -oer -oer -oer -oer -oer -oer +bGb +bGb +tVn +sIW +bGb +bGb +bGb +bGb +bGb +mJz +mJz +mJz +mJz +mJz +mJz +mJz ybr vuR ebO @@ -127295,57 +126603,57 @@ wVb cbZ eFH eFH -eFH -eFH -eFH -eFH -eFH hlz +aLT +rAN +rAN +tnY +nSu +bdr +rAN +clg +rpM +hcI +hcI +hcI +bSJ eFH -hlz -aQL -qZX -qZX -tDZ -jOx -bpC -qZX -aQL +rdK aLG aYO aLG -lgy -ccb -xYP -bGn -mlm -mlm -mlm -bxn -mlm -mlm -xba -mlm -mlm -bxn -mlm -mlm -mlm -rXk -xYP -jew -laU +bbs +jPv +cgE +bbs +gsj +cgE +rXb +bbs +xPB +cgE +iCM +bbs +daY +cgE +bbs +xki +cgE +bbs +cgE +wEU +bbs buH iEb bIT -bJC -lbf -cfo -lkM -lbf -lbf -lbf -bJC +bGb +rfL +bHa +qcS +rfL +rfL +rfL +bGb vuR oyG vuR @@ -127499,56 +126807,56 @@ bbv hJb hlz hlz -hlz -hlz -wZH -hlz -hlz -hlz -hlz -aQL -qDq -qDq -qDq -jOx -bpC -qDq -bTb +aLT +cjc +cjc +cjc +nSu +bdr +ray +clg +rpM +fXN +fXN +fXN +bSJ +eFH +lWD aLG aYO aLG bbs -ccd -ccN -rWL -dMB -uVD -dMB -dMB -dMB -fsV -xba -fsV -dMB -dMB -dMB -uVD -dMB -lJu -huK -jeQ +iXG +wZI +bbs +gsj +wZI +rXb +bbs +xPB +wZI +suD +bbs +fAI +wZI +bbs +jWC +wZI +bbs +wZI +fAG bbs buH iEb bIT -xSw -oXb -cfo -lkM -oXb -oXb -oXb -bJC +aRO +bHa +bHa +qcS +bHa +bHa +bHa +bGb vuR cAH vuR @@ -127701,57 +127009,57 @@ wVb wVb wVb wVb -wVb -wVb -wVb -wVb -wVb -wVb -eFH -rdK -aQL -qDq -qDq -qDq -osA -cHl -cHl -bTb +hlz +aLT +cjc +cjc +cjc +pzD +gRl +hMg +fYE +kZv +fXN +fXN +fXN +bSJ +hlz +lWD beB aYT beB bbs -cdp -cdp -jks -cdp bbs -bJf -bJf -bJf -bJf -xba -dNt -dNt -dNt -dNt bbs -fJO -fJO -fJO -fJO +bbs +bbs +bbs +bbs +bbs +bbs +bbs +bbs +bbs +bbs +bbs +bbs +bbs +bbs +bbs +bbs +bbs bbs bJz cbS bHW -xSw -ejo -ejo -niY -oXb -oXb -oXb -bJC +aRO +cIy +cIy +fDx +bHa +bHa +bHa +bGb cAH vuR vuR @@ -127903,23 +127211,23 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa wVb -iDm -fTR -aQL -ksp -ksp -rou -qDq -qDq -qDq -bTb +hlz +aLT +wMG +wMG +uJU +cjc +cjc +pfK +fXN +fXN +kPJ +oGF +kPJ +bSJ +hlz +lWD aLG aYO aLG @@ -127947,14 +127255,14 @@ cbD buH iEb bIT -xSw -oXb -oXb -oXb -kIP -qer -kIP -bJC +aRO +bHa +bHa +bHa +hpx +jJh +hpx +bGb cAH pFP ebO @@ -128106,23 +127414,23 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa wVb -eFH hlz -aQL -aQL -aQL -aQL -ksp -rou -rou -aQL +aLT +aLT +aLT +aLT +wMG +uJU +wMG +oGF +kPJ +bSJ +bSJ +bSJ +bSJ +eFH +rdK aLG aZl tBF @@ -128150,17 +127458,17 @@ cbE bFu bIl bIX -bJC -kIP -qer -kIP -bJC -bJC -bJC -bJC -vuR +bGb +hpx +jJh +hpx +bGb +bGb +bGb +bGb vuR vuR +dBz vTK aaa aaa @@ -128309,14 +127617,7 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa wVb -eFH hlz hlz gjN @@ -128326,6 +127627,13 @@ rdK rdK rdK rdK +rdK +rdK +hlz +hlz +hlz +eFH +rdK tfl aZm aWR @@ -128353,11 +127661,11 @@ cdZ buJ buJ jMb -bJC -bJC -bJC -bJC -bJC +bGb +bGb +bGb +bGb +bGb cAH cAH cAH @@ -128512,16 +127820,16 @@ aaa aaa aaa bdH -aaa -aaa -aaa -aaa -aaa -aaa wVb -jmg +wVb +wVb +wVb +hlz +hlz hlz eFH +fTR +iHH eFH hlz hlz @@ -128654,7 +127962,7 @@ alO alO aEp lIw -aEp +oTU jWh nDL vyI @@ -128718,11 +128026,11 @@ bdH aaa aaa aaa -aaa -aaa -aaa wVb -epA +hlz +hlz +hlz +ykL wDm hlz hlz @@ -128829,14 +128137,14 @@ aag cuC cuC cuC -bNM +aeM iEr owg owg dWX owg owg -ptK +ucp aGD aPb apj @@ -128857,8 +128165,8 @@ aPa aqq aGD aPb -kff -jWh +apj +jlQ xXa xXa xXa @@ -128921,13 +128229,13 @@ bdH aaa aaa aaa -aaa -aaa -aaa +wVb +wVb +wVb wVb pIk -bNT -wul +sVZ +kMk eFH eFH eFH @@ -129231,8 +128539,8 @@ bdH bdH aaa aaa -aaa -aaa +bdH +bdH aad uMc bNM @@ -129241,8 +128549,8 @@ uZH bFt kPG kPG -cVw -ptK +kPG +ucp aIe anR lNl @@ -129264,12 +128572,12 @@ aqq aIe iYj lNl -jWh +jlQ tim uWV ttd nLk -rCD +jRC eYR uIv pql @@ -129434,17 +128742,17 @@ aaa aaa bdH bdH -bdH aac -aag +cuC +cuC cuC htb pfc -ptK +ucp ptK ucp cIW -ptK +ucp ptK psm dKm @@ -129472,7 +128780,7 @@ jWh olk jWh jWh -jWh +jlQ jAJ lAu bYn @@ -129637,16 +128945,16 @@ aaa aaa bdH bdH -bdH -cuC -cuC +aad cuC -bNM +uiG +tfb +rFy ofK +fcP ptK -uXL gPc -trB +jHL exy ptK psm @@ -129674,14 +128982,14 @@ jWh qCg xjw pfA -xAC jWh -lbB +thV +uWV uIv bYn bYn bYn -aaa +ajY aaa aaa aaa @@ -129840,16 +129148,16 @@ aaa aaa bdH bdH -bdH +aad cuC -uiG -tfb -rFy +bNM +mDJ +mDJ ofK -ptK -uXL -eet fcP +ptK +gPc +kSd pDh ptK xlX @@ -129876,15 +129184,15 @@ cxo jWh uUV rsW -rsW -fnQ +naQ jWh -lbB +thV +uWV cKL xXa xoO bYn -aaa +ajZ aaa aaa aaa @@ -130043,14 +129351,14 @@ aaa aaa bdH bdH -bdH +aad cuC bNM -rmf +uXL luY ncp +lht ptK -cQg wxj lht rYv @@ -130080,14 +129388,14 @@ jWh dkS rsW naQ -fnQ jWh +thV xPZ pcv -eYR +cQg uIv bYn -aaa +ajZ aaa aaa aaa @@ -130246,11 +129554,11 @@ aaa aaa bdH bdH -bdH +aad cuC aeM -ofK -ptK +rtd +fcP ptK ptK ptK @@ -130284,13 +129592,13 @@ jWh kLc jWh jWh -jWh -jWh -jWh -lbB +jGf +khE +ovi +uWV oCf bYn -aaa +ajZ aaa bdH aaa @@ -130449,13 +129757,13 @@ aaa bdH bdH bdH -bdH +aad uMc bNM -ofK +rtd +fcP psm -kSd -dmQ +cVw tZm dmQ xlX @@ -130482,18 +129790,18 @@ eky aNe vuv ahb -cxo +kfv nJy boC -cxo -iwh -kfv -vGr +fnQ vuv -lbB +vuv +vuv +thV +uWV uIv pql -bdH +ajZ bdH bdH bdH @@ -130652,13 +129960,13 @@ aaa bdH bdH bdH -bdH +aad uMc bNM -ofK +rtd +fcP psm -kSd -dmQ +cVw nwu dmQ xlX @@ -130688,15 +129996,15 @@ woM nqD cxo boC -cxo +jgC qMf wUN -jgC vuv -lbB +thV +uWV uIv pql -bdH +ajZ bdH bdH bdH @@ -130855,16 +130163,16 @@ aaa bdH bdH bdH -bdH +aad uMc bNM rtd +fcP hSu xlX xlX xlX xlX -xlX aiE dmQ atD @@ -130894,12 +130202,12 @@ fbx fbx fbx fbx -fbx iEs +gIJ uWV uIv pql -bdH +ajZ bdH bdH bdH @@ -131058,11 +130366,11 @@ aaa aaa bdH bdH -bdH +aad cuC htb pfc -psm +ucp psm psm psm @@ -131098,11 +130406,11 @@ hPg vuv vuv vuv -vuv -jAJ +jlQ +lbB lAu bYn -bdH +ajZ bdH bdH bdH @@ -131261,7 +130569,7 @@ aaa aaa aaa aaa -bdH +aad cuC bNM tgK @@ -131300,12 +130608,12 @@ qMu qMu qMu euY -vME -jHL +vGr +xXa wOK uIv bYn -bdH +ajZ bdH bdH bdH @@ -131464,9 +130772,9 @@ aaa bdH bdH bdH -bdH +aad cuC -riJ +bNM kHY uhM fcP @@ -131508,7 +130816,7 @@ rDb qjV rID bYn -bdH +ajZ bdH bdH bdH @@ -131667,10 +130975,10 @@ aaa bdH bdH bdH -bdH -cuC +aad cuC umy +riJ iKZ tiw cuC @@ -131683,7 +130991,7 @@ mNX mNX cus aPw -aPw +aMT atM bGc atK @@ -131695,7 +131003,7 @@ aMU atM bGc atK -aPw +aMT aPw mNX mNX @@ -131711,7 +131019,7 @@ kHS rID bYn bYn -bdH +afm bdH bdH bdH @@ -131870,8 +131178,8 @@ aaa bdH bdH bdH -bdH -aad +aae +aKQ cuC mkH rtd @@ -131885,7 +131193,7 @@ xVk xVk xVk xVk -aad +aPw aPw vgD mhG @@ -131899,7 +131207,7 @@ eAL dPC ihX aPw -ajZ +aPw xVk xVk xVk @@ -136810,14 +136118,14 @@ daz daz hRW asZ -vXh +nqp daz daz kfU daz rna rna -lnS +bsv uVv yit rna @@ -137212,22 +136520,22 @@ lmz lmz lmz daz -acJ +hLQ ubA cck wyQ fmv ubA -gMN +jAw mRn -itf +ssm mHE vAU -qwJ +rrA fJY -kzT +krj wkM -oLm +aEP fcX kKv kKv @@ -137418,7 +136726,7 @@ daz cwS ffE vHa -wpw +xhW ffE ffE ffE @@ -137624,16 +136932,16 @@ mdW jaH awu ydI -aKs +bMk fMt -gOs +qYT kXj pYi -fMl +kmx gUN -bLv +xTN wkM -xvM +lGY osy cBm cBm @@ -138026,7 +137334,7 @@ lmz lmz daz daz -ocB +ohe nJH rnH daz @@ -138035,7 +137343,7 @@ sTV daz rna rna -gbg +dlf uVv erN rna @@ -138640,9 +137948,9 @@ lmz daz rzf bRo -wyv +gGN pTt -gAe +hoC rCi gba mUz diff --git a/maps/map_files/USS_Runtime/USS_Runtime.dmm b/maps/map_files/USS_Runtime/USS_Runtime.dmm index aec89c5882dd..0371f7bad0c9 100644 --- a/maps/map_files/USS_Runtime/USS_Runtime.dmm +++ b/maps/map_files/USS_Runtime/USS_Runtime.dmm @@ -193,6 +193,12 @@ icon_state = "plating" }, /area/event) +"Z" = ( +/obj/effect/landmark/start/tank_crew, +/turf/open/floor/almayer{ + icon_state = "plating" + }, +/area/event) (1,1,1) = {" a @@ -289,7 +295,7 @@ a A l L -b +Z b b b diff --git a/maps/shuttles/dropship_alamo.dmm b/maps/shuttles/dropship_alamo.dmm index 7c49edfdd0d2..756ebedb045a 100644 --- a/maps/shuttles/dropship_alamo.dmm +++ b/maps/shuttles/dropship_alamo.dmm @@ -371,6 +371,19 @@ /obj/structure/shuttle/part/dropship1/transparent/engine_left_exhaust, /turf/open/space/basic, /area/shuttle/drop1/sulaco) +"Fy" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/shuttle/dropship{ + icon_state = "rasputin15" + }, +/area/shuttle/drop1/sulaco) "FA" = ( /obj/structure/shuttle/part/dropship1/transparent/engine_left_cap, /turf/template_noop, @@ -519,6 +532,21 @@ icon_state = "31" }, /area/shuttle/drop1/sulaco) +"SB" = ( +/obj/structure/bed/chair/vehicle{ + pixel_x = -8; + dir = 4; + layer = 3.1 + }, +/obj/structure/bed/chair/vehicle{ + pixel_x = -8; + dir = 4; + pixel_y = 13 + }, +/turf/open/shuttle/dropship{ + icon_state = "rasputin15" + }, +/area/shuttle/drop1/sulaco) "SM" = ( /turf/closed/shuttle/dropship1{ icon_state = "47" @@ -700,8 +728,8 @@ ws TK il il -TK -ws +SB +Fy SM de de diff --git a/maps/shuttles/dropship_normandy.dmm b/maps/shuttles/dropship_normandy.dmm index f1595cd97db9..3dc6ac66b0f1 100644 --- a/maps/shuttles/dropship_normandy.dmm +++ b/maps/shuttles/dropship_normandy.dmm @@ -235,6 +235,19 @@ icon_state = "rasputin5" }, /area/shuttle/drop2/sulaco) +"rr" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/shuttle/dropship{ + icon_state = "rasputin15" + }, +/area/shuttle/drop2/sulaco) "rw" = ( /obj/structure/shuttle/part/dropship2/nose_front_right, /turf/template_noop, @@ -621,6 +634,21 @@ icon_state = "81" }, /area/shuttle/drop2/sulaco) +"Uc" = ( +/obj/structure/bed/chair/vehicle{ + pixel_x = -8; + dir = 4; + layer = 3.1 + }, +/obj/structure/bed/chair/vehicle{ + pixel_x = -8; + dir = 4; + pixel_y = 13 + }, +/turf/open/shuttle/dropship{ + icon_state = "rasputin15" + }, +/area/shuttle/drop2/sulaco) "Uu" = ( /obj/structure/shuttle/part/dropship2/transparent/engine_right_exhaust, /turf/template_noop, @@ -733,8 +761,8 @@ mz SY PJ PJ -SY -it +Uc +rr Eo Cl SO diff --git a/sound/effects/bang-bang.ogg b/sound/effects/bang-bang.ogg new file mode 100644 index 000000000000..636bac6cfdf4 Binary files /dev/null and b/sound/effects/bang-bang.ogg differ diff --git a/sound/lobby/darkday.ogg b/sound/lobby/darkday.ogg new file mode 100644 index 000000000000..cd447e8ade5e Binary files /dev/null and b/sound/lobby/darkday.ogg differ diff --git a/sound/lobby/govnovoz.ogg b/sound/lobby/govnovoz.ogg new file mode 100644 index 000000000000..9f043bc8de76 Binary files /dev/null and b/sound/lobby/govnovoz.ogg differ diff --git a/sound/lobby/hf2.ogg b/sound/lobby/hf2.ogg new file mode 100644 index 000000000000..3b1a3bc1784c Binary files /dev/null and b/sound/lobby/hf2.ogg differ diff --git a/sound/lobby/lv426.ogg b/sound/lobby/lv426.ogg new file mode 100644 index 000000000000..96ce14154821 Binary files /dev/null and b/sound/lobby/lv426.ogg differ diff --git a/sound/lobby/mesa.ogg b/sound/lobby/mesa.ogg new file mode 100644 index 000000000000..9f495dce5368 Binary files /dev/null and b/sound/lobby/mesa.ogg differ diff --git a/sound/lobby/primovictoria.ogg b/sound/lobby/primovictoria.ogg new file mode 100644 index 000000000000..aef71d1e0ca9 Binary files /dev/null and b/sound/lobby/primovictoria.ogg differ diff --git a/sound/lobby/prosvistela.ogg b/sound/lobby/prosvistela.ogg new file mode 100644 index 000000000000..927e6adce589 Binary files /dev/null and b/sound/lobby/prosvistela.ogg differ diff --git a/sound/lobby/rome.ogg b/sound/lobby/rome.ogg new file mode 100644 index 000000000000..e8392f1e6e14 Binary files /dev/null and b/sound/lobby/rome.ogg differ diff --git a/sound/lobby/teardrop.ogg b/sound/lobby/teardrop.ogg new file mode 100644 index 000000000000..e8ca8f1f2bcf Binary files /dev/null and b/sound/lobby/teardrop.ogg differ diff --git a/sound/lobby/warrior.ogg b/sound/lobby/warrior.ogg new file mode 100644 index 000000000000..315fbe4754ba Binary files /dev/null and b/sound/lobby/warrior.ogg differ diff --git a/sound/soundlist.txt b/sound/soundlist.txt index 8b5daaa90fc7..8cec728c5591 100644 --- a/sound/soundlist.txt +++ b/sound/soundlist.txt @@ -1,3 +1,13 @@ +sound/lobby/warrior.ogg +sound/lobby/rome.ogg +sound/lobby/teardrop.ogg +sound/lobby/prosvistela.ogg +sound/lobby/primovictoria.ogg +sound/lobby/mesa.ogg +sound/lobby/lv426.ogg +sound/lobby/hf2.ogg +sound/lobby/govnovoz.ogg +sound/lobby/darkday.ogg sound/misc/Game_Over_Man.ogg sound/misc/asses_kicked.ogg sound/misc/hardon.ogg diff --git a/sound/voice/ru_joe/ay-ya-yay.ogg b/sound/voice/ru_joe/ay-ya-yay.ogg new file mode 100644 index 000000000000..9b0630ebb6d4 Binary files /dev/null and b/sound/voice/ru_joe/ay-ya-yay.ogg differ diff --git a/sound/voice/ru_joe/budetenakazani.ogg b/sound/voice/ru_joe/budetenakazani.ogg new file mode 100644 index 000000000000..2a241ebb7cdc Binary files /dev/null and b/sound/voice/ru_joe/budetenakazani.ogg differ diff --git a/sound/voice/ru_joe/chemdelo.ogg b/sound/voice/ru_joe/chemdelo.ogg new file mode 100644 index 000000000000..650e37ea075c Binary files /dev/null and b/sound/voice/ru_joe/chemdelo.ogg differ diff --git a/sound/voice/ru_joe/chtoeto (2).ogg b/sound/voice/ru_joe/chtoeto (2).ogg new file mode 100644 index 000000000000..f8c30b582929 Binary files /dev/null and b/sound/voice/ru_joe/chtoeto (2).ogg differ diff --git a/sound/voice/ru_joe/chtoeto.ogg b/sound/voice/ru_joe/chtoeto.ogg new file mode 100644 index 000000000000..4696909dd07f Binary files /dev/null and b/sound/voice/ru_joe/chtoeto.ogg differ diff --git a/sound/voice/ru_joe/chtoproishodit.ogg b/sound/voice/ru_joe/chtoproishodit.ogg new file mode 100644 index 000000000000..5c9edc6be007 Binary files /dev/null and b/sound/voice/ru_joe/chtoproishodit.ogg differ diff --git a/sound/voice/ru_joe/chtotakoe.ogg b/sound/voice/ru_joe/chtotakoe.ogg new file mode 100644 index 000000000000..960e696ab53e Binary files /dev/null and b/sound/voice/ru_joe/chtotakoe.ogg differ diff --git a/sound/voice/ru_joe/chtovizdesdelaete.ogg b/sound/voice/ru_joe/chtovizdesdelaete.ogg new file mode 100644 index 000000000000..e84ab1da9621 Binary files /dev/null and b/sound/voice/ru_joe/chtovizdesdelaete.ogg differ diff --git a/sound/voice/ru_joe/delapovazhnee.ogg b/sound/voice/ru_joe/delapovazhnee.ogg new file mode 100644 index 000000000000..413e1f057ada Binary files /dev/null and b/sound/voice/ru_joe/delapovazhnee.ogg differ diff --git a/sound/voice/ru_joe/dobriyden.ogg b/sound/voice/ru_joe/dobriyden.ogg new file mode 100644 index 000000000000..cb61888e1854 Binary files /dev/null and b/sound/voice/ru_joe/dobriyden.ogg differ diff --git a/sound/voice/ru_joe/dolozitapolo.ogg b/sound/voice/ru_joe/dolozitapolo.ogg new file mode 100644 index 000000000000..725b291d5da9 Binary files /dev/null and b/sound/voice/ru_joe/dolozitapolo.ogg differ diff --git a/sound/voice/ru_joe/drugihdel.ogg b/sound/voice/ru_joe/drugihdel.ogg new file mode 100644 index 000000000000..3e2c17364d4c Binary files /dev/null and b/sound/voice/ru_joe/drugihdel.ogg differ diff --git a/sound/voice/ru_joe/etovi-yahochupomoch.ogg b/sound/voice/ru_joe/etovi-yahochupomoch.ogg new file mode 100644 index 000000000000..592b71f379f1 Binary files /dev/null and b/sound/voice/ru_joe/etovi-yahochupomoch.ogg differ diff --git a/sound/voice/ru_joe/joinus.ogg b/sound/voice/ru_joe/joinus.ogg new file mode 100644 index 000000000000..a205c8924fb8 Binary files /dev/null and b/sound/voice/ru_joe/joinus.ogg differ diff --git a/sound/voice/ru_joe/ktoetosdelal.ogg b/sound/voice/ru_joe/ktoetosdelal.ogg new file mode 100644 index 000000000000..20c2380d1438 Binary files /dev/null and b/sound/voice/ru_joe/ktoetosdelal.ogg differ diff --git a/sound/voice/ru_joe/kudasobralis.ogg b/sound/voice/ru_joe/kudasobralis.ogg new file mode 100644 index 000000000000..c945f175d919 Binary files /dev/null and b/sound/voice/ru_joe/kudasobralis.ogg differ diff --git a/sound/voice/ru_joe/malihdetalah.ogg b/sound/voice/ru_joe/malihdetalah.ogg new file mode 100644 index 000000000000..715ad4bb6d06 Binary files /dev/null and b/sound/voice/ru_joe/malihdetalah.ogg differ diff --git a/sound/voice/ru_joe/mne.ogg b/sound/voice/ru_joe/mne.ogg new file mode 100644 index 000000000000..1c48da51189d Binary files /dev/null and b/sound/voice/ru_joe/mne.ogg differ diff --git a/sound/voice/ru_joe/nadeusuvasestrazre.ogg b/sound/voice/ru_joe/nadeusuvasestrazre.ogg new file mode 100644 index 000000000000..d0bd9a24bb24 Binary files /dev/null and b/sound/voice/ru_joe/nadeusuvasestrazre.ogg differ diff --git a/sound/voice/ru_joe/nado-posmotret.ogg b/sound/voice/ru_joe/nado-posmotret.ogg new file mode 100644 index 000000000000..556b4f166aa8 Binary files /dev/null and b/sound/voice/ru_joe/nado-posmotret.ogg differ diff --git a/sound/voice/ru_joe/narusheniekarantina.ogg b/sound/voice/ru_joe/narusheniekarantina.ogg new file mode 100644 index 000000000000..880bd0ceefae Binary files /dev/null and b/sound/voice/ru_joe/narusheniekarantina.ogg differ diff --git a/sound/voice/ru_joe/ne_begite.ogg b/sound/voice/ru_joe/ne_begite.ogg new file mode 100644 index 000000000000..24e36eee8fc0 Binary files /dev/null and b/sound/voice/ru_joe/ne_begite.ogg differ diff --git a/sound/voice/ru_joe/nedergaytes.ogg b/sound/voice/ru_joe/nedergaytes.ogg new file mode 100644 index 000000000000..6e9bb435aabf Binary files /dev/null and b/sound/voice/ru_joe/nedergaytes.ogg differ diff --git a/sound/voice/ru_joe/neizvestnoesuchestvo.ogg b/sound/voice/ru_joe/neizvestnoesuchestvo.ogg new file mode 100644 index 000000000000..5577a2113ebe Binary files /dev/null and b/sound/voice/ru_joe/neizvestnoesuchestvo.ogg differ diff --git a/sound/voice/ru_joe/nesmogpomoch.ogg b/sound/voice/ru_joe/nesmogpomoch.ogg new file mode 100644 index 000000000000..78b9918335c4 Binary files /dev/null and b/sound/voice/ru_joe/nesmogpomoch.ogg differ diff --git a/sound/voice/ru_joe/netsmislapryatatsa.ogg b/sound/voice/ru_joe/netsmislapryatatsa.ogg new file mode 100644 index 000000000000..7659ccd2f957 Binary files /dev/null and b/sound/voice/ru_joe/netsmislapryatatsa.ogg differ diff --git a/sound/voice/ru_joe/nu-nu.ogg b/sound/voice/ru_joe/nu-nu.ogg new file mode 100644 index 000000000000..1135dd4978f0 Binary files /dev/null and b/sound/voice/ru_joe/nu-nu.ogg differ diff --git a/sound/voice/ru_joe/ognestrelnoeoruzie.ogg b/sound/voice/ru_joe/ognestrelnoeoruzie.ogg new file mode 100644 index 000000000000..2631f4d1c5ad Binary files /dev/null and b/sound/voice/ru_joe/ognestrelnoeoruzie.ogg differ diff --git a/sound/voice/ru_joe/opasniepredmeti.ogg b/sound/voice/ru_joe/opasniepredmeti.ogg new file mode 100644 index 000000000000..9876d0c245d2 Binary files /dev/null and b/sound/voice/ru_joe/opasniepredmeti.ogg differ diff --git a/sound/voice/ru_joe/opyatproblema.ogg b/sound/voice/ru_joe/opyatproblema.ogg new file mode 100644 index 000000000000..969a13b62ae6 Binary files /dev/null and b/sound/voice/ru_joe/opyatproblema.ogg differ diff --git a/sound/voice/ru_joe/oshibka.ogg b/sound/voice/ru_joe/oshibka.ogg new file mode 100644 index 000000000000..2fc72a2d9d44 Binary files /dev/null and b/sound/voice/ru_joe/oshibka.ogg differ diff --git a/sound/voice/ru_joe/ostorozhnee.ogg b/sound/voice/ru_joe/ostorozhnee.ogg new file mode 100644 index 000000000000..30c1eeee8bda Binary files /dev/null and b/sound/voice/ru_joe/ostorozhnee.ogg differ diff --git a/sound/voice/ru_joe/otkritogog.ogg b/sound/voice/ru_joe/otkritogog.ogg new file mode 100644 index 000000000000..f1f42f381fc7 Binary files /dev/null and b/sound/voice/ru_joe/otkritogog.ogg differ diff --git a/sound/voice/ru_joe/podaytezalobu.ogg b/sound/voice/ru_joe/podaytezalobu.ogg new file mode 100644 index 000000000000..08f6aa0fe849 Binary files /dev/null and b/sound/voice/ru_joe/podaytezalobu.ogg differ diff --git a/sound/voice/ru_joe/podoyducherez1.ogg b/sound/voice/ru_joe/podoyducherez1.ogg new file mode 100644 index 000000000000..f6c64c3dbd11 Binary files /dev/null and b/sound/voice/ru_joe/podoyducherez1.ogg differ diff --git a/sound/voice/ru_joe/polezen.ogg b/sound/voice/ru_joe/polezen.ogg new file mode 100644 index 000000000000..75710b05c61d Binary files /dev/null and b/sound/voice/ru_joe/polezen.ogg differ diff --git a/sound/voice/ru_joe/pomoch.ogg b/sound/voice/ru_joe/pomoch.ogg new file mode 100644 index 000000000000..636d1c3a84f4 Binary files /dev/null and b/sound/voice/ru_joe/pomoch.ogg differ diff --git a/sound/voice/ru_joe/poydurabotat.ogg b/sound/voice/ru_joe/poydurabotat.ogg new file mode 100644 index 000000000000..077e10d9d6ab Binary files /dev/null and b/sound/voice/ru_joe/poydurabotat.ogg differ diff --git a/sound/voice/ru_joe/prekratiteisteriku.ogg b/sound/voice/ru_joe/prekratiteisteriku.ogg new file mode 100644 index 000000000000..980473e05a9a Binary files /dev/null and b/sound/voice/ru_joe/prekratiteisteriku.ogg differ diff --git a/sound/voice/ru_joe/proydemte.ogg b/sound/voice/ru_joe/proydemte.ogg new file mode 100644 index 000000000000..bc8310ab22e0 Binary files /dev/null and b/sound/voice/ru_joe/proydemte.ogg differ diff --git a/sound/voice/ru_joe/radchtomiuladili.ogg b/sound/voice/ru_joe/radchtomiuladili.ogg new file mode 100644 index 000000000000..d937de86ea57 Binary files /dev/null and b/sound/voice/ru_joe/radchtomiuladili.ogg differ diff --git a/sound/voice/ru_joe/smert1.ogg b/sound/voice/ru_joe/smert1.ogg new file mode 100644 index 000000000000..e090a289d10c Binary files /dev/null and b/sound/voice/ru_joe/smert1.ogg differ diff --git a/sound/voice/ru_joe/smert2.ogg b/sound/voice/ru_joe/smert2.ogg new file mode 100644 index 000000000000..f9770bc0b871 Binary files /dev/null and b/sound/voice/ru_joe/smert2.ogg differ diff --git a/sound/voice/ru_joe/smert3.ogg b/sound/voice/ru_joe/smert3.ogg new file mode 100644 index 000000000000..ec80c6614c65 Binary files /dev/null and b/sound/voice/ru_joe/smert3.ogg differ diff --git a/sound/voice/ru_joe/smert4.ogg b/sound/voice/ru_joe/smert4.ogg new file mode 100644 index 000000000000..e29081d30129 Binary files /dev/null and b/sound/voice/ru_joe/smert4.ogg differ diff --git a/sound/voice/ru_joe/smert5.ogg b/sound/voice/ru_joe/smert5.ogg new file mode 100644 index 000000000000..a5cfabc81492 Binary files /dev/null and b/sound/voice/ru_joe/smert5.ogg differ diff --git a/sound/voice/ru_joe/stranno.ogg b/sound/voice/ru_joe/stranno.ogg new file mode 100644 index 000000000000..d565e525f29e Binary files /dev/null and b/sound/voice/ru_joe/stranno.ogg differ diff --git a/sound/voice/ru_joe/temp.ogg b/sound/voice/ru_joe/temp.ogg new file mode 100644 index 000000000000..cb1e732b9a45 Binary files /dev/null and b/sound/voice/ru_joe/temp.ogg differ diff --git a/sound/voice/ru_joe/terp.ogg b/sound/voice/ru_joe/terp.ogg new file mode 100644 index 000000000000..dc689584c561 Binary files /dev/null and b/sound/voice/ru_joe/terp.ogg differ diff --git a/sound/voice/ru_joe/trachuvrema.ogg b/sound/voice/ru_joe/trachuvrema.ogg new file mode 100644 index 000000000000..8080adfe6f8a Binary files /dev/null and b/sound/voice/ru_joe/trachuvrema.ogg differ diff --git a/sound/voice/ru_joe/uborka.ogg b/sound/voice/ru_joe/uborka.ogg new file mode 100644 index 000000000000..db8bec30c277 Binary files /dev/null and b/sound/voice/ru_joe/uborka.ogg differ diff --git a/sound/voice/ru_joe/ugroza.ogg b/sound/voice/ru_joe/ugroza.ogg new file mode 100644 index 000000000000..2c4a86967621 Binary files /dev/null and b/sound/voice/ru_joe/ugroza.ogg differ diff --git a/sound/voice/ru_joe/ushibitsa.ogg b/sound/voice/ru_joe/ushibitsa.ogg new file mode 100644 index 000000000000..81c5e449865e Binary files /dev/null and b/sound/voice/ru_joe/ushibitsa.ogg differ diff --git a/sound/voice/ru_joe/usilitmeri.ogg b/sound/voice/ru_joe/usilitmeri.ogg new file mode 100644 index 000000000000..07c639a875cb Binary files /dev/null and b/sound/voice/ru_joe/usilitmeri.ogg differ diff --git a/sound/voice/ru_joe/uspokoytes.ogg b/sound/voice/ru_joe/uspokoytes.ogg new file mode 100644 index 000000000000..f34d14d74e5f Binary files /dev/null and b/sound/voice/ru_joe/uspokoytes.ogg differ diff --git a/sound/voice/ru_joe/uznatlegko.ogg b/sound/voice/ru_joe/uznatlegko.ogg new file mode 100644 index 000000000000..042fbad048f6 Binary files /dev/null and b/sound/voice/ru_joe/uznatlegko.ogg differ diff --git a/sound/voice/ru_joe/vamsyduanelza.ogg b/sound/voice/ru_joe/vamsyduanelza.ogg new file mode 100644 index 000000000000..e55a6d98dd9e Binary files /dev/null and b/sound/voice/ru_joe/vamsyduanelza.ogg differ diff --git a/sound/voice/ru_joe/vhodvospreshen.ogg b/sound/voice/ru_joe/vhodvospreshen.ogg new file mode 100644 index 000000000000..a0372a86ab94 Binary files /dev/null and b/sound/voice/ru_joe/vhodvospreshen.ogg differ diff --git a/sound/voice/ru_joe/vinarushaete.ogg b/sound/voice/ru_joe/vinarushaete.ogg new file mode 100644 index 000000000000..5b8b8c48e70e Binary files /dev/null and b/sound/voice/ru_joe/vinarushaete.ogg differ diff --git a/sound/voice/ru_joe/viportiteimushestvo.ogg b/sound/voice/ru_joe/viportiteimushestvo.ogg new file mode 100644 index 000000000000..ae007d7e1505 Binary files /dev/null and b/sound/voice/ru_joe/viportiteimushestvo.ogg differ diff --git a/sound/voice/ru_joe/visebyavidalimozhet.ogg b/sound/voice/ru_joe/visebyavidalimozhet.ogg new file mode 100644 index 000000000000..467abc2804dc Binary files /dev/null and b/sound/voice/ru_joe/visebyavidalimozhet.ogg differ diff --git a/sound/voice/ru_joe/yavamobyasnyu.ogg b/sound/voice/ru_joe/yavamobyasnyu.ogg new file mode 100644 index 000000000000..67fd4398cea9 Binary files /dev/null and b/sound/voice/ru_joe/yavamobyasnyu.ogg differ diff --git a/sound/voice/ru_joe/yavasiskal.ogg b/sound/voice/ru_joe/yavasiskal.ogg new file mode 100644 index 000000000000..add1df3a7e6b Binary files /dev/null and b/sound/voice/ru_joe/yavasiskal.ogg differ diff --git a/sound/voice/ru_joe/yavaspoymau.ogg b/sound/voice/ru_joe/yavaspoymau.ogg new file mode 100644 index 000000000000..fc8fbd2a02eb Binary files /dev/null and b/sound/voice/ru_joe/yavaspoymau.ogg differ diff --git a/sound/voice/ru_joe/yaznayuchovieshe.ogg b/sound/voice/ru_joe/yaznayuchovieshe.ogg new file mode 100644 index 000000000000..f91d24d49c7c Binary files /dev/null and b/sound/voice/ru_joe/yaznayuchovieshe.ogg differ diff --git a/sound/voice/ru_joe/zachem.ogg b/sound/voice/ru_joe/zachem.ogg new file mode 100644 index 000000000000..0f9e412d084b Binary files /dev/null and b/sound/voice/ru_joe/zachem.ogg differ diff --git a/sound/voice/ru_joe/zdravstvuyte.ogg b/sound/voice/ru_joe/zdravstvuyte.ogg new file mode 100644 index 000000000000..fda3f5785b48 Binary files /dev/null and b/sound/voice/ru_joe/zdravstvuyte.ogg differ diff --git a/sound/voice/ru_joe/zurnal.ogg b/sound/voice/ru_joe/zurnal.ogg new file mode 100644 index 000000000000..3ff72894a3ab Binary files /dev/null and b/sound/voice/ru_joe/zurnal.ogg differ