From 51cd5b2dbb37e5da215262c413abbcb30d656e9d Mon Sep 17 00:00:00 2001 From: forest2001 Date: Sun, 8 Sep 2024 05:46:13 +0100 Subject: [PATCH 01/50] Presets part 1 --- code/__DEFINES/job.dm | 10 ++ code/__DEFINES/mode.dm | 9 +- code/game/jobs/job/special/responders.dm | 35 ++++++ code/modules/gear_presets/fax_responders.dm | 117 ++++++++++++++++++++ colonialmarines.dme | 2 + 5 files changed, 166 insertions(+), 7 deletions(-) create mode 100644 code/game/jobs/job/special/responders.dm create mode 100644 code/modules/gear_presets/fax_responders.dm diff --git a/code/__DEFINES/job.dm b/code/__DEFINES/job.dm index 0173a55e2d17..3522bcb29b4e 100644 --- a/code/__DEFINES/job.dm +++ b/code/__DEFINES/job.dm @@ -366,6 +366,16 @@ GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST) #define DUTCH_JOB_LIST list(JOB_DUTCH_ARNOLD, JOB_DUTCH_RIFLEMAN, JOB_DUTCH_MINIGUNNER, JOB_DUTCH_FLAMETHROWER, JOB_DUTCH_MEDIC) +//---------- RESPONDERS ----------// +#define JOB_RESPONDER_USCM_HC "USCM HC Fax Responder" +#define JOB_RESPONDER_USCM_PVST "USCM Provost Fax Responder" +#define JOB_RESPONDER_WY "Weyland-Yutani Fax Responder" +#define JOB_RESPONDER_UPP "UPP Fax Responder" +#define JOB_RESPONDER_TWE "TWE Fax Responder" +#define JOB_RESPONDER_CLF "CLF Fax Responder" + + +//---------- ANTAG ----------// #define JOB_PREDATOR "Predator" #define JOB_XENOMORPH "Xenomorph" #define JOB_XENOMORPH_QUEEN "Queen" diff --git a/code/__DEFINES/mode.dm b/code/__DEFINES/mode.dm index 04c7993bd9f2..10877deca925 100644 --- a/code/__DEFINES/mode.dm +++ b/code/__DEFINES/mode.dm @@ -195,13 +195,8 @@ GLOBAL_LIST_INIT(whitelist_hierarchy, list(WHITELIST_NORMAL, WHITELIST_COUNCIL, ///Senior Enlisted Advisor, auto granted by R_MENTOR #define WHITELIST_MENTOR (1<<15) - -#define WHITELISTS_GENERAL (WHITELIST_YAUTJA|WHITELIST_COMMANDER|WHITELIST_SYNTHETIC|WHITELIST_MENTOR|WHITELIST_JOE) -#define WHITELISTS_COUNCIL (WHITELIST_YAUTJA_COUNCIL|WHITELIST_COMMANDER_COUNCIL|WHITELIST_SYNTHETIC_COUNCIL) -#define WHITELISTS_LEGACY_COUNCIL (WHITELIST_YAUTJA_COUNCIL_LEGACY|WHITELIST_COMMANDER_COUNCIL_LEGACY|WHITELIST_SYNTHETIC_COUNCIL_LEGACY) -#define WHITELISTS_LEADER (WHITELIST_YAUTJA_LEADER|WHITELIST_COMMANDER_LEADER|WHITELIST_SYNTHETIC_LEADER) - -#define WHITELIST_EVERYTHING (WHITELISTS_GENERAL|WHITELISTS_COUNCIL|WHITELISTS_LEADER) +///Fax Responder +#define WHITELIST_RESPONDER (1<<16) #define COUNCIL_LIST list(WHITELIST_COMMANDER_COUNCIL, WHITELIST_SYNTHETIC_COUNCIL, WHITELIST_YAUTJA_COUNCIL) #define SENATOR_LIST list(WHITELIST_COMMANDER_LEADER, WHITELIST_SYNTHETIC_LEADER, WHITELIST_YAUTJA_LEADER) diff --git a/code/game/jobs/job/special/responders.dm b/code/game/jobs/job/special/responders.dm new file mode 100644 index 000000000000..bd627f0dcb77 --- /dev/null +++ b/code/game/jobs/job/special/responders.dm @@ -0,0 +1,35 @@ +/datum/job/responder + selection_class = "job_command" + supervisors = "CMSS13 Administration Staff" + total_positions = 1 + spawn_positions = 1 + + flags_startup_parameters = ROLE_ADMIN_NOTIFY|ROLE_WHITELISTED|ROLE_CUSTOM_SPAWN + flags_whitelist = WHITELIST_RESPONDER + + gear_preset = /datum/equipment_preset/responder + entry_message_body = "Your job is to assist the marines in collecting intelligence related to the current operation to better inform command of their opposition. You are in charge of gathering any data disks, folders, and notes you may find on the operational grounds and decrypt them to grant the USCM additional resources." + +/datum/job/responder/uscm_hc + title = JOB_RESPONDER_USCM_HC + gear_preset = /datum/equipment_preset/responder/uscm + +/datum/job/responder/uscm_pvst + title = JOB_RESPONDER_USCM_PVST + gear_preset = /datum/equipment_preset/responder/uscm/provost + +/datum/job/responder/wy + title = JOB_RESPONDER_WY + gear_preset = /datum/equipment_preset/responder/wey_yu + +/datum/job/responder/upp + title = JOB_RESPONDER_UPP + gear_preset = /datum/equipment_preset/responder/upp + +/datum/job/responder/twe + title = JOB_RESPONDER_TWE + gear_preset = /datum/equipment_preset/responder/twe + +/datum/job/responder/clf + title = JOB_RESPONDER_CLF + gear_preset = /datum/equipment_preset/responder/clf diff --git a/code/modules/gear_presets/fax_responders.dm b/code/modules/gear_presets/fax_responders.dm new file mode 100644 index 000000000000..8d952c0c139c --- /dev/null +++ b/code/modules/gear_presets/fax_responders.dm @@ -0,0 +1,117 @@ +/datum/equipment_preset/responder + name = "Fax Responder" + assignment = "Fax Responder" + rank = "Fax Responder" + + role_comm_title = "Resp." + + flags = EQUIPMENT_PRESET_EXTRA + faction = FACTION_NEUTRAL + + access = list(ACCESS_CIVILIAN_PUBLIC) + skills = /datum/skills/civilian + idtype = /obj/item/card/id/lanyard + +/datum/equipment_preset/responder/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/tool/pen/fountain(new_human), WEAR_R_EAR) + + +/datum/equipment_preset/responder/load_id(mob/living/carbon/human/new_human, client/mob_client) + var/obj/item/clothing/under/uniform = new_human.w_uniform + if(istype(uniform)) + uniform.has_sensor = UNIFORM_HAS_SENSORS + uniform.sensor_faction = FACTION_NEUTRAL + return ..() + +//*****************************************************************************************************/ + +/datum/equipment_preset/responder/uscm + name = JOB_RESPONDER_USCM_HC + assignment = JOB_RESPONDER_USCM_HC + rank = JOB_RESPONDER_USCM_HC + + paygrades = list(PAY_SHORT_MO2 = JOB_PLAYTIME_TIER_0, PAY_SHORT_MO3 = JOB_PLAYTIME_TIER_1, PAY_SHORT_MO4 = JOB_PLAYTIME_TIER_3) + idtype = /obj/item/card/id/gold + skills = /datum/skills/XO + access = list(ACCESS_MARINE_COMMAND, ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_DATABASE, ACCESS_MARINE_MEDBAY) + +/datum/equipment_preset/responder/uscm/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/marine/dress_cover/officer(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/dress/blues/senior(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/dress/blues/officer(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/dress(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/dress(new_human), WEAR_HANDS) + + new_human.equip_to_slot_or_del(new /obj/item/notepad/blue(new_human), WEAR_R_STORE) + . = ..() + +/datum/equipment_preset/responder/uscm/provost + name = JOB_RESPONDER_USCM_PVST + assignment = JOB_RESPONDER_USCM_PVST + rank = JOB_RESPONDER_USCM_PVST + +/datum/equipment_preset/responder/uscm/provost/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/notepad/red(new_human), WEAR_R_STORE) + . = ..() + +//*****************************************************************************************************/ + +/datum/equipment_preset/responder/wey_yu + name = JOB_RESPONDER_WY + assignment = JOB_RESPONDER_WY + rank = JOB_RESPONDER_WY + paygrades = list(PAY_SHORT_WYC5 = JOB_PLAYTIME_TIER_0, PAY_SHORT_WYC6 = JOB_PLAYTIME_TIER_1, PAY_SHORT_WYC7 = JOB_PLAYTIME_TIER_3) + +/datum/equipment_preset/responder/wey_yu/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/blue(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/corporate/blue(new_human), WEAR_JACKET) + + new_human.equip_to_slot_or_del(new /obj/item/notepad/black(new_human), WEAR_R_STORE) + + ..() + +//*****************************************************************************************************/ + +/datum/equipment_preset/responder/upp + name = JOB_RESPONDER_UPP + assignment = JOB_RESPONDER_UPP + rank = JOB_RESPONDER_UPP + paygrades = list(PAY_SHORT_UO2 = JOB_PLAYTIME_TIER_0, PAY_SHORT_UO3 = JOB_PLAYTIME_TIER_1, PAY_SHORT_UO4 = JOB_PLAYTIME_TIER_3) + skills = /datum/skills/upp/kapitan + +/datum/equipment_preset/responder/upp/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/beret, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP/officer(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/kapitan, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp/naval, WEAR_ACCESSORY) + + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp/knife, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) + + new_human.equip_to_slot_or_del(new /obj/item/notepad/green(new_human), WEAR_R_STORE) + + +//*****************************************************************************************************/ + +/datum/equipment_preset/responder/twe + name = JOB_RESPONDER_TWE + assignment = JOB_RESPONDER_TWE + rank = JOB_RESPONDER_TWE + +/datum/equipment_preset/responder/twe/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/twe_suit(new_human), WEAR_BODY) + + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/white(new_human), WEAR_HANDS) + + new_human.equip_to_slot_or_del(new /obj/item/notepad/blue(new_human), WEAR_R_STORE) + +//*****************************************************************************************************/ + +/datum/equipment_preset/responder/clf + name = JOB_RESPONDER_CLF + assignment = JOB_RESPONDER_CLF + rank = JOB_RESPONDER_CLF diff --git a/colonialmarines.dme b/colonialmarines.dme index 9fff0d7db91b..aea0181a0240 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -838,6 +838,7 @@ #include "code\game\jobs\job\marine\squad\tl.dm" #include "code\game\jobs\job\special\cmb.dm" #include "code\game\jobs\job\special\provost.dm" +#include "code\game\jobs\job\special\responders.dm" #include "code\game\jobs\job\special\uaac.dm" #include "code\game\jobs\job\special\uscm.dm" #include "code\game\jobs\job\special\weyland_yutani.dm" @@ -1770,6 +1771,7 @@ #include "code\modules\gear_presets\corpses.dm" #include "code\modules\gear_presets\dust_raider.dm" #include "code\modules\gear_presets\dutch.dm" +#include "code\modules\gear_presets\fax_responders.dm" #include "code\modules\gear_presets\fun.dm" #include "code\modules\gear_presets\other.dm" #include "code\modules\gear_presets\pmc.dm" From 6668089fdf71b8434e987257ba1980cf3c2f18b1 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Sun, 8 Sep 2024 13:09:48 +0100 Subject: [PATCH 02/50] job cat --- code/modules/client/preferences.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index dd0d406560ab..07a87f60cf7e 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -808,6 +808,8 @@ GLOBAL_LIST_INIT(bgstate_options, list( if(!job) debug_log("Missing job for prefs: [role_name]") continue + if(job.flags_startup_parameters & ROLE_HIDDEN) + continue index++ if((index >= limit) || (job.title in splitJobs)) HTML += "" From ddd3e5d083152dc00b35ecc7257212fcde09acce Mon Sep 17 00:00:00 2001 From: forest2001 Date: Sun, 8 Sep 2024 15:09:40 +0100 Subject: [PATCH 03/50] Part one --- code/__DEFINES/job.dm | 5 ++ code/__DEFINES/mode.dm | 1 + code/game/gamemodes/cm_initialize.dm | 69 +++++++++++++++++++ code/game/jobs/job/civilians/civilian.dm | 7 ++ code/game/jobs/job/special/responders.dm | 16 ++++- code/game/jobs/whitelist.dm | 6 +- .../objects/effects/landmarks/landmarks.dm | 27 ++++++++ code/modules/client/client_procs.dm | 2 +- code/modules/client/preferences.dm | 2 + code/modules/mob/new_player/new_player.dm | 19 ++++- 10 files changed, 148 insertions(+), 6 deletions(-) diff --git a/code/__DEFINES/job.dm b/code/__DEFINES/job.dm index 3522bcb29b4e..8ef08712e6c4 100644 --- a/code/__DEFINES/job.dm +++ b/code/__DEFINES/job.dm @@ -213,6 +213,9 @@ GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST) #define ROLES_WY_CORPORATE list(JOB_EXECUTIVE_SUPERVISOR, JOB_EXECUTIVE_SPECIALIST, JOB_SENIOR_EXECUTIVE, JOB_EXECUTIVE, JOB_JUNIOR_EXECUTIVE, JOB_TRAINEE) #define ROLES_WY_LEADERSHIP list(JOB_DIRECTOR, JOB_PMC_DIRECTOR, JOB_CHIEF_EXECUTIVE, JOB_DIVISION_MANAGER, JOB_ASSISTANT_MANAGER) +#define JOB_CORPORATE_ROLES /datum/timelock/corporate +#define JOB_CORPORATE_ROLES_LIST list(JOB_CORPORATE_LIAISON, JOB_WO_CORPORATE_LIAISON, JOB_DIRECTOR, JOB_PMC_DIRECTOR, JOB_CHIEF_EXECUTIVE, JOB_DIVISION_MANAGER, JOB_ASSISTANT_MANAGER, JOB_EXECUTIVE_SUPERVISOR, JOB_EXECUTIVE_SPECIALIST, JOB_SENIOR_EXECUTIVE, JOB_EXECUTIVE, JOB_JUNIOR_EXECUTIVE, JOB_TRAINEE) + //-------- WY Goons --------// #define JOB_WY_GOON "WY Corporate Security" #define JOB_WY_GOON_TECH "WY Corporate Security Technician" @@ -374,6 +377,8 @@ GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST) #define JOB_RESPONDER_TWE "TWE Fax Responder" #define JOB_RESPONDER_CLF "CLF Fax Responder" +#define RESPONDER_JOB_LIST list(JOB_RESPONDER_USCM_HC, JOB_RESPONDER_USCM_PVST, JOB_RESPONDER_WY, JOB_RESPONDER_UPP, JOB_RESPONDER_TWE, JOB_RESPONDER_CLF) + //---------- ANTAG ----------// #define JOB_PREDATOR "Predator" diff --git a/code/__DEFINES/mode.dm b/code/__DEFINES/mode.dm index 10877deca925..036c82d46371 100644 --- a/code/__DEFINES/mode.dm +++ b/code/__DEFINES/mode.dm @@ -117,6 +117,7 @@ #define ROLE_WHITELISTED 16 #define ROLE_NO_ACCOUNT 32 #define ROLE_CUSTOM_SPAWN 64 +#define ROLE_HIDDEN 128 //================================================= //Role defines, specifically lists of roles for job bans, crew manifests and the like. diff --git a/code/game/gamemodes/cm_initialize.dm b/code/game/gamemodes/cm_initialize.dm index 4a208b00a796..e7d22a8f3f44 100644 --- a/code/game/gamemodes/cm_initialize.dm +++ b/code/game/gamemodes/cm_initialize.dm @@ -254,6 +254,75 @@ Additional game mode variables. return new_predator +//===================================================\\ + + //FAX RESPONDER INITIATLIZE\\ + +//===================================================\\ + +/datum/game_mode/proc/check_responder_late_join(mob/responder, show_warning = TRUE) + if(!responder.client) + return FALSE + if(!(responder?.client.check_whitelist_status(WHITELIST_RESPONDER))) + if(show_warning) + to_chat(responder, SPAN_WARNING("You are not whitelisted!")) + return FALSE + if(show_warning && tgui_alert(responder, "Confirm joining as a Fax Responder.", "Confirmation", list("Yes", "No"), 10 SECONDS) != "Yes") + return FALSE + return TRUE + +/datum/game_mode/proc/get_fax_responder_slots(mob/responder_candidate) + var/list/options = list() + if(!responder_candidate.client) + return FALSE + if(!(responder_candidate.client.check_whitelist_status(WHITELIST_RESPONDER))) + to_chat(responder_candidate, SPAN_WARNING("You are not whitelisted!")) + return FALSE + + for(var/job in RESPONDER_JOB_LIST) + var/datum/job/responder_job = GLOB.RoleAuthority.roles_by_name[job] + var/job_max = responder_job.total_positions + if((responder_job.current_positions < job_max) && responder_job.can_play_role(responder_candidate.client)) + options += job + +/datum/game_mode/proc/attempt_to_join_as_responder(mob/responder_candidate) + var/choice = tgui_input_list(src, "What Fax Responder do you want to join as?", "Which Responder?", get_fax_responder_slots(responder_candidate), 30 SECONDS) + if(!(choice in RESPONDER_JOB_LIST)) + to_chat(src, SPAN_WARNING("Error: No valid responder selected.")) + return FALSE + + var/mob/living/carbon/human/new_responder = transform_responder(responder_candidate, choice) //Initialized and ready. + if(!new_responder) + return FALSE + + message_admins("([new_responder.key]) joined as a Fax Responder, [new_responder.real_name].") + + if(responder_candidate) responder_candidate.moveToNullspace() //Nullspace it for garbage collection later. + +/datum/game_mode/proc/transform_responder(mob/responder_candidate, sub_job) + set waitfor = FALSE + + if(!(sub_job in RESPONDER_JOB_LIST)) + return + + if(!responder_candidate.client) // Legacy - probably due to spawn code sync sleeps + log_debug("Null client attempted to transform_responder") + return + + var/turf/spawn_point = get_turf(pick(GLOB.latejoin_by_job[sub_job])) + var/mob/living/carbon/human/new_responder = new(spawn_point) + responder_candidate.mind.transfer_to(new_responder, TRUE) + var/datum/job/responder_job = GLOB.RoleAuthority.roles_by_name[sub_job] + + if(!responder_job) + qdel(new_responder) + return + // This is usually done in assign_role, a proc which is not executed in this case, since check_joe_late_join is running its own checks. + responder_job.current_positions++ + GLOB.RoleAuthority.equip_role(new_responder, responder_job, new_responder.loc) + SSticker.minds += new_responder.mind + return new_responder + //===================================================\\ diff --git a/code/game/jobs/job/civilians/civilian.dm b/code/game/jobs/job/civilians/civilian.dm index a9631f2ed9c1..86b237816217 100644 --- a/code/game/jobs/job/civilians/civilian.dm +++ b/code/game/jobs/job/civilians/civilian.dm @@ -7,3 +7,10 @@ /datum/timelock/medic/New(name, time_required, list/roles) . = ..() src.roles = JOB_MEDIC_ROLES_LIST + +/datum/timelock/corporate + name = "Corporate Roles" + +/datum/timelock/corporate/New(name, time_required, list/roles) + . = ..() + src.roles = JOB_CORPORATE_ROLES_LIST diff --git a/code/game/jobs/job/special/responders.dm b/code/game/jobs/job/special/responders.dm index bd627f0dcb77..800972d6fcc2 100644 --- a/code/game/jobs/job/special/responders.dm +++ b/code/game/jobs/job/special/responders.dm @@ -4,12 +4,17 @@ total_positions = 1 spawn_positions = 1 - flags_startup_parameters = ROLE_ADMIN_NOTIFY|ROLE_WHITELISTED|ROLE_CUSTOM_SPAWN + flags_startup_parameters = ROLE_ADMIN_NOTIFY|ROLE_WHITELISTED|ROLE_CUSTOM_SPAWN//|ROLE_HIDDEN flags_whitelist = WHITELIST_RESPONDER gear_preset = /datum/equipment_preset/responder entry_message_body = "Your job is to assist the marines in collecting intelligence related to the current operation to better inform command of their opposition. You are in charge of gathering any data disks, folders, and notes you may find on the operational grounds and decrypt them to grant the USCM additional resources." +AddTimelock(/datum/job/responder, list( + JOB_POLICE_ROLES = 25 HOURS, + JOB_COMMAND_ROLES = 75 HOURS, +)) + /datum/job/responder/uscm_hc title = JOB_RESPONDER_USCM_HC gear_preset = /datum/equipment_preset/responder/uscm @@ -18,10 +23,19 @@ title = JOB_RESPONDER_USCM_PVST gear_preset = /datum/equipment_preset/responder/uscm/provost +AddTimelock(/datum/job/responder/uscm_pvst, list( + JOB_POLICE_ROLES = 150 HOURS, + JOB_COMMAND_ROLES = 50 HOURS, +)) + /datum/job/responder/wy title = JOB_RESPONDER_WY gear_preset = /datum/equipment_preset/responder/wey_yu +AddTimelock(/datum/job/responder/wy, list( + JOB_CORPORATE_ROLES = 150 HOURS, +)) + /datum/job/responder/upp title = JOB_RESPONDER_UPP gear_preset = /datum/equipment_preset/responder/upp diff --git a/code/game/jobs/whitelist.dm b/code/game/jobs/whitelist.dm index 8cd91a494c83..a02a3d47a8f6 100644 --- a/code/game/jobs/whitelist.dm +++ b/code/game/jobs/whitelist.dm @@ -44,8 +44,9 @@ #define WL_PANEL_RIGHT_YAUTJA (1<<2) #define WL_PANEL_RIGHT_MENTOR (1<<3) #define WL_PANEL_RIGHT_OVERSEER (1<<4) +#define WL_PANEL_RIGHT_MANAGER (1<<5) #define WL_PANEL_ALL_COUNCILS (WL_PANEL_RIGHT_CO|WL_PANEL_RIGHT_SYNTH|WL_PANEL_RIGHT_YAUTJA) -#define WL_PANEL_ALL_RIGHTS (WL_PANEL_RIGHT_CO|WL_PANEL_RIGHT_SYNTH|WL_PANEL_RIGHT_YAUTJA|WL_PANEL_RIGHT_MENTOR|WL_PANEL_RIGHT_OVERSEER) +#define WL_PANEL_ALL_RIGHTS (WL_PANEL_RIGHT_CO|WL_PANEL_RIGHT_SYNTH|WL_PANEL_RIGHT_YAUTJA|WL_PANEL_RIGHT_MENTOR|WL_PANEL_RIGHT_OVERSEER|WL_PANEL_RIGHT_MANAGER) /datum/whitelist_panel var/viewed_player = list() @@ -68,7 +69,7 @@ if(person.check_whitelist_status(WHITELIST_YAUTJA_LEADER)) rights |= WL_PANEL_RIGHT_YAUTJA if(rights == WL_PANEL_ALL_COUNCILS) - return WL_PANEL_ALL_RIGHTS + rights |= WL_PANEL_RIGHT_OVERSEER return rights /datum/whitelist_panel/tgui_interact(mob/user, datum/tgui/ui) @@ -122,6 +123,7 @@ GLOBAL_LIST_INIT(yaut_flags, list( GLOBAL_LIST_INIT(misc_flags, list( list(name = "Senior Enlisted Advisor", bitflag = WHITELIST_MENTOR, permission = WL_PANEL_RIGHT_MENTOR), list(name = "Working Joe", bitflag = WHITELIST_JOE, permission = WL_PANEL_RIGHT_SYNTH), + list(name = "Fax Responder", bitflag = WHITELIST_RESPONDER, permission = WL_PANEL_RIGHT_MANAGER), )) /datum/whitelist_panel/ui_static_data(mob/user) diff --git a/code/game/objects/effects/landmarks/landmarks.dm b/code/game/objects/effects/landmarks/landmarks.dm index f5f0e0b50c05..54f73dc55395 100644 --- a/code/game/objects/effects/landmarks/landmarks.dm +++ b/code/game/objects/effects/landmarks/landmarks.dm @@ -452,6 +452,33 @@ GLOB.latejoin -= src return ..() + +/obj/effect/landmark/late_join/responder/uscm + name = "USCM HC Fax Responder late join" + job = JOB_RESPONDER_USCM_HC + +/obj/effect/landmark/late_join/responder/uscm/provost + name = "USCM Provost Fax Responder late join" + job = JOB_RESPONDER_USCM_PVST + +/obj/effect/landmark/late_join/responder/wey_yu + name = "W-Y Fax Responder late join" + job = JOB_RESPONDER_WY + +/obj/effect/landmark/late_join/responder/upp + name = "UPP Fax Responder late join" + job = JOB_RESPONDER_UPP + +/obj/effect/landmark/late_join/responder/twe + name = "TWE Fax Responder late join" + job = JOB_RESPONDER_TWE + +/obj/effect/landmark/late_join/responder/clf + name = "CLF Fax Responder late join" + job = JOB_RESPONDER_CLF + + + //****************************************** STATIC COMMS ************************************************// /obj/effect/landmark/static_comms name = "static comms" diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index 52aa1be1408b..c44ec6c62d36 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -883,7 +883,7 @@ GLOBAL_LIST_INIT(whitelisted_client_procs, list( if((flag_to_check & WHITELIST_MENTOR) && CLIENT_IS_MENTOR(src)) return TRUE - if((flag_to_check & WHITELIST_JOE) && CLIENT_IS_STAFF(src)) + if(CLIENT_IS_STAFF(src) && (flag_to_check & WHITELIST_JOE|WHITELIST_RESPONDER)) return TRUE if(!player_data) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 07a87f60cf7e..e368d330f9d3 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -690,6 +690,8 @@ GLOBAL_LIST_INIT(bgstate_options, list( if(!job) debug_log("Missing job for prefs: [role_name]") continue + if(job.flags_startup_parameters & ROLE_HIDDEN) + continue index++ if((index >= limit) || (job.title in splitJobs)) HTML += "
" diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 829379eb28b6..c73689cf3f33 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -57,7 +57,8 @@ output += "

Join the USCM!

" output += "

Join the Hive!

" if(SSticker.mode.flags_round_type & MODE_PREDATOR) - if(SSticker.mode.check_predator_late_join(src,0)) output += "

Join the Hunt!

" + if(SSticker.mode.check_predator_late_join(src, FALSE)) output += "

Join the Hunt!

" + if(SSticker.mode.check_responder_late_join(src, FALSE)) output += "

Respond to Faxes

" output += "

Observe

" @@ -188,13 +189,27 @@ return if(alert(src,"Are you sure you want to attempt joining as a predator?","Confirmation","Yes","No") == "Yes" ) - if(SSticker.mode.check_predator_late_join(src,0)) + if(SSticker.mode.check_predator_late_join(src, FALSE)) close_spawn_windows() SSticker.mode.attempt_to_join_as_predator(src) else to_chat(src, SPAN_WARNING("You are no longer able to join as predator.")) new_player_panel() + if("late_join_faxes") + if(SSticker.current_state != GAME_STATE_PLAYING || !SSticker.mode) + to_chat(src, SPAN_WARNING("The round is either not ready, or has already finished...")) + return + + if(alert(src,"Are you sure you want to attempt joining as a Fax Responder?","Confirmation","Yes","No") == "Yes" ) + if(SSticker.mode.check_responder_late_join(src, FALSE)) + close_spawn_windows() + SSticker.mode.attempt_to_join_as_responder(src) + else + to_chat(src, SPAN_WARNING("You are no longer able to join as a Fax Responder.")) + new_player_panel() + + if("manifest") ViewManifest() From 72ec6db77e926ba27f9f18792e16db4880e1fdc1 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Sun, 8 Sep 2024 15:09:47 +0100 Subject: [PATCH 04/50] landmark test --- maps/map_files/USS_Almayer/USS_Almayer.dmm | 36 ++++++++++++++++++---- 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index b5181e0f77f6..c0d841166e98 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -30851,6 +30851,10 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/u_a_p) +"iXF" = ( +/obj/effect/landmark/late_join/responder/clf, +/turf/open/floor/almayer/redcorner/east, +/area/almayer/living/briefing) "iXT" = ( /obj/item/trash/uscm_mre, /turf/open/floor/almayer, @@ -30887,6 +30891,10 @@ }, /turf/open/floor/almayer/cargo_arrow/north, /area/almayer/medical/hydroponics) +"iYl" = ( +/obj/effect/landmark/late_join/responder/wey_yu, +/turf/open/floor/almayer, +/area/almayer/living/briefing) "iYm" = ( /obj/structure/largecrate/random/case/small, /turf/open/floor/almayer/plate, @@ -35982,6 +35990,10 @@ }, /turf/open/floor/plating, /area/almayer/command/cic) +"lbb" = ( +/obj/effect/landmark/late_join/responder/twe, +/turf/open/floor/almayer, +/area/almayer/living/briefing) "lbf" = ( /obj/structure/machinery/cryopod{ pixel_y = 6 @@ -42382,6 +42394,10 @@ }, /turf/open/floor/almayer/no_build/plating, /area/almayer/command/airoom) +"nKl" = ( +/obj/effect/landmark/late_join/responder/uscm/provost, +/turf/open/floor/almayer, +/area/almayer/living/briefing) "nKq" = ( /obj/structure/machinery/status_display{ pixel_x = 16; @@ -51756,6 +51772,10 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_m_s) +"rAq" = ( +/obj/effect/landmark/late_join/responder/uscm, +/turf/open/floor/almayer, +/area/almayer/living/briefing) "rAw" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_full" @@ -65657,6 +65677,10 @@ "xaS" = ( /turf/open/floor/almayer/uscm/directional/northeast, /area/almayer/command/lifeboat) +"xaY" = ( +/obj/effect/landmark/late_join/responder/upp, +/turf/open/floor/almayer, +/area/almayer/living/briefing) "xba" = ( /turf/closed/wall/almayer/reinforced/temphull, /area/almayer/living/cryo_cells) @@ -102832,7 +102856,7 @@ bqZ bCg beH fUA -beH +lbb bCg bqZ beH @@ -103041,7 +103065,7 @@ beH beH beH beH -beH +iYl fUA beH beH @@ -103639,7 +103663,7 @@ yfg fZE nyw bqZ -beH +rAq bgO boq boq @@ -105264,6 +105288,7 @@ meQ fZE bdg bqZ +nKl beH beH beH @@ -105271,8 +105296,7 @@ beH beH beH beH -beH -beH +xaY beH beH beH @@ -105675,7 +105699,7 @@ bCu bCu bCu bCu -wCI +iXF moQ flW fvf From adceabc774f230673864fcf0f36161a0201e8010 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Mon, 9 Sep 2024 17:26:02 +0100 Subject: [PATCH 05/50] whiskey fix w --- code/game/gamemodes/colonialmarines/whiskey_outpost.dm | 2 +- .../gamemodes/colonialmarines/whiskey_outpost/equipping.dm | 4 ++-- code/game/objects/effects/landmarks/landmarks.dm | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/game/gamemodes/colonialmarines/whiskey_outpost.dm b/code/game/gamemodes/colonialmarines/whiskey_outpost.dm index cfe67465df07..3947447e4da0 100644 --- a/code/game/gamemodes/colonialmarines/whiskey_outpost.dm +++ b/code/game/gamemodes/colonialmarines/whiskey_outpost.dm @@ -26,7 +26,7 @@ /datum/job/civilian/doctor/whiskey = JOB_DOCTOR, /datum/job/civilian/researcher/whiskey = JOB_RESEARCHER, /datum/job/logistics/engineering/whiskey = JOB_CHIEF_ENGINEER, - /datum/job/logistics/tech/maint/whiskey = JOB_MAINT_TECH, + /datum/job/logistics/maint/whiskey = JOB_MAINT_TECH, /datum/job/logistics/cargo/whiskey = JOB_CARGO_TECH, /datum/job/civilian/liaison/whiskey = JOB_CORPORATE_LIAISON, /datum/job/marine/leader/whiskey = JOB_SQUAD_LEADER, diff --git a/code/game/gamemodes/colonialmarines/whiskey_outpost/equipping.dm b/code/game/gamemodes/colonialmarines/whiskey_outpost/equipping.dm index d5ff07391b5e..617f957f9aec 100644 --- a/code/game/gamemodes/colonialmarines/whiskey_outpost/equipping.dm +++ b/code/game/gamemodes/colonialmarines/whiskey_outpost/equipping.dm @@ -189,12 +189,12 @@ Ensure power is up, and the bunker is well defended. You share your bunker crew //************************************* //---------------MAINT TECH------------- //*************************************/ -/datum/job/logistics/tech/maint/whiskey +/datum/job/logistics/maint/whiskey title = JOB_WO_ORDNANCE_TECH supervisors = "the bunker crew master and the quartermaster" gear_preset = /datum/equipment_preset/wo/bc -/datum/job/logistics/tech/maint/whiskey/generate_entry_message(mob/living/carbon/human/H) +/datum/job/logistics/maint/whiskey/generate_entry_message(mob/living/carbon/human/H) . = {"You've worked here for a while, figuring it was a pretty comfy job. Now you gotta fight for your life. Have fun with that. Assist both the Bunker Crew Master and the Quartermaster in their duties."} diff --git a/code/game/objects/effects/landmarks/landmarks.dm b/code/game/objects/effects/landmarks/landmarks.dm index 54f73dc55395..08aab03d38b3 100644 --- a/code/game/objects/effects/landmarks/landmarks.dm +++ b/code/game/objects/effects/landmarks/landmarks.dm @@ -321,10 +321,10 @@ job = /datum/job/logistics/engineering/whiskey /obj/effect/landmark/start/whiskey/maint - job = /datum/job/logistics/tech/maint/whiskey + job = /datum/job/logistics/maint/whiskey /obj/effect/landmark/start/whiskey/tech - job = /datum/job/logistics/tech //Need to create a WO variant in the future + job = /datum/job/logistics/otech //Need to create a WO variant in the future //****************************************** MILITARY POLICE- HONOR-GUARD ************************************************/ /obj/effect/landmark/start/whiskey/warrant From 78e964b584c353850e516ae3b9ac0ac6b71a580e Mon Sep 17 00:00:00 2001 From: forest2001 Date: Mon, 9 Sep 2024 17:38:58 +0100 Subject: [PATCH 06/50] Functional Join --- code/__DEFINES/job.dm | 17 ++--- code/__DEFINES/mode.dm | 5 +- code/game/gamemodes/cm_initialize.dm | 50 +++++++++------ code/game/jobs/job/special/responders.dm | 54 ++++++++-------- code/game/jobs/whitelist.dm | 2 +- code/game/machinery/cryopod.dm | 22 +++++-- .../objects/effects/landmarks/landmarks.dm | 12 ++-- code/modules/client/client_procs.dm | 2 +- code/modules/client/preferences.dm | 2 - code/modules/gear_presets/fax_responders.dm | 64 +++++++++---------- code/modules/mob/dead/observer/observer.dm | 14 ++++ code/modules/mob/dead/observer/orbit.dm | 4 ++ code/modules/mob/new_player/new_player.dm | 7 +- tgui/packages/tgui/interfaces/Orbit/index.tsx | 6 ++ tgui/packages/tgui/interfaces/Orbit/types.ts | 1 + 15 files changed, 155 insertions(+), 107 deletions(-) diff --git a/code/__DEFINES/job.dm b/code/__DEFINES/job.dm index 8ef08712e6c4..36de99ef09d6 100644 --- a/code/__DEFINES/job.dm +++ b/code/__DEFINES/job.dm @@ -370,14 +370,15 @@ GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST) #define DUTCH_JOB_LIST list(JOB_DUTCH_ARNOLD, JOB_DUTCH_RIFLEMAN, JOB_DUTCH_MINIGUNNER, JOB_DUTCH_FLAMETHROWER, JOB_DUTCH_MEDIC) //---------- RESPONDERS ----------// -#define JOB_RESPONDER_USCM_HC "USCM HC Fax Responder" -#define JOB_RESPONDER_USCM_PVST "USCM Provost Fax Responder" -#define JOB_RESPONDER_WY "Weyland-Yutani Fax Responder" -#define JOB_RESPONDER_UPP "UPP Fax Responder" -#define JOB_RESPONDER_TWE "TWE Fax Responder" -#define JOB_RESPONDER_CLF "CLF Fax Responder" - -#define RESPONDER_JOB_LIST list(JOB_RESPONDER_USCM_HC, JOB_RESPONDER_USCM_PVST, JOB_RESPONDER_WY, JOB_RESPONDER_UPP, JOB_RESPONDER_TWE, JOB_RESPONDER_CLF) +#define JOB_FAX_RESPONDER "Fax Responder" +#define JOB_FAX_RESPONDER_USCM_HC "USCM HC Fax Responder" +#define JOB_FAX_RESPONDER_USCM_PVST "USCM Provost Fax Responder" +#define JOB_FAX_RESPONDER_WY "Weyland-Yutani Fax Responder" +#define JOB_FAX_RESPONDER_UPP "UPP Fax Responder" +#define JOB_FAX_RESPONDER_TWE "TWE Fax Responder" +#define JOB_FAX_RESPONDER_CLF "CLF Fax Responder" + +#define FAX_RESPONDER_JOB_LIST list(JOB_FAX_RESPONDER_USCM_HC, JOB_FAX_RESPONDER_USCM_PVST, JOB_FAX_RESPONDER_WY, JOB_FAX_RESPONDER_UPP, JOB_FAX_RESPONDER_TWE, JOB_FAX_RESPONDER_CLF) //---------- ANTAG ----------// diff --git a/code/__DEFINES/mode.dm b/code/__DEFINES/mode.dm index 036c82d46371..afa922c73314 100644 --- a/code/__DEFINES/mode.dm +++ b/code/__DEFINES/mode.dm @@ -138,7 +138,7 @@ GLOBAL_LIST_INIT(ROLES_WO, list(JOB_WO_CO, JOB_WO_XO, JOB_WO_CORPORATE_LIAISON, //Groundside roles GLOBAL_LIST_INIT(ROLES_XENO, list(JOB_XENOMORPH_QUEEN, JOB_XENOMORPH)) -GLOBAL_LIST_INIT(ROLES_WHITELISTED, list(JOB_SYNTH_SURVIVOR, JOB_CO_SURVIVOR, JOB_PREDATOR)) +GLOBAL_LIST_INIT(ROLES_WHITELISTED, list(JOB_SYNTH_SURVIVOR, JOB_CO_SURVIVOR, JOB_PREDATOR, JOB_FAX_RESPONDER)) GLOBAL_LIST_INIT(ROLES_SPECIAL, list(JOB_SURVIVOR)) GLOBAL_LIST_INIT(ROLES_USCM, ROLES_CIC + GLOB.ROLES_POLICE + GLOB.ROLES_AUXIL_SUPPORT + GLOB.ROLES_MISC + GLOB.ROLES_ENGINEERING + GLOB.ROLES_REQUISITION + GLOB.ROLES_MEDICAL + GLOB.ROLES_MARINES - ROLES_WO) @@ -197,7 +197,7 @@ GLOBAL_LIST_INIT(whitelist_hierarchy, list(WHITELIST_NORMAL, WHITELIST_COUNCIL, #define WHITELIST_MENTOR (1<<15) ///Fax Responder -#define WHITELIST_RESPONDER (1<<16) +#define WHITELIST_FAX_RESPONDER (1<<16) #define COUNCIL_LIST list(WHITELIST_COMMANDER_COUNCIL, WHITELIST_SYNTHETIC_COUNCIL, WHITELIST_YAUTJA_COUNCIL) #define SENATOR_LIST list(WHITELIST_COMMANDER_LEADER, WHITELIST_SYNTHETIC_LEADER, WHITELIST_YAUTJA_LEADER) @@ -221,6 +221,7 @@ DEFINE_BITFIELD(whitelist_status, list( "WHITELIST_SYNTHETIC_COUNCIL_LEGACY" = WHITELIST_SYNTHETIC_COUNCIL_LEGACY, "WHITELIST_SYNTHETIC_LEADER" = WHITELIST_SYNTHETIC_LEADER, "WHITELIST_MENTOR" = WHITELIST_MENTOR, + "WHITELIST_FAX_RESPONDER" = WHITELIST_FAX_RESPONDER, )) //================================================= diff --git a/code/game/gamemodes/cm_initialize.dm b/code/game/gamemodes/cm_initialize.dm index e7d22a8f3f44..7064f27627a0 100644 --- a/code/game/gamemodes/cm_initialize.dm +++ b/code/game/gamemodes/cm_initialize.dm @@ -260,10 +260,10 @@ Additional game mode variables. //===================================================\\ -/datum/game_mode/proc/check_responder_late_join(mob/responder, show_warning = TRUE) +/datum/game_mode/proc/check_fax_responder_late_join(mob/responder, show_warning = TRUE) if(!responder.client) return FALSE - if(!(responder?.client.check_whitelist_status(WHITELIST_RESPONDER))) + if(!(responder?.client.check_whitelist_status(WHITELIST_FAX_RESPONDER))) if(show_warning) to_chat(responder, SPAN_WARNING("You are not whitelisted!")) return FALSE @@ -275,51 +275,61 @@ Additional game mode variables. var/list/options = list() if(!responder_candidate.client) return FALSE - if(!(responder_candidate.client.check_whitelist_status(WHITELIST_RESPONDER))) + if(!(responder_candidate.client.check_whitelist_status(WHITELIST_FAX_RESPONDER))) to_chat(responder_candidate, SPAN_WARNING("You are not whitelisted!")) return FALSE - for(var/job in RESPONDER_JOB_LIST) - var/datum/job/responder_job = GLOB.RoleAuthority.roles_by_name[job] - var/job_max = responder_job.total_positions - if((responder_job.current_positions < job_max) && responder_job.can_play_role(responder_candidate.client)) + for(var/job in FAX_RESPONDER_JOB_LIST) + var/datum/job/fax_responder_job = GLOB.RoleAuthority.roles_by_name[job] + var/job_max = fax_responder_job.total_positions + if((fax_responder_job.current_positions < job_max) && fax_responder_job.can_play_role(responder_candidate.client)) options += job + return options -/datum/game_mode/proc/attempt_to_join_as_responder(mob/responder_candidate) - var/choice = tgui_input_list(src, "What Fax Responder do you want to join as?", "Which Responder?", get_fax_responder_slots(responder_candidate), 30 SECONDS) - if(!(choice in RESPONDER_JOB_LIST)) - to_chat(src, SPAN_WARNING("Error: No valid responder selected.")) +/datum/game_mode/proc/attempt_to_join_as_fax_responder(mob/responder_candidate) + var/list/options = get_fax_responder_slots(responder_candidate) + var/choice = tgui_input_list(responder_candidate, "What Fax Responder do you want to join as?", "Which Responder?", options, 30 SECONDS) + if(!(choice in FAX_RESPONDER_JOB_LIST)) + to_chat(responder_candidate, SPAN_WARNING("Error: No valid responder selected.")) return FALSE - var/mob/living/carbon/human/new_responder = transform_responder(responder_candidate, choice) //Initialized and ready. + var/mob/living/carbon/human/new_responder = transform_fax_responder(responder_candidate, choice) //Initialized and ready. if(!new_responder) return FALSE message_admins("([new_responder.key]) joined as a Fax Responder, [new_responder.real_name].") if(responder_candidate) responder_candidate.moveToNullspace() //Nullspace it for garbage collection later. + return TRUE -/datum/game_mode/proc/transform_responder(mob/responder_candidate, sub_job) +/datum/game_mode/proc/transform_fax_responder(mob/responder_candidate, sub_job) set waitfor = FALSE - if(!(sub_job in RESPONDER_JOB_LIST)) + if(!(sub_job in FAX_RESPONDER_JOB_LIST)) return if(!responder_candidate.client) // Legacy - probably due to spawn code sync sleeps - log_debug("Null client attempted to transform_responder") + log_debug("Null client attempted to transform_fax_responder") return + responder_candidate.client.prefs.find_assigned_slot(JOB_FAX_RESPONDER) + var/turf/spawn_point = get_turf(pick(GLOB.latejoin_by_job[sub_job])) var/mob/living/carbon/human/new_responder = new(spawn_point) responder_candidate.mind.transfer_to(new_responder, TRUE) - var/datum/job/responder_job = GLOB.RoleAuthority.roles_by_name[sub_job] + new_responder.client?.prefs.copy_all_to(new_responder, JOB_FAX_RESPONDER, TRUE, FALSE) + + var/datum/job/fax_responder_job = GLOB.RoleAuthority.roles_by_name[sub_job] - if(!responder_job) + if(!fax_responder_job) qdel(new_responder) return - // This is usually done in assign_role, a proc which is not executed in this case, since check_joe_late_join is running its own checks. - responder_job.current_positions++ - GLOB.RoleAuthority.equip_role(new_responder, responder_job, new_responder.loc) + + arm_equipment(new_responder, fax_responder_job.gear_preset, !new_responder.mind, TRUE) + + // This is usually done in assign_role, a proc which is not executed in this case, since check_fax_responder_late_join is running its own checks. + fax_responder_job.current_positions++ + GLOB.RoleAuthority.equip_role(new_responder, fax_responder_job, new_responder.loc) SSticker.minds += new_responder.mind return new_responder diff --git a/code/game/jobs/job/special/responders.dm b/code/game/jobs/job/special/responders.dm index 800972d6fcc2..41af237b0f76 100644 --- a/code/game/jobs/job/special/responders.dm +++ b/code/game/jobs/job/special/responders.dm @@ -1,49 +1,51 @@ -/datum/job/responder +/datum/job/fax_responder + title = JOB_FAX_RESPONDER + gear_preset = /datum/equipment_preset/fax_responder selection_class = "job_command" supervisors = "CMSS13 Administration Staff" total_positions = 1 spawn_positions = 1 - flags_startup_parameters = ROLE_ADMIN_NOTIFY|ROLE_WHITELISTED|ROLE_CUSTOM_SPAWN//|ROLE_HIDDEN - flags_whitelist = WHITELIST_RESPONDER + flags_startup_parameters = ROLE_ADMIN_NOTIFY|ROLE_WHITELISTED|ROLE_NO_ACCOUNT|ROLE_CUSTOM_SPAWN|ROLE_HIDDEN + flags_whitelist = WHITELIST_FAX_RESPONDER - gear_preset = /datum/equipment_preset/responder - entry_message_body = "Your job is to assist the marines in collecting intelligence related to the current operation to better inform command of their opposition. You are in charge of gathering any data disks, folders, and notes you may find on the operational grounds and decrypt them to grant the USCM additional resources." + gear_preset = /datum/equipment_preset/fax_responder + entry_message_body = "Your job is to answer faxes sent to your fax machine. You are answering on behalf of the CMSS13 staff team and are therefore expected to behave appropriately. You are not able to authorise ERTs." -AddTimelock(/datum/job/responder, list( +AddTimelock(/datum/job/fax_responder, list( JOB_POLICE_ROLES = 25 HOURS, JOB_COMMAND_ROLES = 75 HOURS, )) -/datum/job/responder/uscm_hc - title = JOB_RESPONDER_USCM_HC - gear_preset = /datum/equipment_preset/responder/uscm +/datum/job/fax_responder/uscm_hc + title = JOB_FAX_RESPONDER_USCM_HC + gear_preset = /datum/equipment_preset/fax_responder/uscm -/datum/job/responder/uscm_pvst - title = JOB_RESPONDER_USCM_PVST - gear_preset = /datum/equipment_preset/responder/uscm/provost +/datum/job/fax_responder/uscm_pvst + title = JOB_FAX_RESPONDER_USCM_PVST + gear_preset = /datum/equipment_preset/fax_responder/uscm/provost -AddTimelock(/datum/job/responder/uscm_pvst, list( +AddTimelock(/datum/job/fax_responder/uscm_pvst, list( JOB_POLICE_ROLES = 150 HOURS, JOB_COMMAND_ROLES = 50 HOURS, )) -/datum/job/responder/wy - title = JOB_RESPONDER_WY - gear_preset = /datum/equipment_preset/responder/wey_yu +/datum/job/fax_responder/wy + title = JOB_FAX_RESPONDER_WY + gear_preset = /datum/equipment_preset/fax_responder/wey_yu -AddTimelock(/datum/job/responder/wy, list( +AddTimelock(/datum/job/fax_responder/wy, list( JOB_CORPORATE_ROLES = 150 HOURS, )) -/datum/job/responder/upp - title = JOB_RESPONDER_UPP - gear_preset = /datum/equipment_preset/responder/upp +/datum/job/fax_responder/upp + title = JOB_FAX_RESPONDER_UPP + gear_preset = /datum/equipment_preset/fax_responder/upp -/datum/job/responder/twe - title = JOB_RESPONDER_TWE - gear_preset = /datum/equipment_preset/responder/twe +/datum/job/fax_responder/twe + title = JOB_FAX_RESPONDER_TWE + gear_preset = /datum/equipment_preset/fax_responder/twe -/datum/job/responder/clf - title = JOB_RESPONDER_CLF - gear_preset = /datum/equipment_preset/responder/clf +/datum/job/fax_responder/clf + title = JOB_FAX_RESPONDER_CLF + gear_preset = /datum/equipment_preset/fax_responder/clf diff --git a/code/game/jobs/whitelist.dm b/code/game/jobs/whitelist.dm index a02a3d47a8f6..0c87fcbb52d0 100644 --- a/code/game/jobs/whitelist.dm +++ b/code/game/jobs/whitelist.dm @@ -123,7 +123,7 @@ GLOBAL_LIST_INIT(yaut_flags, list( GLOBAL_LIST_INIT(misc_flags, list( list(name = "Senior Enlisted Advisor", bitflag = WHITELIST_MENTOR, permission = WL_PANEL_RIGHT_MENTOR), list(name = "Working Joe", bitflag = WHITELIST_JOE, permission = WL_PANEL_RIGHT_SYNTH), - list(name = "Fax Responder", bitflag = WHITELIST_RESPONDER, permission = WL_PANEL_RIGHT_MANAGER), + list(name = "Fax Responder", bitflag = WHITELIST_FAX_RESPONDER, permission = WL_PANEL_RIGHT_MANAGER), )) /datum/whitelist_panel/ui_static_data(mob/user) diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 45a57eb96392..cb1a812aa07e 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -8,7 +8,7 @@ //Used for logging people entering cryosleep and important items they are carrying. GLOBAL_LIST_EMPTY(frozen_crew) -GLOBAL_LIST_INIT(frozen_items, list(SQUAD_MARINE_1 = list(), SQUAD_MARINE_2 = list(), SQUAD_MARINE_3 = list(), SQUAD_MARINE_4 = list(), "MP" = list(), "REQ" = list(), "Eng" = list(), "Med" = list(), "Yautja" = list())) +GLOBAL_LIST_INIT(frozen_items, list(SQUAD_MARINE_1 = list(), SQUAD_MARINE_2 = list(), SQUAD_MARINE_3 = list(), SQUAD_MARINE_4 = list(), "MP" = list(), "REQ" = list(), "Eng" = list(), "Med" = list(), "Yautja" = list(), "Responders" = list())) //Main cryopod console. @@ -226,12 +226,15 @@ GLOBAL_LIST_INIT(frozen_items, list(SQUAD_MARINE_1 = list(), SQUAD_MARINE_2 = li switch(H.job) if(JOB_POLICE, JOB_WARDEN, JOB_CHIEF_POLICE) dept_console = GLOB.frozen_items["MP"] - if("Nurse", "Doctor","Researcher","Chief Medical Officer") + if(JOB_NURSE, JOB_DOCTOR, JOB_RESEARCHER, JOB_CMO) dept_console = GLOB.frozen_items["Med"] - if("Maintenance Technician", "Ordnance Technician","Chief Engineer") + if(JOB_MAINT_TECH, JOB_ORDNANCE_TECH, JOB_CHIEF_ENGINEER) dept_console = GLOB.frozen_items["Eng"] - if("Predator") + if(JOB_PREDATOR) dept_console = GLOB.frozen_items["Yautja"] + if(JOB_FAX_RESPONDER_USCM_HC, JOB_FAX_RESPONDER_USCM_PVST, JOB_FAX_RESPONDER_WY, JOB_FAX_RESPONDER_TWE, JOB_FAX_RESPONDER_UPP, JOB_FAX_RESPONDER_CLF) + dept_console = GLOB.frozen_items["Responders"] + H.species.handle_cryo(H) var/list/deleteempty = list(/obj/item/storage/backpack/marine/satchel) @@ -254,7 +257,7 @@ GLOBAL_LIST_INIT(frozen_items, list(SQUAD_MARINE_1 = list(), SQUAD_MARINE_2 = li item_loop: for(var/obj/item/W in items) - if(((W.flags_inventory & CANTSTRIP) || (W.flags_item & NODROP) || (W.flags_item & NO_CRYO_STORE)) && !isyautja(occupant)) //We don't keep donor items, undroppable/unremovable items, and specifically filtered items + if(((W.flags_inventory & CANTSTRIP) || (W.flags_item & NODROP) || (W.flags_item & NO_CRYO_STORE)) && !gearless_role(occupant)) //We don't keep donor items, undroppable/unremovable items, and specifically filtered items if(istype(W, /obj/item/clothing/suit/storage)) var/obj/item/clothing/suit/storage/SS = W for(var/obj/item/I in SS.pockets) //But we keep stuff inside them @@ -359,7 +362,7 @@ GLOBAL_LIST_INIT(frozen_items, list(SQUAD_MARINE_1 = list(), SQUAD_MARINE_2 = li //Make an announcement and log the person entering storage. GLOB.frozen_crew += "[occupant.real_name] ([occupant.job])" - if(!isyautja(occupant)) + if(!gearless_role(occupant)) ai_silent_announcement("[occupant.real_name], [occupant.job], has entered long-term hypersleep storage. Belongings moved to hypersleep inventory.") visible_message(SPAN_NOTICE("[src] hums and hisses as it moves [occupant.real_name] into hypersleep storage.")) @@ -539,6 +542,13 @@ GLOBAL_LIST_INIT(frozen_items, list(SQUAD_MARINE_1 = list(), SQUAD_MARINE_2 = li move_inside(target) +/obj/structure/machinery/cryopod/proc/gearless_role(mob/occupant) + if(isyautja(occupant)) + return TRUE + if(occupant.job in FAX_RESPONDER_JOB_LIST) + return TRUE + return FALSE + /obj/structure/machinery/cryopod/tutorial silent_exit = TRUE diff --git a/code/game/objects/effects/landmarks/landmarks.dm b/code/game/objects/effects/landmarks/landmarks.dm index 08aab03d38b3..d3ba4fd3215a 100644 --- a/code/game/objects/effects/landmarks/landmarks.dm +++ b/code/game/objects/effects/landmarks/landmarks.dm @@ -455,27 +455,27 @@ /obj/effect/landmark/late_join/responder/uscm name = "USCM HC Fax Responder late join" - job = JOB_RESPONDER_USCM_HC + job = JOB_FAX_RESPONDER_USCM_HC /obj/effect/landmark/late_join/responder/uscm/provost name = "USCM Provost Fax Responder late join" - job = JOB_RESPONDER_USCM_PVST + job = JOB_FAX_RESPONDER_USCM_PVST /obj/effect/landmark/late_join/responder/wey_yu name = "W-Y Fax Responder late join" - job = JOB_RESPONDER_WY + job = JOB_FAX_RESPONDER_WY /obj/effect/landmark/late_join/responder/upp name = "UPP Fax Responder late join" - job = JOB_RESPONDER_UPP + job = JOB_FAX_RESPONDER_UPP /obj/effect/landmark/late_join/responder/twe name = "TWE Fax Responder late join" - job = JOB_RESPONDER_TWE + job = JOB_FAX_RESPONDER_TWE /obj/effect/landmark/late_join/responder/clf name = "CLF Fax Responder late join" - job = JOB_RESPONDER_CLF + job = JOB_FAX_RESPONDER_CLF diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index c44ec6c62d36..f205a3dc8d44 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -883,7 +883,7 @@ GLOBAL_LIST_INIT(whitelisted_client_procs, list( if((flag_to_check & WHITELIST_MENTOR) && CLIENT_IS_MENTOR(src)) return TRUE - if(CLIENT_IS_STAFF(src) && (flag_to_check & WHITELIST_JOE|WHITELIST_RESPONDER)) + if(CLIENT_IS_STAFF(src) && (flag_to_check & WHITELIST_JOE|WHITELIST_FAX_RESPONDER)) return TRUE if(!player_data) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index e368d330f9d3..7f60140c0f6f 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -810,8 +810,6 @@ GLOBAL_LIST_INIT(bgstate_options, list( if(!job) debug_log("Missing job for prefs: [role_name]") continue - if(job.flags_startup_parameters & ROLE_HIDDEN) - continue index++ if((index >= limit) || (job.title in splitJobs)) HTML += "
" diff --git a/code/modules/gear_presets/fax_responders.dm b/code/modules/gear_presets/fax_responders.dm index 8d952c0c139c..fa26bd1fca91 100644 --- a/code/modules/gear_presets/fax_responders.dm +++ b/code/modules/gear_presets/fax_responders.dm @@ -1,4 +1,4 @@ -/datum/equipment_preset/responder +/datum/equipment_preset/fax_responder name = "Fax Responder" assignment = "Fax Responder" rank = "Fax Responder" @@ -12,13 +12,13 @@ skills = /datum/skills/civilian idtype = /obj/item/card/id/lanyard -/datum/equipment_preset/responder/load_gear(mob/living/carbon/human/new_human) +/datum/equipment_preset/fax_responder/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/tool/pen/fountain(new_human), WEAR_R_EAR) -/datum/equipment_preset/responder/load_id(mob/living/carbon/human/new_human, client/mob_client) +/datum/equipment_preset/fax_responder/load_id(mob/living/carbon/human/new_human, client/mob_client) var/obj/item/clothing/under/uniform = new_human.w_uniform if(istype(uniform)) uniform.has_sensor = UNIFORM_HAS_SENSORS @@ -27,17 +27,17 @@ //*****************************************************************************************************/ -/datum/equipment_preset/responder/uscm - name = JOB_RESPONDER_USCM_HC - assignment = JOB_RESPONDER_USCM_HC - rank = JOB_RESPONDER_USCM_HC +/datum/equipment_preset/fax_responder/uscm + name = JOB_FAX_RESPONDER_USCM_HC + assignment = JOB_FAX_RESPONDER_USCM_HC + rank = JOB_FAX_RESPONDER_USCM_HC paygrades = list(PAY_SHORT_MO2 = JOB_PLAYTIME_TIER_0, PAY_SHORT_MO3 = JOB_PLAYTIME_TIER_1, PAY_SHORT_MO4 = JOB_PLAYTIME_TIER_3) idtype = /obj/item/card/id/gold skills = /datum/skills/XO access = list(ACCESS_MARINE_COMMAND, ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_DATABASE, ACCESS_MARINE_MEDBAY) -/datum/equipment_preset/responder/uscm/load_gear(mob/living/carbon/human/new_human) +/datum/equipment_preset/fax_responder/uscm/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/marine/dress_cover/officer(new_human), WEAR_HEAD) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/dress/blues/senior(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/dress/blues/officer(new_human), WEAR_JACKET) @@ -47,24 +47,24 @@ new_human.equip_to_slot_or_del(new /obj/item/notepad/blue(new_human), WEAR_R_STORE) . = ..() -/datum/equipment_preset/responder/uscm/provost - name = JOB_RESPONDER_USCM_PVST - assignment = JOB_RESPONDER_USCM_PVST - rank = JOB_RESPONDER_USCM_PVST +/datum/equipment_preset/fax_responder/uscm/provost + name = JOB_FAX_RESPONDER_USCM_PVST + assignment = JOB_FAX_RESPONDER_USCM_PVST + rank = JOB_FAX_RESPONDER_USCM_PVST -/datum/equipment_preset/responder/uscm/provost/load_gear(mob/living/carbon/human/new_human) +/datum/equipment_preset/fax_responder/uscm/provost/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/notepad/red(new_human), WEAR_R_STORE) . = ..() //*****************************************************************************************************/ -/datum/equipment_preset/responder/wey_yu - name = JOB_RESPONDER_WY - assignment = JOB_RESPONDER_WY - rank = JOB_RESPONDER_WY +/datum/equipment_preset/fax_responder/wey_yu + name = JOB_FAX_RESPONDER_WY + assignment = JOB_FAX_RESPONDER_WY + rank = JOB_FAX_RESPONDER_WY paygrades = list(PAY_SHORT_WYC5 = JOB_PLAYTIME_TIER_0, PAY_SHORT_WYC6 = JOB_PLAYTIME_TIER_1, PAY_SHORT_WYC7 = JOB_PLAYTIME_TIER_3) -/datum/equipment_preset/responder/wey_yu/load_gear(mob/living/carbon/human/new_human) +/datum/equipment_preset/fax_responder/wey_yu/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/blue(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/corporate/blue(new_human), WEAR_JACKET) @@ -74,14 +74,14 @@ //*****************************************************************************************************/ -/datum/equipment_preset/responder/upp - name = JOB_RESPONDER_UPP - assignment = JOB_RESPONDER_UPP - rank = JOB_RESPONDER_UPP +/datum/equipment_preset/fax_responder/upp + name = JOB_FAX_RESPONDER_UPP + assignment = JOB_FAX_RESPONDER_UPP + rank = JOB_FAX_RESPONDER_UPP paygrades = list(PAY_SHORT_UO2 = JOB_PLAYTIME_TIER_0, PAY_SHORT_UO3 = JOB_PLAYTIME_TIER_1, PAY_SHORT_UO4 = JOB_PLAYTIME_TIER_3) skills = /datum/skills/upp/kapitan -/datum/equipment_preset/responder/upp/load_gear(mob/living/carbon/human/new_human) +/datum/equipment_preset/fax_responder/upp/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/beret, WEAR_HEAD) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP/officer(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/kapitan, WEAR_JACKET) @@ -96,12 +96,12 @@ //*****************************************************************************************************/ -/datum/equipment_preset/responder/twe - name = JOB_RESPONDER_TWE - assignment = JOB_RESPONDER_TWE - rank = JOB_RESPONDER_TWE +/datum/equipment_preset/fax_responder/twe + name = JOB_FAX_RESPONDER_TWE + assignment = JOB_FAX_RESPONDER_TWE + rank = JOB_FAX_RESPONDER_TWE -/datum/equipment_preset/responder/twe/load_gear(mob/living/carbon/human/new_human) +/datum/equipment_preset/fax_responder/twe/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/twe_suit(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) @@ -111,7 +111,7 @@ //*****************************************************************************************************/ -/datum/equipment_preset/responder/clf - name = JOB_RESPONDER_CLF - assignment = JOB_RESPONDER_CLF - rank = JOB_RESPONDER_CLF +/datum/equipment_preset/fax_responder/clf + name = JOB_FAX_RESPONDER_CLF + assignment = JOB_FAX_RESPONDER_CLF + rank = JOB_FAX_RESPONDER_CLF diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 7f52beac6073..58d9d4e2fa7b 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -1129,6 +1129,20 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp if(SSticker.mode.check_joe_late_join(src)) SSticker.mode.attempt_to_join_as_joe(src) +/mob/dead/verb/join_as_responder() + set category = "Ghost.Join" + set name = "Join as a Fax Responder" + set desc = "If you are whitelisted, you'll be able to join in." + + if (!client) + return + + if(SSticker.current_state < GAME_STATE_PLAYING || !SSticker.mode) + to_chat(src, SPAN_WARNING("The game hasn't started yet!")) + return + + if(SSticker.mode.check_fax_responder_late_join(src)) + SSticker.mode.attempt_to_join_as_fax_responder(src) /mob/dead/verb/drop_vote() set category = "Ghost" diff --git a/code/modules/mob/dead/observer/orbit.dm b/code/modules/mob/dead/observer/orbit.dm index 8c8d653331c9..0a7e4dfeac20 100644 --- a/code/modules/mob/dead/observer/orbit.dm +++ b/code/modules/mob/dead/observer/orbit.dm @@ -49,6 +49,7 @@ var/list/data = list() var/list/humans = list() + var/list/responders = list() var/list/marines = list() var/list/survivors = list() var/list/xenos = list() @@ -174,6 +175,8 @@ marines += list(serialized) else if(issurvivorjob(human.job)) survivors += list(serialized) + else if(human.job in FAX_RESPONDER_JOB_LIST) + responders += list(serialized) else humans += list(serialized) continue @@ -189,6 +192,7 @@ data["clf"] = clf data["wy"] = wy data["twe"] = twe + data["responders"] = responders data["freelancer"] = freelancer data["contractor"] = contractor data["mercenary"] = mercenary diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index c73689cf3f33..c784d2115cb1 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -58,7 +58,7 @@ output += "

Join the Hive!

" if(SSticker.mode.flags_round_type & MODE_PREDATOR) if(SSticker.mode.check_predator_late_join(src, FALSE)) output += "

Join the Hunt!

" - if(SSticker.mode.check_responder_late_join(src, FALSE)) output += "

Respond to Faxes

" + if(SSticker.mode.check_fax_responder_late_join(src, FALSE)) output += "

Respond to Faxes

" output += "

Observe

" @@ -202,9 +202,10 @@ return if(alert(src,"Are you sure you want to attempt joining as a Fax Responder?","Confirmation","Yes","No") == "Yes" ) - if(SSticker.mode.check_responder_late_join(src, FALSE)) + if(SSticker.mode.check_fax_responder_late_join(src, FALSE)) close_spawn_windows() - SSticker.mode.attempt_to_join_as_responder(src) + if(!SSticker.mode.attempt_to_join_as_fax_responder(src)) + new_player_panel() else to_chat(src, SPAN_WARNING("You are no longer able to join as a Fax Responder.")) new_player_panel() diff --git a/tgui/packages/tgui/interfaces/Orbit/index.tsx b/tgui/packages/tgui/interfaces/Orbit/index.tsx index 36ceb6359cde..8c2d673145d3 100644 --- a/tgui/packages/tgui/interfaces/Orbit/index.tsx +++ b/tgui/packages/tgui/interfaces/Orbit/index.tsx @@ -283,6 +283,7 @@ const ObservableContent = () => { const { data } = useBackend(); const { humans = [], + responders = [], marines = [], survivors = [], xenos = [], @@ -371,6 +372,11 @@ const ObservableContent = () => { section={marshal} title="Colonial Marshal Bureau" /> + diff --git a/tgui/packages/tgui/interfaces/Orbit/types.ts b/tgui/packages/tgui/interfaces/Orbit/types.ts index ca21898287d0..f72396b3f344 100644 --- a/tgui/packages/tgui/interfaces/Orbit/types.ts +++ b/tgui/packages/tgui/interfaces/Orbit/types.ts @@ -7,6 +7,7 @@ export type OrbitData = { survivors: Observable[]; xenos: Observable[]; ert_members: Observable[]; + responders: Observable[]; upp: Observable[]; twe: Observable[]; clf: Observable[]; From a896139a5f001e3ddb70fa35d21fa577a513788d Mon Sep 17 00:00:00 2001 From: forest2001 Date: Mon, 9 Sep 2024 17:52:23 +0100 Subject: [PATCH 07/50] temp station --- code/datums/emergency_calls/emergency_call.dm | 1 + code/datums/emergency_calls/ert_stations.dm | 3 + code/game/area/admin_level.dm | 4 + code/game/gamemodes/cm_initialize.dm | 5 + maps/map_files/USS_Almayer/USS_Almayer.dmm | 36 +- .../lazy_templates/fax_responder_base.dmm | 6237 +++++++++++++++++ 6 files changed, 6256 insertions(+), 30 deletions(-) create mode 100644 maps/templates/lazy_templates/fax_responder_base.dmm diff --git a/code/datums/emergency_calls/emergency_call.dm b/code/datums/emergency_calls/emergency_call.dm index e956a9731c7c..8a96d73eb4de 100644 --- a/code/datums/emergency_calls/emergency_call.dm +++ b/code/datums/emergency_calls/emergency_call.dm @@ -9,6 +9,7 @@ var/list/datum/emergency_call/all_calls = list() //initialized at round start and stores the datums. var/datum/emergency_call/picked_calls[] = list() //Which distress calls are currently active var/ert_dispatched = FALSE + var/loaded_fax_base = FALSE /datum/game_mode/proc/ares_online() var/name = "ARES Online" diff --git a/code/datums/emergency_calls/ert_stations.dm b/code/datums/emergency_calls/ert_stations.dm index 5a129723bad0..947007d25d70 100644 --- a/code/datums/emergency_calls/ert_stations.dm +++ b/code/datums/emergency_calls/ert_stations.dm @@ -18,3 +18,6 @@ /datum/lazy_template/ert/uscm_station map_name = "uscm_ert_station" + +/datum/lazy_template/fax_response_base + map_name = "fax_responder_base" diff --git a/code/game/area/admin_level.dm b/code/game/area/admin_level.dm index 9dc43256f4de..f522ca24cd16 100644 --- a/code/game/area/admin_level.dm +++ b/code/game/area/admin_level.dm @@ -142,6 +142,10 @@ soundscape_playlist = SCAPE_PL_ELEVATOR_MUSIC icon_state = "yellow" +/area/adminlevel/ert_station/fax_response_station + name = "Sector Comms Relay" + icon_state = "green" + //Simulation area /area/adminlevel/simulation name = "Simulated Reality" diff --git a/code/game/gamemodes/cm_initialize.dm b/code/game/gamemodes/cm_initialize.dm index 7064f27627a0..b74bc357e09b 100644 --- a/code/game/gamemodes/cm_initialize.dm +++ b/code/game/gamemodes/cm_initialize.dm @@ -311,6 +311,11 @@ Additional game mode variables. if(!responder_candidate.client) // Legacy - probably due to spawn code sync sleeps log_debug("Null client attempted to transform_fax_responder") return + if(!loaded_fax_base) + loaded_fax_base = SSmapping.lazy_load_template(/datum/lazy_template/fax_response_base, force = TRUE) + if(!loaded_fax_base) + log_debug("Error loading fax response base!") + return responder_candidate.client.prefs.find_assigned_slot(JOB_FAX_RESPONDER) diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index c0d841166e98..b5181e0f77f6 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -30851,10 +30851,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/u_a_p) -"iXF" = ( -/obj/effect/landmark/late_join/responder/clf, -/turf/open/floor/almayer/redcorner/east, -/area/almayer/living/briefing) "iXT" = ( /obj/item/trash/uscm_mre, /turf/open/floor/almayer, @@ -30891,10 +30887,6 @@ }, /turf/open/floor/almayer/cargo_arrow/north, /area/almayer/medical/hydroponics) -"iYl" = ( -/obj/effect/landmark/late_join/responder/wey_yu, -/turf/open/floor/almayer, -/area/almayer/living/briefing) "iYm" = ( /obj/structure/largecrate/random/case/small, /turf/open/floor/almayer/plate, @@ -35990,10 +35982,6 @@ }, /turf/open/floor/plating, /area/almayer/command/cic) -"lbb" = ( -/obj/effect/landmark/late_join/responder/twe, -/turf/open/floor/almayer, -/area/almayer/living/briefing) "lbf" = ( /obj/structure/machinery/cryopod{ pixel_y = 6 @@ -42394,10 +42382,6 @@ }, /turf/open/floor/almayer/no_build/plating, /area/almayer/command/airoom) -"nKl" = ( -/obj/effect/landmark/late_join/responder/uscm/provost, -/turf/open/floor/almayer, -/area/almayer/living/briefing) "nKq" = ( /obj/structure/machinery/status_display{ pixel_x = 16; @@ -51772,10 +51756,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_m_s) -"rAq" = ( -/obj/effect/landmark/late_join/responder/uscm, -/turf/open/floor/almayer, -/area/almayer/living/briefing) "rAw" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_full" @@ -65677,10 +65657,6 @@ "xaS" = ( /turf/open/floor/almayer/uscm/directional/northeast, /area/almayer/command/lifeboat) -"xaY" = ( -/obj/effect/landmark/late_join/responder/upp, -/turf/open/floor/almayer, -/area/almayer/living/briefing) "xba" = ( /turf/closed/wall/almayer/reinforced/temphull, /area/almayer/living/cryo_cells) @@ -102856,7 +102832,7 @@ bqZ bCg beH fUA -lbb +beH bCg bqZ beH @@ -103065,7 +103041,7 @@ beH beH beH beH -iYl +beH fUA beH beH @@ -103663,7 +103639,7 @@ yfg fZE nyw bqZ -rAq +beH bgO boq boq @@ -105288,7 +105264,6 @@ meQ fZE bdg bqZ -nKl beH beH beH @@ -105296,7 +105271,8 @@ beH beH beH beH -xaY +beH +beH beH beH beH @@ -105699,7 +105675,7 @@ bCu bCu bCu bCu -iXF +wCI moQ flW fvf diff --git a/maps/templates/lazy_templates/fax_responder_base.dmm b/maps/templates/lazy_templates/fax_responder_base.dmm new file mode 100644 index 000000000000..1691f89f0d7c --- /dev/null +++ b/maps/templates/lazy_templates/fax_responder_base.dmm @@ -0,0 +1,6237 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"ae" = ( +/obj/structure/machinery/door_control{ + id = "kitchen_pizza_time"; + name = "Main Kitchen Shutters"; + pixel_x = 28 + }, +/obj/structure/safe/floor, +/obj/item/spacecash/c1000, +/obj/item/spacecash/c100, +/obj/item/spacecash/c10, +/obj/item/spacecash/c10, +/obj/item/spacecash/c10, +/obj/item/spacecash/c10, +/obj/item/spacecash/c100, +/obj/item/spacecash/c100, +/obj/item/spacecash/c100, +/obj/item/spacecash/c100, +/obj/item/spacecash/c100, +/obj/item/spacecash/c100, +/obj/item/spacecash/c50, +/obj/item/spacecash/c50, +/obj/item/spacecash/c50, +/obj/item/spacecash/c50, +/obj/item/spacecash/c50, +/obj/item/spacecash/c500, +/obj/item/spacecash/c500, +/obj/item/spacecash/c500, +/turf/open/floor/cmo, +/area/adminlevel/ert_station/fax_response_station) +"ah" = ( +/obj/structure/prop/invuln{ + desc = "An inflated membrane. This one is puncture proof. Wow!"; + icon = 'icons/obj/items/inflatable.dmi'; + icon_state = "wall"; + name = "Docking Umbilical" + }, +/obj/structure/blocker/invisible_wall, +/obj/structure/sign/safety/airlock{ + pixel_y = 32 + }, +/obj/structure/sign/safety/hazard{ + pixel_x = 15; + pixel_y = 32 + }, +/turf/open/floor/almayer_hull, +/area/adminlevel/ert_station/fax_response_station) +"am" = ( +/obj/structure/surface/table/almayer, +/obj/structure/barricade/handrail/pizza{ + dir = 4; + pixel_y = -3 + }, +/obj/structure/barricade/handrail/pizza{ + pixel_y = -3 + }, +/obj/item/reagent_container/food/drinks/cans/souto/cherry{ + pixel_x = -8; + layer = 2.97 + }, +/obj/item/reagent_container/food/drinks/cans/souto/cherry{ + anchored = 1; + layer = 2.97 + }, +/obj/item/reagent_container/food/drinks/cans/souto/cherry{ + pixel_x = 8; + layer = 2.97 + }, +/obj/item/reagent_container/food/drinks/cans/souto/cherry{ + layer = 4.1; + pixel_x = -4; + pixel_y = 18 + }, +/obj/item/reagent_container/food/drinks/cans/souto/cherry{ + layer = 4.1; + pixel_x = 4; + pixel_y = 18 + }, +/obj/item/reagent_container/food/drinks/cans/souto/cherry{ + layer = 4.2; + pixel_y = 36 + }, +/turf/open/floor/prison/kitchen, +/area/adminlevel/ert_station/fax_response_station) +"an" = ( +/obj/structure/bed/chair/bolted{ + dir = 1; + pixel_y = 12; + buckling_y = 12 + }, +/turf/open/floor/prison, +/area/adminlevel/ert_station/fax_response_station) +"ap" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/pipes/vents/scrubber{ + dir = 8 + }, +/turf/open/floor/almayer/dark_sterile, +/area/adminlevel/ert_station/fax_response_station) +"aq" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 4 + }, +/turf/open/floor/prison/kitchen, +/area/adminlevel/ert_station/fax_response_station) +"aA" = ( +/obj/structure/surface/table/reinforced, +/obj/structure/machinery/microwave{ + pixel_y = 8 + }, +/turf/open/floor/prison/kitchen, +/area/adminlevel/ert_station/fax_response_station) +"aD" = ( +/obj/structure/sign/safety/nonpress_0g{ + pixel_x = 32 + }, +/obj/structure/sign/safety/manualopenclose{ + pixel_y = 14; + pixel_x = 32 + }, +/turf/open/floor/plating/prison, +/area/adminlevel/ert_station/fax_response_station) +"aJ" = ( +/obj/structure/prop/souto_land/streamer{ + dir = 1; + pixel_y = 9; + pixel_x = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/prison/red, +/area/adminlevel/ert_station/fax_response_station) +"aP" = ( +/obj/structure/prop/souto_land/pole{ + dir = 8; + pixel_y = 9 + }, +/obj/structure/prop/souto_land/streamer{ + dir = 9 + }, +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/prison/red, +/area/adminlevel/ert_station/fax_response_station) +"aS" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out" + }, +/obj/structure/sign/safety/debark_lounge{ + pixel_y = -32 + }, +/obj/structure/sign/safety/landingzone{ + pixel_y = -32; + pixel_x = 15 + }, +/turf/open/floor/prison/yellow, +/area/adminlevel/ert_station/fax_response_station) +"bd" = ( +/obj/structure/prop/invuln{ + desc = "An inflated membrane. This one is puncture proof. Wow!"; + icon = 'icons/obj/items/inflatable.dmi'; + icon_state = "wall"; + name = "Docking Umbilical" + }, +/obj/structure/blocker/invisible_wall, +/turf/open/floor/almayer_hull, +/area/adminlevel/ert_station/fax_response_station) +"bl" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + pixel_y = -1 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/corsat/retrosquareslight, +/area/adminlevel/ert_station/fax_response_station) +"bo" = ( +/obj/structure/machinery/shower{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 4; + health = 80 + }, +/obj/structure/window/reinforced{ + dir = 8; + health = 80 + }, +/turf/open/floor/plating/plating_catwalk, +/area/adminlevel/ert_station/fax_response_station) +"bB" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/prison/kitchen, +/area/adminlevel/ert_station/fax_response_station) +"bT" = ( +/obj/structure/surface/table/reinforced, +/obj/structure/machinery/recharger, +/turf/open/floor/cmo, +/area/adminlevel/ert_station/fax_response_station) +"bU" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper Central Fridge"; + dir = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer/test_floor4, +/area/adminlevel/ert_station/fax_response_station) +"cq" = ( +/obj/structure/pipes/vents/scrubber{ + dir = 8 + }, +/turf/open/floor/prison/red/east, +/area/adminlevel/ert_station/fax_response_station) +"cr" = ( +/obj/structure/surface/table/reinforced, +/obj/item/trash/plate{ + pixel_x = 1; + pixel_y = 3 + }, +/obj/item/trash/plate{ + pixel_x = 1; + pixel_y = 6 + }, +/obj/item/reagent_container/food/condiment/saltshaker{ + pixel_x = -4 + }, +/obj/item/reagent_container/food/condiment/peppermill{ + pixel_x = 4 + }, +/turf/open/floor/cmo, +/area/adminlevel/ert_station/fax_response_station) +"cE" = ( +/obj/structure/surface/table/reinforced/cloth, +/obj/item/trash/ceramic_plate{ + pixel_y = 4; + pixel_x = -2 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"cI" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/turf/open/floor/blueyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"cK" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/sign/safety/airlock{ + pixel_y = 32 + }, +/obj/structure/sign/safety/hazard{ + pixel_x = 15; + pixel_y = 32 + }, +/turf/open/floor/prison/yellow/north, +/area/adminlevel/ert_station/fax_response_station) +"cL" = ( +/obj/structure/bed/chair/bolted{ + dir = 8; + pixel_x = -7; + buckling_x = -7 + }, +/turf/open/floor/prison, +/area/adminlevel/ert_station/fax_response_station) +"cO" = ( +/obj/structure/barricade/handrail/pizza{ + dir = 8; + pixel_y = -3 + }, +/obj/structure/barricade/handrail/pizza{ + dir = 1; + pixel_y = 12 + }, +/obj/structure/prop/souto_land/streamer{ + dir = 6 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"cP" = ( +/obj/structure/surface/table/reinforced, +/obj/item/trash/ceramic_plate{ + pixel_y = 5 + }, +/obj/item/trash/ceramic_plate{ + pixel_y = 8 + }, +/obj/item/trash/ceramic_plate{ + pixel_y = 11 + }, +/obj/item/trash/ceramic_plate{ + pixel_y = 14 + }, +/turf/open/floor/prison/kitchen, +/area/adminlevel/ert_station/fax_response_station) +"cT" = ( +/obj/effect/landmark/late_join/responder/clf, +/turf/open/floor/prison/kitchen, +/area/adminlevel/ert_station/fax_response_station) +"dc" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/turf/open/floor/prison/red/east, +/area/adminlevel/ert_station/fax_response_station) +"dh" = ( +/obj/structure/surface/table/reinforced/cloth, +/obj/item/reagent_container/food/drinks/cans/souto/diet/cranberry{ + pixel_y = 20; + layer = 3.03; + pixel_x = 4 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"dS" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper Freezer" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer/test_floor4, +/area/adminlevel/ert_station/fax_response_station) +"ec" = ( +/obj/structure/surface/table/reinforced/cloth, +/obj/item/reagent_container/food/snacks/birthdaycakeslice, +/obj/item/reagent_container/food/drinks/cans/dr_gibb{ + pixel_x = -8; + pixel_y = -6 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"ef" = ( +/obj/structure/surface/rack, +/obj/item/reagent_container/food/snacks/sliceable/cheesewheel/mature{ + pixel_x = -1; + pixel_y = 7 + }, +/obj/item/reagent_container/food/snacks/sliceable/cheesewheel/mature{ + pixel_x = 1; + pixel_y = -5 + }, +/turf/open/floor/cmo, +/area/adminlevel/ert_station/fax_response_station) +"eh" = ( +/obj/structure/surface/table/reinforced/cloth, +/obj/item/reagent_container/food/snacks/omelette{ + pixel_y = 2; + pixel_x = 1 + }, +/obj/item/reagent_container/food/condiment/coldsauce{ + pixel_y = 22; + pixel_x = -10 + }, +/obj/item/tool/kitchen/utensil/fork{ + pixel_y = 2; + pixel_x = -8 + }, +/obj/item/reagent_container/food/drinks/coffee{ + pixel_y = 13; + pixel_x = 5 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"ei" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer_hull, +/area/adminlevel/ert_station/fax_response_station) +"eo" = ( +/obj/structure/closet/secure_closet/freezer/meat, +/obj/item/reagent_container/food/condiment/coldsauce, +/obj/item/reagent_container/food/condiment/coldsauce, +/obj/structure/machinery/light/small/blue{ + dir = 1; + pixel_y = 20; + pixel_x = 16 + }, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/turf/open/floor/prison/greenblue/north, +/area/adminlevel/ert_station/fax_response_station) +"eD" = ( +/obj/structure/reagent_dispensers/water_cooler/stacks{ + density = 0; + pixel_x = -11; + pixel_y = -1 + }, +/turf/open/floor/cmo, +/area/adminlevel/ert_station/fax_response_station) +"eI" = ( +/obj/structure/platform/kutjevo/smooth, +/turf/open/space/basic, +/area/space) +"eK" = ( +/obj/structure/prop/souto_land/pole{ + dir = 8; + pixel_y = 9; + pixel_x = 1 + }, +/turf/open/floor/prison/red/southeast, +/area/adminlevel/ert_station/fax_response_station) +"eQ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + pixel_y = -1 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/cmo, +/area/adminlevel/ert_station/fax_response_station) +"eW" = ( +/turf/open/mars_dirt/mars_cave_11, +/area/space) +"fb" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8 + }, +/obj/structure/platform/kutjevo/smooth, +/turf/open/space, +/area/space) +"fg" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/prison/kitchen, +/area/adminlevel/ert_station/fax_response_station) +"fj" = ( +/obj/structure/closet/firecloset/full, +/turf/open/floor/prison/yellow/west, +/area/adminlevel/ert_station/fax_response_station) +"fu" = ( +/turf/open/floor/plating, +/area/adminlevel/ert_station/fax_response_station) +"fE" = ( +/obj/structure/bed/sofa/south/grey/right, +/turf/open/floor/prison/yellowcorner/east, +/area/adminlevel/ert_station/fax_response_station) +"fH" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1 + }, +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 8 + }, +/turf/open/space, +/area/space) +"fN" = ( +/obj/structure/surface/table/reinforced/cloth, +/obj/item/reagent_container/food/drinks/cans/souto/peach{ + pixel_y = 14; + pixel_x = -4 + }, +/obj/item/reagent_container/food/drinks/cans/souto/diet/lime{ + pixel_y = 9 + }, +/obj/structure/machinery/light, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"fO" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 4 + }, +/turf/open/space/basic, +/area/space) +"gb" = ( +/obj/structure/barricade/handrail/pizza{ + pixel_y = -3 + }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/turf/open/floor/blueyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"gu" = ( +/obj/structure/surface/table/almayer, +/obj/structure/barricade/handrail/pizza{ + pixel_y = -3 + }, +/obj/item/storage/box/drinkingglasses{ + layer = 2.97; + pixel_x = 12 + }, +/obj/item/reagent_container/food/drinks/shaker{ + pixel_x = -11; + layer = 2.97; + pixel_y = 2 + }, +/obj/item/reagent_container/food/drinks/bottle/rum{ + pixel_y = 2; + pixel_x = -2; + layer = 2.97 + }, +/turf/open/floor/prison/kitchen, +/area/adminlevel/ert_station/fax_response_station) +"gy" = ( +/obj/structure/barricade/handrail/pizza{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/blueyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"gU" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N" + }, +/turf/open/floor/prison/yellow, +/area/adminlevel/ert_station/fax_response_station) +"gV" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/machinery/light{ + pixel_x = 16; + dir = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/sign/safety/restrictedarea{ + pixel_y = 32 + }, +/turf/open/floor/prison/kitchen, +/area/adminlevel/ert_station/fax_response_station) +"ha" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 1 + }, +/turf/open/space, +/area/space) +"hb" = ( +/obj/structure/barricade/handrail/pizza{ + dir = 1; + pixel_y = 12 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"hc" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/turf/open/floor/prison/red, +/area/adminlevel/ert_station/fax_response_station) +"hg" = ( +/turf/open/floor/prison/yellowcorner/north, +/area/adminlevel/ert_station/fax_response_station) +"hv" = ( +/obj/structure/closet/crate/freezer/cooler, +/turf/open/floor/prison/floor_marked/southwest, +/area/adminlevel/ert_station/fax_response_station) +"hL" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 4 + }, +/turf/open/floor/prison/greenblue/north, +/area/adminlevel/ert_station/fax_response_station) +"hR" = ( +/obj/structure/barricade/handrail/pizza{ + dir = 8; + pixel_y = -3 + }, +/obj/structure/bed/chair/bolted{ + dir = 4; + pixel_x = 7; + buckling_x = 7 + }, +/obj/structure/sign/safety/hazard{ + pixel_x = 15; + pixel_y = -32 + }, +/obj/structure/sign/safety/airlock{ + pixel_y = -32 + }, +/obj/structure/prop/souto_land/streamer{ + dir = 6 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"hX" = ( +/obj/structure/bed/chair/bolted{ + pixel_y = -1; + buckling_y = -1 + }, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"ic" = ( +/obj/item/trash/plate{ + pixel_y = 4 + }, +/obj/item/trash/plate{ + pixel_y = 6 + }, +/obj/item/trash/plate{ + pixel_y = 8 + }, +/obj/item/trash/plate{ + pixel_y = 10 + }, +/obj/structure/surface/table/almayer, +/obj/structure/barricade/handrail/pizza{ + pixel_y = -3 + }, +/obj/item/reagent_container/food/drinks/drinkingglass{ + pixel_y = 14; + pixel_x = 11 + }, +/obj/item/reagent_container/food/drinks/drinkingglass{ + pixel_y = 9; + pixel_x = 12 + }, +/turf/open/floor/prison/kitchen, +/area/adminlevel/ert_station/fax_response_station) +"im" = ( +/obj/structure/bed/chair/janicart, +/turf/open/floor/prison, +/area/adminlevel/ert_station/fax_response_station) +"ir" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/prison/red/east, +/area/adminlevel/ert_station/fax_response_station) +"iw" = ( +/obj/structure/surface/table/reinforced, +/obj/item/reagent_container/food/snacks/tofukabob, +/obj/item/reagent_container/food/snacks/tofukabob{ + pixel_y = 10 + }, +/obj/item/reagent_container/food/snacks/tofukabob{ + pixel_y = 5 + }, +/turf/open/floor/prison/greenblue/southeast, +/area/adminlevel/ert_station/fax_response_station) +"iY" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + layer = 2.5 + }, +/obj/structure/sign/safety/debark_lounge{ + pixel_y = 32 + }, +/obj/structure/sign/safety/landingzone{ + pixel_y = 32; + pixel_x = 15 + }, +/turf/open/floor/prison/yellow/north, +/area/adminlevel/ert_station/fax_response_station) +"ja" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 4 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 1 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 8 + }, +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/turf/open/space, +/area/space) +"jb" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/turf/open/floor/prison/red/northeast, +/area/adminlevel/ert_station/fax_response_station) +"jf" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/item/trash/ceramic_plate{ + pixel_y = 2 + }, +/obj/item/reagent_container/food/snacks/toastedsandwich{ + pixel_y = 11 + }, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + name = "\improper Kitchen Shutters"; + id = "kitchen_pizza_time" + }, +/turf/open/floor/almayer/plate, +/area/adminlevel/ert_station/fax_response_station) +"jo" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/cmo, +/area/adminlevel/ert_station/fax_response_station) +"jq" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 12 + }, +/obj/structure/mirror{ + pixel_x = 29 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/obj/structure/machinery/light/small{ + dir = 1; + pixel_y = 13 + }, +/turf/open/floor/plating/plating_catwalk, +/area/adminlevel/ert_station/fax_response_station) +"jx" = ( +/obj/structure/bed/chair/bolted{ + dir = 4; + pixel_x = 7; + pixel_y = -6; + buckling_x = 7; + buckling_y = -6 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"jy" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/item/tool/kitchen/tray{ + pixel_y = 6 + }, +/obj/item/tool/kitchen/tray{ + pixel_y = 9 + }, +/obj/item/tool/kitchen/tray{ + pixel_y = 12 + }, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + name = "\improper Kitchen Shutters"; + id = "kitchen_pizza_time" + }, +/turf/open/floor/almayer/plate, +/area/adminlevel/ert_station/fax_response_station) +"jH" = ( +/turf/open/mars/mars_cave_10, +/area/space) +"jT" = ( +/obj/structure/barricade/handrail/pizza{ + pixel_y = -3 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/blueyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"jV" = ( +/obj/structure/barricade/handrail/pizza{ + dir = 8 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"kz" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + dir = 1; + name = "\improper Kitchen" + }, +/turf/open/floor/almayer/test_floor4, +/area/adminlevel/ert_station/fax_response_station) +"kW" = ( +/obj/structure/barricade/handrail/pizza{ + dir = 8 + }, +/obj/structure/prop/souto_land/streamer{ + dir = 1; + pixel_y = 9 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"la" = ( +/obj/structure/blocker/invisible_wall, +/obj/structure/machinery/door/poddoor/almayer{ + unacidable = 1 + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + locked = 1 + }, +/turf/open/floor/almayer/test_floor4, +/area/adminlevel/ert_station/fax_response_station) +"lg" = ( +/turf/closed/shuttle/ert{ + icon_state = "leftengine_1" + }, +/area/adminlevel/ert_station/fax_response_station) +"lv" = ( +/obj/structure/surface/table/almayer, +/obj/structure/barricade/handrail/pizza{ + pixel_y = -3 + }, +/obj/item/reagent_container/food/drinks/drinkingglass/cola{ + pixel_y = 8; + pixel_x = -2 + }, +/obj/item/reagent_container/food/drinks/shaker{ + pixel_y = 5; + pixel_x = -11 + }, +/turf/open/floor/prison/kitchen, +/area/adminlevel/ert_station/fax_response_station) +"lw" = ( +/obj/structure/surface/table/reinforced/cloth, +/obj/item/reagent_container/food/condiment/coldsauce{ + pixel_y = 22; + pixel_x = -10 + }, +/obj/item/clothing/mask/cigarette{ + pixel_x = 4; + pixel_y = 11 + }, +/obj/item/ashtray/glass{ + pixel_x = -6 + }, +/obj/item/clothing/mask/cigarette{ + pixel_y = 8 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"lx" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 8 + }, +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/turf/open/space/basic, +/area/space) +"ly" = ( +/obj/structure/surface/table/reinforced/cloth, +/obj/item/reagent_container/food/drinks/cans/souto/grape{ + pixel_y = 16; + pixel_x = 9 + }, +/obj/item/reagent_container/food/drinks/cans/souto/lime{ + pixel_y = 12; + pixel_x = 5 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"lB" = ( +/obj/structure/barricade/handrail/pizza{ + dir = 8; + pixel_y = -3 + }, +/obj/structure/barricade/handrail/pizza{ + dir = 1; + pixel_y = 12 + }, +/obj/item/storage/briefcase/stowaway{ + pixel_y = 11; + layer = 4.11 + }, +/obj/structure/prop/souto_land/streamer{ + dir = 6 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"lE" = ( +/obj/structure/machinery/vending/dinnerware, +/obj/structure/barricade/handrail/pizza{ + pixel_y = -3 + }, +/turf/open/floor/prison/kitchen, +/area/adminlevel/ert_station/fax_response_station) +"lH" = ( +/obj/structure/machinery/door/poddoor/almayer/locked{ + icon_state = "almayer_pdoor"; + id = "pizza_takeaway_out" + }, +/turf/open/floor/almayer/test_floor4, +/area/adminlevel/ert_station/fax_response_station) +"lJ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N" + }, +/obj/structure/sign/safety/airlock{ + pixel_y = -32 + }, +/obj/structure/sign/safety/hazard{ + pixel_x = 15; + pixel_y = -32 + }, +/turf/open/floor/prison/yellow, +/area/adminlevel/ert_station/fax_response_station) +"lL" = ( +/turf/open/floor/almayer_hull, +/area/adminlevel/ert_station/fax_response_station) +"lN" = ( +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_x = -30 + }, +/turf/open/floor/prison/bright_clean2, +/area/adminlevel/ert_station/fax_response_station) +"ma" = ( +/obj/structure/surface/table/reinforced/cloth, +/obj/item/storage/donut_box{ + pixel_y = 10; + pixel_x = 1 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"me" = ( +/turf/open/mars_dirt/mars_cave_8, +/area/space) +"mj" = ( +/obj/structure/machinery/shower{ + pixel_y = 16 + }, +/obj/structure/window/reinforced{ + dir = 4; + health = 80 + }, +/obj/structure/window/reinforced{ + dir = 8; + health = 80 + }, +/obj/structure/machinery/light/small{ + dir = 1; + pixel_x = 16; + pixel_y = 20 + }, +/turf/open/floor/plating/plating_catwalk, +/area/adminlevel/ert_station/fax_response_station) +"mk" = ( +/obj/structure/barricade/handrail/pizza{ + dir = 4; + pixel_y = -3 + }, +/obj/structure/barricade/handrail/pizza{ + dir = 4; + pixel_y = 16 + }, +/obj/structure/machinery/vending/snack{ + layer = 4.15; + pixel_y = 3 + }, +/turf/open/floor/prison/bright_clean2, +/area/adminlevel/ert_station/fax_response_station) +"mt" = ( +/obj/structure/barricade/handrail/pizza{ + dir = 8; + pixel_y = -3 + }, +/obj/structure/bed/chair/bolted{ + dir = 4; + pixel_x = 7; + buckling_x = 7 + }, +/obj/structure/prop/souto_land/streamer{ + dir = 6 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"mP" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/sign/safety/fridge{ + pixel_x = 32 + }, +/turf/open/floor/prison/bright_clean2, +/area/adminlevel/ert_station/fax_response_station) +"nf" = ( +/turf/closed/shuttle/ert{ + icon_state = "stan5" + }, +/area/adminlevel/ert_station/fax_response_station) +"nl" = ( +/obj/structure/surface/table/almayer, +/turf/open/floor/prison/yellow/west, +/area/adminlevel/ert_station/fax_response_station) +"np" = ( +/obj/structure/surface/table/reinforced, +/obj/item/pizzabox{ + pixel_y = 5 + }, +/obj/item/pizzabox{ + pixel_y = 8 + }, +/obj/item/pizzabox{ + pixel_y = 11 + }, +/obj/item/pizzabox{ + pixel_y = 14 + }, +/turf/open/floor/cmo, +/area/adminlevel/ert_station/fax_response_station) +"ny" = ( +/obj/structure/closet/secure_closet/fridge/fish/stock, +/obj/structure/machinery/light/small/blue{ + pixel_x = 16 + }, +/turf/open/floor/prison/greenblue, +/area/adminlevel/ert_station/fax_response_station) +"nz" = ( +/obj/effect/landmark/late_join/responder/uscm/provost, +/turf/open/floor/prison/kitchen, +/area/adminlevel/ert_station/fax_response_station) +"nA" = ( +/obj/structure/surface/table/almayer, +/obj/structure/barricade/handrail/pizza{ + pixel_y = -3 + }, +/obj/item/reagent_container/food/drinks/cans/tonic{ + pixel_x = -15; + pixel_y = 10 + }, +/obj/item/reagent_container/food/drinks/cans/tonic{ + pixel_y = 6; + pixel_x = -15 + }, +/obj/structure/machinery/computer/emails{ + dir = 1; + pixel_y = 2; + pixel_x = 3; + layer = 2.97 + }, +/turf/open/floor/prison/kitchen, +/area/adminlevel/ert_station/fax_response_station) +"nB" = ( +/turf/open/floor/cmo, +/area/adminlevel/ert_station/fax_response_station) +"nK" = ( +/obj/structure/surface/table/reinforced, +/obj/item/tool/kitchen/tray, +/obj/item/tool/kitchen/knife{ + pixel_x = 3 + }, +/obj/item/tool/kitchen/knife/butcher{ + pixel_x = -8 + }, +/obj/structure/machinery/firealarm{ + pixel_x = -24 + }, +/turf/open/floor/cmo, +/area/adminlevel/ert_station/fax_response_station) +"nU" = ( +/obj/structure/prop/souto_land/streamer{ + dir = 1; + pixel_y = 9 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/prison/red, +/area/adminlevel/ert_station/fax_response_station) +"nX" = ( +/obj/structure/bed/chair/bolted{ + dir = 8; + pixel_x = -7; + buckling_x = -7 + }, +/obj/structure/machinery/light, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"oh" = ( +/obj/structure/pipes/standard/manifold/fourway/hidden/supply, +/turf/open/floor/prison/red, +/area/adminlevel/ert_station/fax_response_station) +"ok" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 + }, +/turf/open/floor/prison/bright_clean2, +/area/adminlevel/ert_station/fax_response_station) +"oo" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/prison/yellow/southeast, +/area/adminlevel/ert_station/fax_response_station) +"ov" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/turf/open/floor/cmo, +/area/adminlevel/ert_station/fax_response_station) +"oy" = ( +/obj/structure/bedsheetbin{ + icon_state = "linenbin-empty"; + name = "solar lattice"; + pixel_y = 6 + }, +/turf/open/floor/almayer_hull, +/area/space) +"oD" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/airlock/almayer/maint{ + locked = 1; + name = "STAFF ONLY"; + req_one_access = null; + req_one_access_txt = "101" + }, +/turf/open/floor/almayer/test_floor4, +/area/adminlevel/ert_station/fax_response_station) +"oG" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating/prison, +/area/adminlevel/ert_station/fax_response_station) +"oU" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/turf/open/floor/prison/red/east, +/area/adminlevel/ert_station/fax_response_station) +"oX" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1 + }, +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/turf/open/space/basic, +/area/space) +"pA" = ( +/obj/structure/machinery/vending/coffee{ + pixel_y = 18; + density = 0 + }, +/obj/structure/machinery/alarm{ + pixel_x = -32 + }, +/turf/open/floor/prison/yellow/northwest, +/area/adminlevel/ert_station/fax_response_station) +"pD" = ( +/turf/open/mars_dirt/mars_cave_10, +/area/space) +"pE" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 12 + }, +/obj/structure/mirror{ + pixel_x = 29 + }, +/turf/open/floor/plating/plating_catwalk, +/area/adminlevel/ert_station/fax_response_station) +"pS" = ( +/obj/structure/bed/chair/bolted{ + dir = 8; + pixel_x = -7; + buckling_x = -7 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"pT" = ( +/obj/structure/closet/crate/freezer/rations, +/obj/item/reagent_container/food/snacks/meat/fish/crab, +/obj/item/reagent_container/food/snacks/meat/fish/crab, +/obj/item/reagent_container/food/snacks/meat/fish/squid, +/obj/item/reagent_container/food/snacks/meat/fish/squid, +/obj/item/reagent_container/food/snacks/meat/fish/squid, +/obj/item/reagent_container/food/snacks/meat/fish/squid/alt, +/obj/item/reagent_container/food/snacks/meat/fish/squid/alt, +/obj/item/reagent_container/food/snacks/meat/fish/squid/alt, +/obj/item/reagent_container/food/snacks/meat/fish, +/obj/item/reagent_container/food/snacks/meat/fish, +/obj/item/reagent_container/food/snacks/meat/fish, +/obj/item/reagent_container/food/snacks/meat/fish, +/turf/open/floor/prison/floor_marked/southwest, +/area/adminlevel/ert_station/fax_response_station) +"qb" = ( +/obj/structure/prop/souto_land/streamer{ + dir = 1; + pixel_y = 9; + pixel_x = 2 + }, +/obj/structure/pipes/vents/scrubber{ + dir = 8 + }, +/turf/open/floor/prison/red, +/area/adminlevel/ert_station/fax_response_station) +"qh" = ( +/turf/closed/shuttle/ert{ + icon_state = "stan_rightengine" + }, +/area/adminlevel/ert_station/fax_response_station) +"qo" = ( +/obj/structure/closet{ + pixel_y = 16; + density = 0 + }, +/obj/structure/window/reinforced{ + dir = 8; + health = 80 + }, +/obj/structure/machinery/light/small{ + dir = 1; + pixel_x = 16; + pixel_y = 20 + }, +/turf/open/floor/plating/plating_catwalk, +/area/adminlevel/ert_station/fax_response_station) +"qq" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 4 + }, +/turf/open/space/basic, +/area/space) +"qs" = ( +/obj/structure/surface/table/reinforced/cloth, +/obj/item/reagent_container/food/drinks/cans/souto/diet/classic{ + pixel_x = -2 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"qt" = ( +/turf/open/mars_dirt/mars_cave_6, +/area/space) +"qv" = ( +/obj/structure/surface/table/reinforced, +/obj/item/book/manual/chef_recipes, +/obj/item/clothing/head/chefhat, +/turf/open/floor/cmo, +/area/adminlevel/ert_station/fax_response_station) +"qy" = ( +/obj/structure/surface/table/reinforced, +/obj/structure/machinery/juicer{ + pixel_y = 9 + }, +/turf/open/floor/cmo, +/area/adminlevel/ert_station/fax_response_station) +"qA" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/prison/kitchen, +/area/adminlevel/ert_station/fax_response_station) +"qU" = ( +/obj/structure/barricade/handrail/pizza{ + dir = 8 + }, +/obj/structure/bed/chair/bolted{ + dir = 4; + pixel_x = 7; + buckling_x = 7 + }, +/obj/structure/machinery/alarm{ + pixel_y = 25 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"qX" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 8 + }, +/turf/open/space/basic, +/area/space) +"rj" = ( +/obj/structure/surface/table/reinforced/cloth, +/obj/item/trash/ceramic_plate{ + pixel_y = 1; + pixel_x = 2 + }, +/obj/item/reagent_container/food/snacks/meatpizzaslice{ + pixel_x = 2; + pixel_y = 4 + }, +/obj/item/reagent_container/food/drinks/cans/beer{ + pixel_x = 9; + pixel_y = 14 + }, +/obj/structure/machinery/light{ + pixel_x = 16; + dir = 1 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"rk" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 8 + }, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space) +"rA" = ( +/obj/structure/bed/chair/bolted{ + dir = 1; + pixel_y = 12; + buckling_y = 12 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"rK" = ( +/obj/structure/surface/table/almayer, +/turf/open/floor/prison, +/area/adminlevel/ert_station/fax_response_station) +"rL" = ( +/obj/structure/blocker/invisible_wall, +/obj/structure/machinery/door/poddoor/almayer{ + name = "\improper Umbillical Airlock"; + unacidable = 1 + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + locked = 1 + }, +/turf/open/floor/almayer/test_floor4, +/area/adminlevel/ert_station/fax_response_station) +"rO" = ( +/obj/structure/closet/firecloset/full, +/turf/open/floor/prison/yellow/southeast, +/area/adminlevel/ert_station/fax_response_station) +"sa" = ( +/obj/structure/pipes/vents/scrubber, +/turf/open/floor/prison/red/north, +/area/adminlevel/ert_station/fax_response_station) +"se" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper Bathroom"; + dir = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer/test_floor4, +/area/adminlevel/ert_station/fax_response_station) +"sk" = ( +/obj/structure/surface/table/almayer, +/turf/open/floor/prison/yellow/southwest, +/area/adminlevel/ert_station/fax_response_station) +"sl" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/turf/open/floor/prison/kitchen, +/area/adminlevel/ert_station/fax_response_station) +"sp" = ( +/obj/structure/surface/table/reinforced, +/obj/item/tool/kitchen/pizzacutter, +/turf/open/floor/prison/kitchen, +/area/adminlevel/ert_station/fax_response_station) +"sx" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/prison/red/west, +/area/adminlevel/ert_station/fax_response_station) +"sB" = ( +/turf/open/mars_dirt/mars_cave_7, +/area/space) +"sI" = ( +/obj/structure/surface/table/reinforced/cloth, +/obj/item/tool/kitchen/tray{ + pixel_y = 13; + pixel_x = 16 + }, +/obj/item/reagent_container/food/snacks/sliceable/pizza/meatpizza{ + pixel_y = 13; + pixel_x = 15 + }, +/obj/item/trash/plate{ + pixel_y = 3; + pixel_x = 1 + }, +/obj/item/reagent_container/food/snacks/meatpizzaslice{ + pixel_y = 3; + pixel_x = -1 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"sJ" = ( +/obj/structure/machinery/vending/ingredients, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/cmo, +/area/adminlevel/ert_station/fax_response_station) +"sW" = ( +/obj/structure/blocker/invisible_wall, +/obj/structure/machinery/door/poddoor/almayer{ + name = "\improper Umbillical Airlock"; + unacidable = 1 + }, +/turf/open/floor/almayer/test_floor4, +/area/adminlevel/ert_station/fax_response_station) +"sY" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/pipes/vents/pump{ + dir = 8 + }, +/turf/open/floor/prison/kitchen, +/area/adminlevel/ert_station/fax_response_station) +"td" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + pixel_y = -1 + }, +/obj/structure/pipes/vents/scrubber{ + dir = 8 + }, +/turf/open/floor/corsat/retrosquareslight, +/area/adminlevel/ert_station/fax_response_station) +"tp" = ( +/obj/structure/bed/chair/bolted{ + dir = 4; + pixel_y = 17; + pixel_x = 10; + buckling_y = 17; + buckling_x = 10 + }, +/obj/structure/machinery/light, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"tq" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/prison/kitchen, +/area/adminlevel/ert_station/fax_response_station) +"ty" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + pixel_y = -1 + }, +/obj/structure/pipes/vents/scrubber{ + dir = 4 + }, +/turf/open/floor/almayer/dark_sterile, +/area/adminlevel/ert_station/fax_response_station) +"tC" = ( +/obj/structure/surface/table/reinforced/cloth, +/obj/item/reagent_container/food/condiment/peppermill{ + pixel_x = 13; + pixel_y = 12 + }, +/obj/item/reagent_container/food/condiment/saltshaker{ + pixel_x = 7; + pixel_y = 17 + }, +/obj/item/trash/plate{ + pixel_y = 5 + }, +/obj/item/reagent_container/food/snacks/cheeseburger{ + pixel_x = -1; + pixel_y = 9 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"tH" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + name = "\improper Umbillical Airlock"; + id = "pizza_ert_arrival" + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper Galaxy Pizza!" + }, +/turf/open/floor/almayer/test_floor4, +/area/adminlevel/ert_station/fax_response_station) +"tM" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + pixel_y = -1 + }, +/turf/open/floor/corsat/retrosquareslight, +/area/adminlevel/ert_station/fax_response_station) +"tT" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1 + }, +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 4 + }, +/turf/open/space, +/area/space) +"tX" = ( +/obj/structure/machinery/disposal{ + layer = 2.97 + }, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"ub" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/machinery/door/poddoor/almayer/locked{ + icon_state = "almayer_pdoor"; + id = "pizza_takeaway_out" + }, +/turf/open/floor/almayer/test_floor4, +/area/adminlevel/ert_station/fax_response_station) +"ug" = ( +/obj/structure/pipes/vents/scrubber, +/turf/open/floor/prison/red/west, +/area/adminlevel/ert_station/fax_response_station) +"uj" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 4 + }, +/turf/open/space, +/area/space) +"uo" = ( +/obj/structure/window/framed/almayer/hull, +/turf/open/floor/plating, +/area/adminlevel/ert_station/fax_response_station) +"uz" = ( +/obj/structure/prop/souto_land/pole{ + dir = 4; + pixel_y = 9 + }, +/obj/structure/prop/souto_land/streamer{ + dir = 6 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/prison/red, +/area/adminlevel/ert_station/fax_response_station) +"uD" = ( +/obj/structure/surface/table/reinforced, +/obj/structure/machinery/processor{ + pixel_y = 10 + }, +/turf/open/floor/cmo, +/area/adminlevel/ert_station/fax_response_station) +"uK" = ( +/obj/structure/platform/kutjevo/smooth, +/obj/structure/platform/kutjevo/smooth{ + dir = 8 + }, +/obj/structure/barricade/handrail/kutjevo{ + layer = 3.01 + }, +/obj/structure/barricade/handrail/kutjevo{ + dir = 8; + layer = 3.01 + }, +/turf/open/space, +/area/space) +"uN" = ( +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"uY" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/box/cups, +/obj/item/tool/kitchen/utensil/fork{ + pixel_y = 4; + pixel_x = 11 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/item/tool/kitchen/utensil/fork{ + pixel_y = 4; + pixel_x = 19 + }, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + name = "\improper Kitchen Shutters"; + id = "kitchen_pizza_time" + }, +/turf/open/floor/almayer/plate, +/area/adminlevel/ert_station/fax_response_station) +"vi" = ( +/obj/structure/pipes/vents/pump{ + dir = 8 + }, +/turf/open/floor/prison/redcorner/north, +/area/adminlevel/ert_station/fax_response_station) +"vq" = ( +/obj/structure/toilet{ + pixel_y = 16 + }, +/obj/structure/window/reinforced{ + dir = 8; + health = 80 + }, +/obj/structure/window/reinforced{ + dir = 4; + health = 80 + }, +/turf/open/floor/plating/plating_catwalk, +/area/adminlevel/ert_station/fax_response_station) +"vr" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 + }, +/turf/open/floor/prison/red/west, +/area/adminlevel/ert_station/fax_response_station) +"vA" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/machinery/light{ + pixel_x = 16; + dir = 1 + }, +/turf/open/floor/prison/red/west, +/area/adminlevel/ert_station/fax_response_station) +"vI" = ( +/obj/structure/disposalpipe/segment, +/obj/item/storage/backpack/marine/satchel{ + desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; + icon = 'icons/obj/janitor.dmi'; + icon_state = "trashbag3"; + name = "trash bag"; + pixel_x = -1; + pixel_y = 6 + }, +/obj/item/storage/backpack/marine/satchel{ + desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; + icon = 'icons/obj/janitor.dmi'; + icon_state = "trashbag3"; + name = "trash bag"; + pixel_x = 3; + pixel_y = -2 + }, +/obj/item/weapon/broken_bottle{ + pixel_y = 7; + pixel_x = -12 + }, +/turf/open/floor/prison, +/area/adminlevel/ert_station/fax_response_station) +"vR" = ( +/obj/structure/platform/kutjevo/smooth, +/obj/structure/barricade/handrail/kutjevo{ + layer = 3.01 + }, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space) +"vX" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/prison/kitchen, +/area/adminlevel/ert_station/fax_response_station) +"wa" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/turf/open/floor/prison/kitchen, +/area/adminlevel/ert_station/fax_response_station) +"wb" = ( +/obj/structure/platform/kutjevo/smooth, +/turf/open/space, +/area/space) +"wc" = ( +/obj/effect/landmark/late_join/responder/upp, +/turf/open/floor/prison/kitchen, +/area/adminlevel/ert_station/fax_response_station) +"wi" = ( +/obj/structure/closet/secure_closet/fridge/meat/stock, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/turf/open/floor/prison/greenblue/northwest, +/area/adminlevel/ert_station/fax_response_station) +"wm" = ( +/obj/structure/surface/table/reinforced, +/obj/item/reagent_container/food/snacks/tomatomeat, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/cmo, +/area/adminlevel/ert_station/fax_response_station) +"wo" = ( +/obj/structure/bed/chair/bolted{ + dir = 8; + pixel_x = -7; + buckling_x = -7 + }, +/turf/open/floor/prison/yellowcorner/west, +/area/adminlevel/ert_station/fax_response_station) +"wq" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/prison/redcorner/east, +/area/adminlevel/ert_station/fax_response_station) +"wu" = ( +/obj/structure/surface/table/reinforced/cloth, +/obj/item/trash/ceramic_plate{ + pixel_y = 4; + pixel_x = -2 + }, +/obj/item/reagent_container/food/drinks/cans/beer{ + pixel_x = 13; + pixel_y = 2 + }, +/obj/item/reagent_container/food/snacks/carrotcakeslice{ + pixel_y = 6; + pixel_x = -1 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"wz" = ( +/turf/open/floor/prison/red/north, +/area/adminlevel/ert_station/fax_response_station) +"wD" = ( +/obj/structure/platform_decoration/kutjevo, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space) +"wP" = ( +/obj/structure/barricade/handrail/pizza{ + dir = 8; + pixel_y = -3 + }, +/obj/structure/barricade/handrail/pizza{ + dir = 1; + pixel_y = 12 + }, +/obj/structure/prop/souto_land/streamer{ + dir = 6 + }, +/obj/structure/bed/chair{ + can_buckle = 0; + dir = 4 + }, +/obj/structure/bed/chair{ + can_buckle = 0; + dir = 4; + pixel_x = 1; + pixel_y = 3 + }, +/obj/structure/bed/chair{ + can_buckle = 0; + dir = 4; + pixel_x = 2; + pixel_y = 6 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"wQ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/prison/red/north, +/area/adminlevel/ert_station/fax_response_station) +"wX" = ( +/obj/structure/closet/crate/freezer/cooler/oj, +/turf/open/floor/prison/floor_marked/southwest, +/area/adminlevel/ert_station/fax_response_station) +"xc" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/prison/red/north, +/area/adminlevel/ert_station/fax_response_station) +"xe" = ( +/obj/structure/platform/kutjevo/smooth, +/obj/structure/platform/kutjevo/smooth{ + dir = 8 + }, +/turf/open/space/basic, +/area/space) +"xh" = ( +/obj/structure/surface/table/reinforced/cloth, +/obj/item/reagent_container/food/condiment/peppermill{ + pixel_x = -10; + pixel_y = 12 + }, +/obj/item/reagent_container/food/condiment/saltshaker{ + pixel_x = -15; + pixel_y = 17 + }, +/obj/item/trash/ceramic_plate{ + pixel_y = 5; + pixel_x = 2 + }, +/obj/item/reagent_container/food/snacks/applecakeslice{ + pixel_y = 8; + pixel_x = 3 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"xl" = ( +/obj/structure/surface/table/reinforced/cloth, +/obj/item/tool/kitchen/tray{ + pixel_y = 20 + }, +/obj/item/reagent_container/food/snacks/sliceable/pizza/meatpizza{ + pixel_y = 20 + }, +/obj/item/reagent_container/food/drinks/cans/beer{ + pixel_x = 5; + pixel_y = 6 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"xp" = ( +/obj/structure/platform/kutjevo/smooth, +/obj/structure/disposalpipe/trunk, +/obj/structure/barricade/handrail/kutjevo{ + layer = 3.01 + }, +/turf/open/space, +/area/space) +"xy" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + pixel_y = -1 + }, +/obj/structure/pipes/vents/pump{ + dir = 8 + }, +/turf/open/floor/cmo, +/area/adminlevel/ert_station/fax_response_station) +"xV" = ( +/obj/structure/pipes/vents/pump{ + dir = 1 + }, +/turf/open/floor/prison/blue_plate, +/area/adminlevel/ert_station/fax_response_station) +"xX" = ( +/obj/structure/surface/table/reinforced/cloth, +/obj/item/trash/plate{ + pixel_y = 3; + pixel_x = 1 + }, +/obj/item/reagent_container/food/snacks/mushroompizzaslice{ + pixel_y = 4 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"yg" = ( +/obj/structure/platform_decoration/kutjevo, +/turf/open/space/basic, +/area/space) +"yo" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/turf/open/floor/prison/greenbluecorner/east, +/area/adminlevel/ert_station/fax_response_station) +"yr" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, +/turf/open/floor/prison/red/southwest, +/area/adminlevel/ert_station/fax_response_station) +"ys" = ( +/obj/structure/barricade/handrail/pizza{ + dir = 4; + pixel_y = -3 + }, +/obj/structure/bed/chair/bolted{ + dir = 8; + pixel_x = -7; + buckling_x = -7 + }, +/obj/structure/sign/safety/hazard{ + pixel_x = 15; + pixel_y = -32 + }, +/obj/structure/sign/safety/airlock{ + pixel_y = -32 + }, +/obj/structure/prop/souto_land/streamer{ + dir = 9 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"yE" = ( +/obj/structure/barricade/handrail/pizza{ + pixel_y = -3 + }, +/obj/structure/surface/table/almayer, +/obj/item/trash/ceramic_plate{ + pixel_y = 6 + }, +/obj/item/reagent_container/food/snacks/toastedsandwich{ + pixel_y = 17; + pixel_x = -1 + }, +/obj/item/reagent_container/food/snacks/toastedsandwich{ + pixel_y = 15; + pixel_x = 2 + }, +/turf/open/floor/prison/kitchen, +/area/adminlevel/ert_station/fax_response_station) +"yG" = ( +/obj/structure/pipes/vents/scrubber{ + dir = 1 + }, +/turf/open/floor/prison/blue_plate, +/area/adminlevel/ert_station/fax_response_station) +"yK" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/turf/open/floor/prison/greenblue/west, +/area/adminlevel/ert_station/fax_response_station) +"yM" = ( +/obj/structure/sign/safety/fridge{ + pixel_y = -32 + }, +/obj/structure/sign/safety/fridge{ + pixel_x = 32 + }, +/obj/structure/closet/firecloset/full, +/turf/open/floor/prison/kitchen, +/area/adminlevel/ert_station/fax_response_station) +"yP" = ( +/obj/structure/surface/rack, +/obj/item/reagent_container/food/snacks/bigbiteburger{ + pixel_x = -4 + }, +/obj/item/reagent_container/food/snacks/bigbiteburger{ + pixel_x = 3 + }, +/turf/open/floor/prison/greenblue/southwest, +/area/adminlevel/ert_station/fax_response_station) +"zf" = ( +/obj/structure/sign/safety/galley{ + pixel_x = -17 + }, +/turf/open/floor/prison/kitchen, +/area/adminlevel/ert_station/fax_response_station) +"zh" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/prison/red/west, +/area/adminlevel/ert_station/fax_response_station) +"zj" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/toolbox/mechanical{ + pixel_y = -4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/adminlevel/ert_station/fax_response_station) +"zl" = ( +/obj/structure/surface/table/reinforced/cloth, +/obj/item/reagent_container/food/condiment/hotsauce/cholula{ + pixel_y = 28; + pixel_x = 16 + }, +/obj/item/reagent_container/food/condiment/saltshaker{ + pixel_x = 7; + pixel_y = 17 + }, +/obj/item/reagent_container/food/condiment/peppermill{ + pixel_x = 13; + pixel_y = 12 + }, +/obj/item/tool/kitchen/utensil/fork{ + pixel_y = 4; + pixel_x = -3 + }, +/obj/item/tool/kitchen/utensil/knife{ + pixel_y = 4; + pixel_x = 3 + }, +/obj/structure/machinery/light, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"zx" = ( +/obj/structure/surface/table/almayer, +/obj/structure/barricade/handrail/pizza{ + pixel_y = -3 + }, +/obj/item/trash/ceramic_plate{ + pixel_y = 2 + }, +/obj/item/trash/ceramic_plate{ + pixel_y = 4 + }, +/obj/item/trash/ceramic_plate{ + pixel_y = 6 + }, +/obj/item/trash/ceramic_plate{ + pixel_y = 8 + }, +/turf/open/floor/prison/kitchen, +/area/adminlevel/ert_station/fax_response_station) +"zz" = ( +/obj/structure/barricade/handrail/pizza{ + dir = 4; + pixel_y = -3 + }, +/obj/structure/bed/chair/bolted{ + dir = 8; + pixel_x = -7; + buckling_x = -7 + }, +/obj/structure/prop/souto_land/streamer{ + dir = 9 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"zC" = ( +/obj/structure/bed/chair/bolted{ + dir = 4; + pixel_x = 7; + buckling_x = 7 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"zE" = ( +/obj/structure/machinery/door_control/airlock{ + id = "pizza_takeaway"; + name = "Airlock - Inside"; + pixel_x = 28; + pixel_y = 8 + }, +/obj/structure/machinery/door_control/airlock{ + id = "pizza_takeaway_out"; + name = "Airlock - Out"; + pixel_x = 28; + pixel_y = 18 + }, +/turf/open/floor/plating/prison, +/area/adminlevel/ert_station/fax_response_station) +"zH" = ( +/obj/effect/landmark/late_join/responder/wey_yu, +/turf/open/floor/prison/kitchen, +/area/adminlevel/ert_station/fax_response_station) +"zM" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/prison/redcorner/north, +/area/adminlevel/ert_station/fax_response_station) +"zQ" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 4 + }, +/turf/open/floor/prison/red/east, +/area/adminlevel/ert_station/fax_response_station) +"zW" = ( +/turf/open/floor/prison/greenblue/east, +/area/adminlevel/ert_station/fax_response_station) +"Ab" = ( +/obj/structure/machinery/gibber{ + pixel_y = 10 + }, +/obj/structure/surface/table/reinforced, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/cmo, +/area/adminlevel/ert_station/fax_response_station) +"Ac" = ( +/obj/structure/closet/secure_closet/fridge/dry, +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/sign/safety/galley{ + pixel_x = -24 + }, +/turf/open/floor/cmo, +/area/adminlevel/ert_station/fax_response_station) +"Aj" = ( +/obj/structure/barricade/handrail/pizza{ + dir = 8 + }, +/obj/structure/sign/safety/bathunisex{ + pixel_x = 15; + pixel_y = 32 + }, +/turf/open/floor/blueyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"Ao" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/machinery/light{ + pixel_x = 16; + dir = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/prison/kitchen, +/area/adminlevel/ert_station/fax_response_station) +"Au" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/turf/open/floor/prison/red/west, +/area/adminlevel/ert_station/fax_response_station) +"Ax" = ( +/obj/structure/surface/table/reinforced/cloth, +/obj/item/reagent_container/food/condiment/hotsauce/franks{ + pixel_y = -3; + pixel_x = 16 + }, +/obj/item/ashtray/glass{ + pixel_x = -4; + pixel_y = -1 + }, +/obj/item/clothing/mask/cigarette, +/obj/item/clothing/mask/cigarette{ + pixel_x = -2; + pixel_y = -2 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"AB" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 4 + }, +/turf/open/floor/cmo, +/area/adminlevel/ert_station/fax_response_station) +"AD" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper Central Fridge" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer/test_floor4, +/area/adminlevel/ert_station/fax_response_station) +"AH" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/prison/yellow/north, +/area/adminlevel/ert_station/fax_response_station) +"AV" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/blueyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"AW" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out" + }, +/obj/structure/sign/safety/debark_lounge{ + pixel_y = -32 + }, +/obj/structure/sign/safety/landingzone{ + pixel_y = -32; + pixel_x = 15 + }, +/turf/open/floor/prison/yellow, +/area/adminlevel/ert_station/fax_response_station) +"Bu" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/cmo, +/area/adminlevel/ert_station/fax_response_station) +"By" = ( +/obj/structure/machinery/suit_storage_unit/standard_unit{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/structure/sign/safety/suit_storage{ + pixel_x = 32 + }, +/turf/open/floor/almayer/test_floor4, +/area/adminlevel/ert_station/fax_response_station) +"Bz" = ( +/obj/structure/surface/table/reinforced, +/obj/item/trash/plate{ + pixel_y = 2 + }, +/obj/item/trash/plate{ + pixel_y = 4 + }, +/obj/item/trash/plate{ + pixel_y = 6 + }, +/obj/item/trash/plate{ + pixel_y = 8 + }, +/obj/item/trash/plate{ + pixel_y = 10 + }, +/turf/open/floor/prison/kitchen, +/area/adminlevel/ert_station/fax_response_station) +"BC" = ( +/obj/structure/surface/table/reinforced, +/obj/item/pizzabox{ + pixel_y = 5 + }, +/obj/item/pizzabox{ + pixel_y = 8 + }, +/obj/item/pizzabox{ + pixel_y = 11 + }, +/obj/structure/machinery/light, +/turf/open/floor/prison/kitchen, +/area/adminlevel/ert_station/fax_response_station) +"BJ" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/disposalpipe/junction{ + dir = 1; + icon_state = "pipe-j2" + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer/test_floor4, +/area/adminlevel/ert_station/fax_response_station) +"BU" = ( +/obj/structure/bed/chair/bolted{ + dir = 1; + pixel_y = 12; + buckling_y = 12 + }, +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_x = -30 + }, +/turf/open/floor/prison/yellow/west, +/area/adminlevel/ert_station/fax_response_station) +"Ck" = ( +/obj/structure/sink{ + dir = 1; + pixel_y = -10 + }, +/obj/structure/window/reinforced{ + dir = 8; + health = 80 + }, +/obj/structure/machinery/light/small{ + pixel_x = 16 + }, +/turf/open/floor/plating/plating_catwalk, +/area/adminlevel/ert_station/fax_response_station) +"Cp" = ( +/obj/structure/surface/table/reinforced/cloth, +/obj/item/reagent_container/food/drinks/cans/waterbottle{ + pixel_x = -6; + pixel_y = 14 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"Cv" = ( +/obj/structure/closet/secure_closet/freezer/fridge/full, +/obj/item/reagent_container/food/condiment/enzyme, +/obj/item/reagent_container/food/condiment/enzyme, +/obj/item/reagent_container/food/drinks/soymilk, +/obj/item/reagent_container/food/drinks/soymilk, +/obj/item/reagent_container/food/condiment/hotsauce/tabasco, +/obj/item/reagent_container/food/condiment/hotsauce/sriracha, +/obj/item/reagent_container/food/condiment/hotsauce/franks, +/obj/item/reagent_container/food/condiment/hotsauce/cholula, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/prison/greenblue/north, +/area/adminlevel/ert_station/fax_response_station) +"CO" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/prison/kitchen, +/area/adminlevel/ert_station/fax_response_station) +"CP" = ( +/turf/open/floor/almayer_hull, +/area/space) +"CT" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/machinery/chem_dispenser/soda{ + density = 0; + pixel_y = 30 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/prison/kitchen, +/area/adminlevel/ert_station/fax_response_station) +"Db" = ( +/obj/structure/barricade/handrail/pizza{ + dir = 4; + pixel_y = -3 + }, +/obj/structure/barricade/handrail/pizza{ + dir = 1; + pixel_y = 12 + }, +/obj/structure/prop/souto_land/streamer{ + dir = 9 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"Dd" = ( +/obj/structure/pipes/vents/pump{ + dir = 1 + }, +/turf/open/floor/prison/red/east, +/area/adminlevel/ert_station/fax_response_station) +"Dx" = ( +/obj/structure/surface/table/reinforced, +/obj/item/reagent_container/food/snacks/sliceable/bread{ + pixel_y = 8 + }, +/obj/item/reagent_container/food/snacks/sliceable/bread{ + pixel_y = 4 + }, +/obj/item/reagent_container/food/snacks/sliceable/bread, +/turf/open/floor/cmo, +/area/adminlevel/ert_station/fax_response_station) +"DF" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/machinery/chem_dispenser/soda/beer{ + density = 0; + pixel_y = 31 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/prison/kitchen, +/area/adminlevel/ert_station/fax_response_station) +"DH" = ( +/obj/structure/platform/kutjevo/smooth, +/obj/structure/barricade/handrail/kutjevo{ + layer = 3.01 + }, +/turf/open/space/basic, +/area/space) +"DW" = ( +/obj/structure/pipes/vents/pump, +/turf/open/floor/prison/red/north, +/area/adminlevel/ert_station/fax_response_station) +"Ee" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8 + }, +/obj/structure/barricade/handrail/kutjevo{ + dir = 8; + layer = 3.01 + }, +/turf/open/space/basic, +/area/space) +"Eh" = ( +/obj/structure/prop/souto_land/pole{ + dir = 4; + pixel_y = 9 + }, +/obj/structure/prop/souto_land/streamer{ + dir = 6 + }, +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/prison/red, +/area/adminlevel/ert_station/fax_response_station) +"Ei" = ( +/turf/closed/wall/almayer/outer, +/area/adminlevel/ert_station/fax_response_station) +"Ep" = ( +/obj/structure/machinery/door/poddoor/almayer/open{ + name = "\improper Umbillical Airlock"; + id = "pizza_ert_arrival" + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic, +/turf/open/floor/almayer/test_floor4, +/area/adminlevel/ert_station/fax_response_station) +"EH" = ( +/obj/structure/machinery/vending/cigarette{ + pixel_y = 18; + layer = 3.01; + density = 0 + }, +/turf/open/floor/prison/yellow/northeast, +/area/adminlevel/ert_station/fax_response_station) +"EK" = ( +/obj/structure/machinery/door/poddoor/almayer/locked{ + icon_state = "almayer_pdoor"; + id = "pizza_takeaway" + }, +/turf/open/floor/almayer/test_floor4, +/area/adminlevel/ert_station/fax_response_station) +"EO" = ( +/obj/structure/machinery/door/poddoor/almayer/open{ + name = "\improper Umbillical Airlock"; + id = "pizza_ert_arrival" + }, +/turf/open/floor/almayer/test_floor4, +/area/adminlevel/ert_station/fax_response_station) +"EZ" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/turf/open/floor/prison/kitchen, +/area/adminlevel/ert_station/fax_response_station) +"Fd" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/prison/bright_clean2, +/area/adminlevel/ert_station/fax_response_station) +"Ff" = ( +/obj/structure/surface/table/reinforced/cloth, +/obj/item/trash/plate{ + pixel_y = 10; + pixel_x = 1 + }, +/obj/item/trash/plate{ + pixel_y = -1 + }, +/obj/item/reagent_container/food/snacks/hotdog{ + pixel_y = 13 + }, +/obj/item/reagent_container/food/condiment/coldsauce{ + pixel_y = 11; + pixel_x = -7 + }, +/obj/item/reagent_container/food/snacks/grilledcheese{ + pixel_y = 6; + pixel_x = -1 + }, +/obj/item/reagent_container/food/drinks/coffee{ + pixel_y = 2; + pixel_x = 8 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"Fj" = ( +/obj/structure/closet/crate/freezer, +/obj/item/reagent_container/food/snacks/ricepudding, +/turf/open/floor/prison/floor_marked/southwest, +/area/adminlevel/ert_station/fax_response_station) +"Fp" = ( +/obj/structure/closet/crate/freezer, +/obj/structure/machinery/light/blue, +/obj/item/reagent_container/food/snacks/packaged_burrito, +/obj/item/reagent_container/food/snacks/packaged_burrito, +/obj/item/reagent_container/food/snacks/packaged_burrito, +/obj/item/reagent_container/food/snacks/packaged_hdogs, +/obj/item/reagent_container/food/snacks/packaged_hdogs, +/obj/item/reagent_container/food/snacks/packaged_hdogs, +/obj/item/reagent_container/food/snacks/packaged_burger, +/obj/item/reagent_container/food/snacks/packaged_burger, +/obj/item/reagent_container/food/snacks/packaged_burger, +/turf/open/floor/prison/floor_marked/southwest, +/area/adminlevel/ert_station/fax_response_station) +"Fz" = ( +/obj/structure/surface/table/reinforced, +/obj/item/tool/kitchen/tray{ + pixel_y = 5 + }, +/obj/item/reagent_container/food/snacks/sliceable/pizza/meatpizza{ + pixel_y = 5 + }, +/turf/open/floor/prison/kitchen, +/area/adminlevel/ert_station/fax_response_station) +"FB" = ( +/obj/structure/machinery/light{ + pixel_x = 16 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, +/turf/open/floor/prison/kitchen, +/area/adminlevel/ert_station/fax_response_station) +"FD" = ( +/obj/structure/machinery/door/poddoor/almayer/locked{ + icon_state = "almayer_pdoor"; + id = "pizza_takeaway" + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer/test_floor4, +/area/adminlevel/ert_station/fax_response_station) +"FL" = ( +/turf/closed/shuttle/ert{ + icon_state = "rightengine_1"; + opacity = 0 + }, +/area/adminlevel/ert_station/fax_response_station) +"FS" = ( +/obj/structure/machinery/light, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"FY" = ( +/obj/structure/surface/table/almayer, +/obj/structure/barricade/handrail/pizza{ + dir = 8; + pixel_y = -3 + }, +/obj/structure/barricade/handrail/pizza{ + pixel_y = -3 + }, +/obj/item/reagent_container/food/drinks/cans/cola{ + pixel_y = 6; + pixel_x = -6 + }, +/obj/item/reagent_container/food/drinks/cans/cola{ + pixel_y = 4; + pixel_x = -3 + }, +/obj/item/reagent_container/food/drinks/cans/iced_tea{ + pixel_x = 8; + pixel_y = 10 + }, +/obj/item/reagent_container/food/drinks/cans/iced_tea{ + pixel_x = 11; + pixel_y = 5 + }, +/turf/open/floor/prison/kitchen, +/area/adminlevel/ert_station/fax_response_station) +"Gd" = ( +/obj/structure/prop/souto_land/pole{ + dir = 8; + pixel_y = 9 + }, +/obj/structure/prop/souto_land/streamer{ + dir = 9 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/prison/red, +/area/adminlevel/ert_station/fax_response_station) +"Gh" = ( +/obj/structure/machinery/disposal{ + layer = 2.97 + }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/structure/sign/poster{ + desc = "Eat an EAT bar! ...Aren't they called MEAT bars?"; + icon_state = "poster7"; + name = "EAT - poster"; + pixel_y = 30 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"Gj" = ( +/obj/structure/barricade/handrail/pizza{ + dir = 8 + }, +/obj/structure/barricade/handrail/pizza{ + pixel_y = -3 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"Gm" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/prison/red, +/area/adminlevel/ert_station/fax_response_station) +"Gn" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1 + }, +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 4 + }, +/turf/open/space/basic, +/area/space) +"Gp" = ( +/obj/structure/surface/table/reinforced/cloth, +/obj/item/reagent_container/food/snacks/mushroomsoup{ + pixel_y = 6 + }, +/obj/item/tool/kitchen/utensil/spoon{ + pixel_y = 4; + pixel_x = 7 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"Gt" = ( +/obj/structure/machinery/atm{ + pixel_y = 32; + pixel_x = 2 + }, +/turf/open/floor/prison/yellow/northeast, +/area/adminlevel/ert_station/fax_response_station) +"GB" = ( +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_x = 30 + }, +/turf/open/floor/prison/yellow/east, +/area/adminlevel/ert_station/fax_response_station) +"GM" = ( +/obj/structure/sign/safety/airlock{ + pixel_y = 32 + }, +/obj/structure/sign/safety/hazard{ + pixel_x = 15; + pixel_y = 32 + }, +/turf/open/space/basic, +/area/space) +"Ha" = ( +/turf/closed/shuttle/ert{ + icon_state = "stan_leftengine" + }, +/area/adminlevel/ert_station/fax_response_station) +"Hd" = ( +/turf/open/floor/prison/yellow/east, +/area/adminlevel/ert_station/fax_response_station) +"Hg" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8 + }, +/turf/open/space, +/area/space) +"HL" = ( +/obj/structure/surface/table/almayer, +/obj/structure/barricade/handrail/pizza{ + pixel_y = -3 + }, +/obj/item/reagent_container/food/drinks/coffeecup{ + pixel_x = -5; + pixel_y = 4 + }, +/obj/item/reagent_container/food/drinks/coffeecup{ + pixel_y = 4; + pixel_x = 5 + }, +/obj/item/reagent_container/food/drinks/coffeecup{ + pixel_y = 2 + }, +/turf/open/floor/prison/kitchen, +/area/adminlevel/ert_station/fax_response_station) +"HQ" = ( +/obj/structure/surface/table/reinforced/cloth, +/obj/item/trash/plate{ + pixel_y = 5 + }, +/obj/item/reagent_container/food/snacks/bigbiteburger{ + pixel_y = 10; + pixel_x = -1 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"Ib" = ( +/obj/structure/pipes/vents/pump{ + dir = 1 + }, +/turf/open/floor/prison/red/west, +/area/adminlevel/ert_station/fax_response_station) +"Iq" = ( +/obj/structure/surface/table/reinforced/cloth, +/obj/item/reagent_container/food/drinks/cans/beer{ + pixel_x = 5; + pixel_y = 13 + }, +/obj/item/trash/ceramic_plate{ + pixel_y = 1 + }, +/obj/item/reagent_container/food/snacks/meatpizzaslice{ + pixel_x = -1; + pixel_y = 3 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"ID" = ( +/turf/closed/wall/rock/red, +/area/space) +"IJ" = ( +/obj/structure/pipes/vents/scrubber{ + dir = 4 + }, +/turf/open/floor/prison/red/west, +/area/adminlevel/ert_station/fax_response_station) +"Jd" = ( +/obj/structure/closet{ + pixel_y = 16; + density = 0 + }, +/turf/open/floor/plating/plating_catwalk, +/area/adminlevel/ert_station/fax_response_station) +"Jl" = ( +/turf/open/floor/prison/red/west, +/area/adminlevel/ert_station/fax_response_station) +"Jm" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E" + }, +/turf/open/floor/prison, +/area/adminlevel/ert_station/fax_response_station) +"Jq" = ( +/obj/structure/closet/secure_closet/fridge/organic/stock, +/turf/open/floor/prison/greenblue, +/area/adminlevel/ert_station/fax_response_station) +"JP" = ( +/obj/structure/surface/table/reinforced, +/obj/item/tool/kitchen/knife/butcher, +/turf/open/floor/cmo, +/area/adminlevel/ert_station/fax_response_station) +"JR" = ( +/obj/structure/bed/sofa/vert/grey/bot, +/turf/open/floor/prison, +/area/adminlevel/ert_station/fax_response_station) +"JU" = ( +/obj/structure/janitorialcart{ + pixel_y = 15 + }, +/obj/item/tool/wet_sign{ + pixel_x = -8; + pixel_y = 6 + }, +/obj/item/tool/wet_sign{ + pixel_x = -3; + pixel_y = 2 + }, +/obj/item/reagent_container/glass/bucket{ + pixel_x = 9 + }, +/turf/open/floor/prison/kitchen, +/area/adminlevel/ert_station/fax_response_station) +"JV" = ( +/obj/structure/barricade/handrail/pizza{ + dir = 1; + pixel_y = 12 + }, +/obj/structure/bed/chair/bolted{ + pixel_y = -1; + buckling_y = -1 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"Kb" = ( +/obj/structure/surface/table/almayer, +/obj/structure/barricade/handrail/pizza{ + dir = 4; + pixel_y = -3 + }, +/obj/item/corncob, +/obj/item/corncob{ + pixel_y = 7 + }, +/turf/open/floor/prison/kitchen, +/area/adminlevel/ert_station/fax_response_station) +"Kc" = ( +/obj/structure/sign/safety/airlock{ + pixel_y = -32 + }, +/obj/structure/sign/safety/hazard{ + pixel_x = 15; + pixel_y = -32 + }, +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/door_control/airlock{ + id = "pizza_takeaway_out"; + name = "Airlock - Out"; + pixel_x = 2; + pixel_y = 18 + }, +/obj/structure/sign/safety/manualopenclose{ + pixel_y = -3; + pixel_x = 7 + }, +/turf/open/floor/almayer_hull, +/area/adminlevel/ert_station/fax_response_station) +"Kd" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer/dark_sterile, +/area/adminlevel/ert_station/fax_response_station) +"Kv" = ( +/obj/structure/surface/table/reinforced, +/obj/structure/sink/kitchen{ + pixel_y = 12 + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/prison/kitchen, +/area/adminlevel/ert_station/fax_response_station) +"KB" = ( +/obj/structure/sign/safety/bathunisex{ + pixel_x = 15; + pixel_y = 32 + }, +/obj/structure/surface/table/almayer, +/obj/structure/machinery/washing_machine{ + pixel_y = 10 + }, +/obj/structure/sign/safety/water{ + pixel_x = -17 + }, +/turf/open/floor/plating/plating_catwalk, +/area/adminlevel/ert_station/fax_response_station) +"KC" = ( +/obj/structure/barricade/handrail/pizza{ + dir = 8; + pixel_y = -3 + }, +/obj/structure/prop/souto_land/streamer{ + dir = 6 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"KY" = ( +/turf/open/floor/prison/blue_plate, +/area/adminlevel/ert_station/fax_response_station) +"La" = ( +/obj/structure/surface/table/almayer, +/obj/structure/barricade/handrail/pizza{ + pixel_y = -3 + }, +/obj/item/reagent_container/food/condiment/hotsauce/franks/macho{ + pixel_y = 11; + pixel_x = -6 + }, +/obj/item/reagent_container/food/condiment/hotsauce/franks{ + pixel_y = 11; + pixel_x = 6 + }, +/obj/item/reagent_container/food/condiment/coldsauce{ + pixel_y = 11 + }, +/obj/item/reagent_container/food/condiment/hotsauce/cholula{ + pixel_y = 6 + }, +/turf/open/floor/prison/kitchen, +/area/adminlevel/ert_station/fax_response_station) +"Lk" = ( +/obj/structure/pipes/vents/scrubber{ + dir = 4 + }, +/turf/open/floor/cmo, +/area/adminlevel/ert_station/fax_response_station) +"Ln" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer{ + icon_state = "security_det"; + name = "Shuttle control deck"; + pixel_y = 6 + }, +/obj/structure/machinery/light/small{ + dir = 8; + pixel_x = -11; + pixel_y = 10 + }, +/turf/open/floor/plating/prison, +/area/adminlevel/ert_station/fax_response_station) +"Ly" = ( +/obj/structure/barricade/handrail/pizza{ + dir = 4 + }, +/obj/structure/barricade/handrail/pizza{ + dir = 1; + pixel_y = 12 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"LH" = ( +/obj/structure/bed/chair/bolted{ + dir = 1; + pixel_y = 12; + buckling_y = 12 + }, +/obj/structure/prop/souto_land/pole{ + dir = 8; + pixel_y = 9 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"Mj" = ( +/obj/structure/bed/chair/dropship/pilot{ + dir = 1 + }, +/obj/structure/machinery/light/small{ + dir = 8; + pixel_x = -11; + pixel_y = 10 + }, +/turf/open/floor/plating/prison, +/area/adminlevel/ert_station/fax_response_station) +"Mk" = ( +/obj/structure/machinery/vending/coffee{ + pixel_y = 12 + }, +/obj/structure/barricade/handrail/pizza{ + pixel_y = -3 + }, +/turf/open/floor/prison/bright_clean2, +/area/adminlevel/ert_station/fax_response_station) +"Mt" = ( +/obj/structure/bed/sofa/south/grey/left, +/obj/item/storage/briefcase/stowaway, +/turf/open/floor/prison/yellow/northwest, +/area/adminlevel/ert_station/fax_response_station) +"Mz" = ( +/obj/structure/platform/kutjevo/smooth, +/obj/structure/platform/kutjevo/smooth{ + dir = 8 + }, +/turf/open/space, +/area/space) +"MB" = ( +/obj/structure/surface/table/reinforced, +/obj/item/pizzabox/meat, +/obj/item/tool/kitchen/pizzacutter, +/turf/open/floor/cmo, +/area/adminlevel/ert_station/fax_response_station) +"MK" = ( +/obj/structure/surface/table/almayer, +/obj/structure/barricade/handrail/pizza{ + dir = 8; + pixel_y = -3 + }, +/obj/item/reagent_container/food/drinks/bottle/wine{ + pixel_y = 7; + pixel_x = -6 + }, +/obj/item/reagent_container/food/drinks/bottle/vermouth{ + pixel_y = 5; + pixel_x = -2 + }, +/obj/item/reagent_container/food/drinks/bottle/whiskey{ + pixel_x = -4 + }, +/turf/open/floor/prison/kitchen, +/area/adminlevel/ert_station/fax_response_station) +"MS" = ( +/obj/structure/machinery/shower{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 8; + health = 80 + }, +/obj/structure/window/reinforced{ + dir = 4; + health = 80 + }, +/obj/structure/machinery/light/small{ + pixel_x = 16 + }, +/turf/open/floor/plating/plating_catwalk, +/area/adminlevel/ert_station/fax_response_station) +"MT" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + pixel_y = -1 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer/dark_sterile, +/area/adminlevel/ert_station/fax_response_station) +"MX" = ( +/turf/open/floor/prison/red/northwest, +/area/adminlevel/ert_station/fax_response_station) +"Nb" = ( +/obj/item/reagent_container/food/condiment/hotsauce/franks/macho{ + pixel_y = 18; + pixel_x = -6 + }, +/obj/item/reagent_container/food/condiment/hotsauce/franks{ + pixel_y = 18; + pixel_x = 6 + }, +/obj/item/reagent_container/food/condiment/hotsauce/cholula{ + pixel_y = 16 + }, +/obj/structure/surface/table/almayer, +/obj/item/reagent_container/food/condiment/coldsauce{ + pixel_y = 13; + pixel_x = 8 + }, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"Nl" = ( +/turf/open/floor/prison, +/area/adminlevel/ert_station/fax_response_station) +"No" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/prison, +/area/adminlevel/ert_station/fax_response_station) +"Nr" = ( +/obj/structure/machinery/vending/cola{ + pixel_y = 12 + }, +/obj/structure/sign/safety/coffee{ + pixel_y = 32; + pixel_x = -13 + }, +/turf/open/floor/prison/bright_clean2, +/area/adminlevel/ert_station/fax_response_station) +"Ny" = ( +/obj/structure/sink{ + dir = 1; + pixel_y = -10 + }, +/turf/open/floor/plating/plating_catwalk, +/area/adminlevel/ert_station/fax_response_station) +"NG" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer/test_floor4, +/area/adminlevel/ert_station/fax_response_station) +"NH" = ( +/obj/structure/bed/sofa/vert/grey/top, +/turf/open/floor/prison, +/area/adminlevel/ert_station/fax_response_station) +"NJ" = ( +/turf/closed/shuttle/ert{ + icon_state = "stan20" + }, +/area/adminlevel/ert_station/fax_response_station) +"NN" = ( +/obj/structure/closet/secure_closet/fridge/groceries/stock, +/obj/structure/machinery/light/small/blue{ + dir = 1; + pixel_y = 20 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/turf/open/floor/prison/greenblue/northwest, +/area/adminlevel/ert_station/fax_response_station) +"NP" = ( +/obj/structure/sink/kitchen{ + pixel_x = 11; + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/sign/safety/water{ + pixel_x = 38 + }, +/turf/open/floor/cmo, +/area/adminlevel/ert_station/fax_response_station) +"NT" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 8 + }, +/turf/open/space, +/area/space) +"NV" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper Showers & Bathroom"; + dir = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer/test_floor4, +/area/adminlevel/ert_station/fax_response_station) +"Og" = ( +/obj/structure/surface/table/reinforced/cloth, +/obj/item/reagent_container/food/snacks/sliceable/pizza/mushroompizza{ + pixel_y = -2; + pixel_x = -16 + }, +/obj/item/trash/plate{ + pixel_y = 8; + pixel_x = 3 + }, +/obj/item/reagent_container/food/snacks/meatpizzaslice{ + pixel_y = 8; + pixel_x = -1 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"Oh" = ( +/obj/structure/prop/souto_land/streamer{ + pixel_y = 9; + pixel_x = 1 + }, +/turf/open/floor/prison/red, +/area/adminlevel/ert_station/fax_response_station) +"OE" = ( +/obj/structure/prop/souto_land/streamer{ + pixel_y = 9; + pixel_x = -1 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/prison/red, +/area/adminlevel/ert_station/fax_response_station) +"OG" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1 + }, +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/obj/structure/lattice, +/turf/open/space, +/area/space) +"OJ" = ( +/turf/open/floor/solarpanel, +/area/space) +"OK" = ( +/obj/structure/machinery/vending/cigarette{ + pixel_y = 3; + layer = 4.15 + }, +/obj/structure/barricade/handrail/pizza{ + dir = 8 + }, +/turf/open/floor/prison/bright_clean2, +/area/adminlevel/ert_station/fax_response_station) +"OQ" = ( +/obj/structure/barricade/handrail/pizza{ + dir = 1; + pixel_y = 12 + }, +/obj/structure/barricade/handrail/pizza{ + dir = 8; + pixel_y = 13 + }, +/obj/structure/barricade/handrail/pizza{ + dir = 8 + }, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_27"; + pixel_y = 13; + pixel_x = -2; + layer = 4.11 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"OS" = ( +/turf/open/floor/prison/red/east, +/area/adminlevel/ert_station/fax_response_station) +"Pa" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/cmo, +/area/adminlevel/ert_station/fax_response_station) +"Pi" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/turf/open/floor/prison/red/north, +/area/adminlevel/ert_station/fax_response_station) +"Pl" = ( +/obj/structure/barricade/handrail/pizza{ + dir = 1; + pixel_y = 12 + }, +/obj/structure/reagent_dispensers/water_cooler/stacks{ + density = 0; + pixel_x = -8; + pixel_y = 15; + layer = 4.11 + }, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_17"; + pixel_x = -8; + pixel_y = 2; + layer = 4.12 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"Pn" = ( +/obj/structure/surface/table/reinforced, +/obj/item/clothing/suit/chef/classic, +/obj/item/clothing/gloves/latex, +/obj/item/clothing/suit/chef/classic, +/turf/open/floor/prison/kitchen, +/area/adminlevel/ert_station/fax_response_station) +"Pq" = ( +/obj/structure/platform/kutjevo/smooth, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space) +"Ps" = ( +/obj/item/reagent_container/glass/bucket/janibucket{ + pixel_x = -5; + pixel_y = 10 + }, +/obj/item/tool/mop{ + pixel_x = -2; + pixel_y = 8 + }, +/turf/open/floor/prison/kitchen, +/area/adminlevel/ert_station/fax_response_station) +"Py" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 4 + }, +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/turf/open/space, +/area/space) +"PF" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8 + }, +/turf/open/space/basic, +/area/space) +"PH" = ( +/obj/structure/surface/table/reinforced/cloth, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"PL" = ( +/obj/structure/sign/safety/airlock{ + pixel_y = -32 + }, +/obj/structure/sign/safety/hazard{ + pixel_x = 15; + pixel_y = -32 + }, +/turf/open/floor/almayer_hull, +/area/adminlevel/ert_station/fax_response_station) +"Qe" = ( +/obj/structure/pipes/vents/scrubber{ + dir = 1 + }, +/turf/open/floor/prison/kitchen, +/area/adminlevel/ert_station/fax_response_station) +"QN" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/turf/open/floor/almayer/dark_sterile, +/area/adminlevel/ert_station/fax_response_station) +"Ra" = ( +/obj/structure/surface/table/reinforced/cloth, +/obj/item/trash/plate{ + pixel_y = 10 + }, +/obj/item/reagent_container/food/snacks/vegetablepizzaslice{ + pixel_y = 10; + pixel_x = -2 + }, +/obj/item/reagent_container/food/drinks/cans/boda{ + pixel_y = 16; + pixel_x = -11; + layer = 3.03 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"Rf" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer/test_floor4, +/area/adminlevel/ert_station/fax_response_station) +"Rh" = ( +/obj/structure/window/framed/almayer/hull, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/turf/open/floor/plating, +/area/adminlevel/ert_station/fax_response_station) +"RC" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 1 + }, +/turf/open/space/basic, +/area/space) +"RG" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 4 + }, +/obj/structure/platform/kutjevo/smooth, +/turf/open/space/basic, +/area/space) +"RN" = ( +/obj/structure/barricade/handrail/pizza{ + dir = 1; + pixel_y = 12; + layer = 4.11 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"RP" = ( +/obj/structure/barricade/handrail/pizza{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/turf/open/floor/blueyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"RV" = ( +/obj/item/clothing/suit/chef/classic, +/obj/item/clothing/gloves/latex, +/obj/item/clothing/head/chefhat, +/obj/structure/surface/table/reinforced, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/cmo, +/area/adminlevel/ert_station/fax_response_station) +"Se" = ( +/obj/structure/bed/chair/bolted{ + dir = 1; + pixel_y = 12; + buckling_y = 12 + }, +/obj/structure/prop/souto_land/streamer{ + pixel_y = 9 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"Sg" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1 + }, +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/turf/open/space, +/area/space) +"So" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/prison/red/north, +/area/adminlevel/ert_station/fax_response_station) +"Sp" = ( +/obj/structure/barricade/handrail/pizza{ + dir = 4 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"Sq" = ( +/obj/structure/kitchenspike, +/obj/item/reagent_container/food/snacks/meat{ + pixel_y = -5 + }, +/obj/item/reagent_container/food/snacks/meat{ + pixel_y = 2 + }, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/prison/greenblue, +/area/adminlevel/ert_station/fax_response_station) +"Sr" = ( +/obj/structure/surface/table/reinforced/cloth, +/obj/item/reagent_container/food/drinks/cans/beer{ + pixel_x = -13; + pixel_y = -6 + }, +/obj/item/tool/kitchen/utensil/fork{ + pixel_y = 1; + pixel_x = 5 + }, +/obj/item/tool/kitchen/utensil/knife{ + pixel_y = 3; + pixel_x = 9 + }, +/obj/item/reagent_container/food/snacks/meatsteak{ + pixel_y = 5; + pixel_x = 1 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"Sw" = ( +/obj/effect/landmark/late_join/responder/uscm, +/turf/open/floor/prison/kitchen, +/area/adminlevel/ert_station/fax_response_station) +"Sz" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/prison/bright_clean2, +/area/adminlevel/ert_station/fax_response_station) +"SL" = ( +/obj/structure/surface/table/almayer, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_21"; + pixel_y = 28; + pixel_x = 3 + }, +/obj/item/reagent_container/food/drinks/cans/souto/diet/lime{ + pixel_y = 15; + pixel_x = -8 + }, +/turf/open/floor/prison/yellow/west, +/area/adminlevel/ert_station/fax_response_station) +"ST" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/poster/ad{ + icon_state = "poster41"; + pixel_y = 32 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/prison/kitchen, +/area/adminlevel/ert_station/fax_response_station) +"SV" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper Showers" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer/test_floor4, +/area/adminlevel/ert_station/fax_response_station) +"Te" = ( +/obj/structure/surface/table/reinforced/cloth, +/obj/item/reagent_container/food/condiment/hotsauce/cholula{ + pixel_y = 28; + pixel_x = 16 + }, +/obj/item/tool/kitchen/utensil/pknife{ + pixel_x = 13; + pixel_y = 1 + }, +/obj/item/tool/kitchen/utensil/pfork{ + pixel_x = -5; + pixel_y = 5 + }, +/obj/item/reagent_container/food/snacks/chocolatecakeslice{ + pixel_y = 2; + pixel_x = 2 + }, +/obj/item/reagent_container/food/drinks/coffee{ + pixel_y = 13; + pixel_x = 5 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"Tu" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/turf/open/floor/prison/kitchen, +/area/adminlevel/ert_station/fax_response_station) +"TC" = ( +/turf/open/floor/prison/yellowcorner, +/area/adminlevel/ert_station/fax_response_station) +"TD" = ( +/turf/open/floor/prison/bright_clean2, +/area/adminlevel/ert_station/fax_response_station) +"TE" = ( +/turf/open/mars_dirt/mars_cave_3, +/area/space) +"TH" = ( +/obj/structure/surface/table/almayer, +/obj/structure/barricade/handrail/pizza{ + pixel_y = -3 + }, +/obj/item/storage/box/drinkingglasses{ + layer = 2.97; + pixel_x = 14 + }, +/obj/item/reagent_container/food/drinks/bottle/orangejuice{ + layer = 2.97 + }, +/turf/open/floor/prison/kitchen, +/area/adminlevel/ert_station/fax_response_station) +"TK" = ( +/turf/closed/shuttle/ert, +/area/adminlevel/ert_station/fax_response_station) +"TQ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + 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_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_y = -1 + }, +/obj/structure/pipes/standard/manifold/fourway/hidden/supply, +/turf/open/floor/cmo, +/area/adminlevel/ert_station/fax_response_station) +"TY" = ( +/obj/structure/bed/chair{ + can_buckle = 0; + dir = 4 + }, +/obj/structure/bed/chair{ + can_buckle = 0; + dir = 4; + pixel_x = 1; + pixel_y = 3 + }, +/obj/structure/bed/chair{ + can_buckle = 0; + dir = 4; + pixel_x = 2; + pixel_y = 6 + }, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"Uu" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/power/apc/antag{ + dir = 1 + }, +/turf/open/floor/prison/kitchen, +/area/adminlevel/ert_station/fax_response_station) +"Ux" = ( +/obj/structure/barricade/handrail/pizza{ + dir = 1; + pixel_y = 12 + }, +/obj/structure/bed/chair/bolted{ + pixel_y = -1; + buckling_y = -1 + }, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"UB" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/turf/open/floor/cmo, +/area/adminlevel/ert_station/fax_response_station) +"Vj" = ( +/obj/structure/closet/secure_closet/fridge/dry/stock, +/turf/open/floor/prison/greenblue/northeast, +/area/adminlevel/ert_station/fax_response_station) +"Vm" = ( +/obj/structure/surface/table/reinforced, +/obj/item/tool/kitchen/tray{ + pixel_y = 2 + }, +/obj/item/reagent_container/food/snacks/sliceable/pizza/mushroompizza{ + pixel_y = 1 + }, +/turf/open/floor/prison/greenbluecorner, +/area/adminlevel/ert_station/fax_response_station) +"Vs" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/obj/structure/machinery/light{ + pixel_x = 16; + dir = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/turf/open/floor/prison/red/west, +/area/adminlevel/ert_station/fax_response_station) +"Vt" = ( +/turf/closed/shuttle/ert{ + icon_state = "stan25" + }, +/area/adminlevel/ert_station/fax_response_station) +"Vv" = ( +/obj/docking_port/stationary/emergency_response/idle_port4, +/turf/open/floor/plating, +/area/adminlevel/ert_station/fax_response_station) +"Vx" = ( +/obj/structure/lattice, +/turf/open/space/basic, +/area/space) +"VD" = ( +/obj/structure/barricade/handrail/pizza{ + dir = 1; + pixel_y = 12 + }, +/obj/structure/reagent_dispensers/water_cooler/stacks{ + density = 0; + pixel_x = -3; + pixel_y = 15; + layer = 4.03 + }, +/obj/structure/surface/table/almayer{ + layer = 4.02 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"VK" = ( +/turf/open/floor/prison/yellow/southwest, +/area/adminlevel/ert_station/fax_response_station) +"VN" = ( +/obj/structure/bed/chair/bolted{ + dir = 8; + pixel_x = -7; + buckling_x = -7 + }, +/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 = 6; + pixel_y = 30; + serial_number = 12 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"VQ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/prison/kitchen, +/area/adminlevel/ert_station/fax_response_station) +"VS" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/donut_box{ + pixel_y = -8 + }, +/turf/open/floor/prison, +/area/adminlevel/ert_station/fax_response_station) +"VV" = ( +/obj/effect/landmark/late_join/responder/twe, +/turf/open/floor/prison/kitchen, +/area/adminlevel/ert_station/fax_response_station) +"VX" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + pixel_y = -1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/cmo, +/area/adminlevel/ert_station/fax_response_station) +"Wb" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + name = "\improper Umbillical Airlock"; + id = "pizza_ert_arrival" + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer/test_floor4, +/area/adminlevel/ert_station/fax_response_station) +"WL" = ( +/obj/structure/window/framed/almayer/hull, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/plating, +/area/adminlevel/ert_station/fax_response_station) +"WP" = ( +/turf/open/floor/prison/kitchen, +/area/adminlevel/ert_station/fax_response_station) +"WS" = ( +/obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ + dir = 1; + req_one_access = null + }, +/turf/open/floor/plating/prison, +/area/adminlevel/ert_station/fax_response_station) +"WZ" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper Kitchen and Cleaning" + }, +/turf/open/floor/almayer/test_floor4, +/area/adminlevel/ert_station/fax_response_station) +"Xa" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out" + }, +/obj/structure/sign/safety/debark_lounge{ + pixel_y = 32 + }, +/obj/structure/sign/safety/landingzone{ + pixel_y = 32; + pixel_x = 15 + }, +/turf/open/floor/prison/yellow/north, +/area/adminlevel/ert_station/fax_response_station) +"Xg" = ( +/obj/structure/prop/souto_land/streamer{ + pixel_y = 9; + pixel_x = 1 + }, +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/prison/red, +/area/adminlevel/ert_station/fax_response_station) +"Xj" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E" + }, +/obj/structure/sign/safety/airlock{ + pixel_y = 32 + }, +/obj/structure/sign/safety/hazard{ + pixel_x = 15; + pixel_y = 32 + }, +/obj/structure/closet/crate/trashcart, +/obj/item/storage/bag/trash, +/obj/item/storage/bag/trash{ + pixel_x = -6; + pixel_y = 5 + }, +/turf/open/floor/prison/kitchen, +/area/adminlevel/ert_station/fax_response_station) +"Xn" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 4 + }, +/turf/open/space, +/area/space) +"Xq" = ( +/obj/structure/surface/rack, +/obj/structure/machinery/light/small/blue{ + pixel_x = 16 + }, +/obj/item/reagent_container/food/snacks/bigbiteburger{ + pixel_x = -2 + }, +/obj/item/reagent_container/food/snacks/bigbiteburger{ + pixel_x = 4 + }, +/turf/open/floor/prison/greenblue, +/area/adminlevel/ert_station/fax_response_station) +"Xr" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/prison/kitchen, +/area/adminlevel/ert_station/fax_response_station) +"Xw" = ( +/obj/structure/platform/kutjevo/smooth, +/obj/structure/platform/kutjevo/smooth{ + dir = 4 + }, +/turf/open/space/basic, +/area/space) +"Xx" = ( +/obj/structure/surface/table/reinforced, +/obj/item/reagent_container/food/snacks/sliceable/flatdough, +/obj/item/tool/kitchen/rollingpin, +/turf/open/floor/cmo, +/area/adminlevel/ert_station/fax_response_station) +"XB" = ( +/obj/structure/machinery/shower{ + pixel_y = 16 + }, +/obj/structure/window/reinforced{ + dir = 4; + health = 80 + }, +/obj/structure/window/reinforced{ + dir = 8; + health = 80 + }, +/turf/open/floor/plating/plating_catwalk, +/area/adminlevel/ert_station/fax_response_station) +"XD" = ( +/obj/structure/pipes/vents/pump{ + dir = 8 + }, +/turf/open/floor/prison/red/northeast, +/area/adminlevel/ert_station/fax_response_station) +"XV" = ( +/obj/structure/prop/souto_land/streamer{ + dir = 4; + pixel_y = 9 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/prison/red, +/area/adminlevel/ert_station/fax_response_station) +"XZ" = ( +/obj/structure/barricade/handrail/pizza{ + pixel_y = -3 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"Ya" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "STAFF ONLY" + }, +/turf/open/floor/almayer/test_floor4, +/area/adminlevel/ert_station/fax_response_station) +"Yf" = ( +/obj/structure/surface/table/reinforced, +/obj/item/reagent_container/food/condiment/hotsauce/franks/macho{ + pixel_y = 18; + pixel_x = -6 + }, +/obj/item/reagent_container/food/condiment/hotsauce/franks{ + pixel_y = 18; + pixel_x = 6 + }, +/obj/item/reagent_container/food/condiment/hotsauce/cholula{ + pixel_y = 16 + }, +/obj/item/reagent_container/food/drinks/drinkingglass{ + pixel_y = 1; + pixel_x = -4 + }, +/obj/item/reagent_container/food/drinks/drinkingglass{ + pixel_y = 3; + pixel_x = 6 + }, +/turf/open/floor/cmo, +/area/adminlevel/ert_station/fax_response_station) +"Yj" = ( +/obj/structure/surface/table/reinforced/cloth, +/obj/item/tool/kitchen/utensil/pknife{ + pixel_x = -6 + }, +/obj/item/tool/kitchen/utensil/pfork{ + pixel_y = 3; + pixel_x = -3 + }, +/obj/item/reagent_container/food/drinks/cans/souto/blue{ + pixel_x = 5; + pixel_y = 10 + }, +/obj/item/tool/kitchen/tray{ + pixel_y = -2; + pixel_x = 16 + }, +/turf/open/floor/redyellowfull, +/area/adminlevel/ert_station/fax_response_station) +"Ym" = ( +/obj/structure/sign/safety/nonpress_0g{ + pixel_x = -16 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating/prison, +/area/adminlevel/ert_station/fax_response_station) +"Yo" = ( +/turf/open/space, +/area/space) +"Yu" = ( +/obj/structure/platform/kutjevo/smooth, +/obj/structure/platform/kutjevo/smooth{ + dir = 4 + }, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space) +"Yv" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer/dark_sterile, +/area/adminlevel/ert_station/fax_response_station) +"Yw" = ( +/turf/closed/shuttle/ert{ + icon_state = "stan27" + }, +/area/adminlevel/ert_station/fax_response_station) +"Yy" = ( +/turf/open/space/basic, +/area/space) +"YD" = ( +/obj/structure/surface/table/reinforced, +/obj/item/tool/kitchen/tray{ + pixel_y = 6 + }, +/obj/item/reagent_container/food/snacks/sliceable/pizza/meatpizza{ + pixel_y = 5 + }, +/turf/open/floor/prison/greenblue/southeast, +/area/adminlevel/ert_station/fax_response_station) +"YF" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 1 + }, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space) +"YL" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + name = "\improper Umbillical Airlock"; + id = "pizza_ert_arrival" + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper Galaxy Pizza!" + }, +/turf/open/floor/almayer/test_floor4, +/area/adminlevel/ert_station/fax_response_station) +"YM" = ( +/obj/structure/prop/invuln{ + desc = "An inflated membrane. This one is puncture proof. Wow!"; + icon = 'icons/obj/items/inflatable.dmi'; + icon_state = "wall"; + name = "Docking Umbilical" + }, +/obj/structure/blocker/invisible_wall, +/obj/structure/sign/safety/airlock{ + pixel_y = -32 + }, +/obj/structure/sign/safety/hazard{ + pixel_x = 15; + pixel_y = -32 + }, +/turf/open/floor/almayer_hull, +/area/adminlevel/ert_station/fax_response_station) +"YO" = ( +/turf/closed/wall/almayer, +/area/adminlevel/ert_station/fax_response_station) +"ZD" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + name = "\improper Umbillical Airlock"; + id = "pizza_ert_arrival" + }, +/turf/open/floor/almayer/test_floor4, +/area/adminlevel/ert_station/fax_response_station) +"ZM" = ( +/obj/structure/closet/secure_closet/freezer/fridge/full, +/obj/item/reagent_container/food/condiment/enzyme, +/obj/item/reagent_container/food/drinks/soymilk, +/obj/item/reagent_container/food/drinks/soymilk, +/obj/item/reagent_container/food/condiment/hotsauce/tabasco, +/obj/item/reagent_container/food/condiment/hotsauce/sriracha, +/obj/item/reagent_container/food/condiment/hotsauce/franks, +/obj/item/reagent_container/food/condiment/hotsauce/cholula, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/prison/greenblue/north, +/area/adminlevel/ert_station/fax_response_station) +"ZR" = ( +/obj/structure/pipes/vents/pump{ + dir = 4 + }, +/turf/open/floor/cmo, +/area/adminlevel/ert_station/fax_response_station) +"ZV" = ( +/obj/structure/bed/sofa/vert/grey, +/turf/open/floor/prison, +/area/adminlevel/ert_station/fax_response_station) +"ZX" = ( +/obj/structure/surface/table/reinforced, +/obj/structure/sign/poster/ad{ + icon_state = "poster12"; + pixel_y = 32 + }, +/obj/item/tool/kitchen/tray{ + pixel_y = 6 + }, +/obj/item/tool/kitchen/tray{ + pixel_y = 9 + }, +/obj/item/tool/kitchen/tray{ + pixel_y = 12 + }, +/turf/open/floor/prison/kitchen, +/area/adminlevel/ert_station/fax_response_station) + +(1,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(2,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yo +Yy +Yy +Yy +Yy +Yy +Yy +Yo +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(3,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +yg +qq +qq +qX +yg +uj +qq +qq +NT +yg +qq +qq +qX +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(4,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +yg +RG +OJ +OJ +Sg +eI +OJ +OJ +OJ +Sg +wb +OJ +OJ +Py +NT +Yy +Yy +Yy +ID +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(5,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +ID +ID +Yy +yg +Xw +OJ +OJ +OJ +tT +Xw +OJ +OJ +OJ +Gn +Xw +OJ +OJ +OJ +OG +Vx +ID +ID +ID +ID +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(6,1,1) = {" +Yy +Yy +Yy +Yy +Yy +ID +ID +ID +ID +eI +OJ +OJ +OJ +oy +CP +CP +OJ +OJ +OJ +CP +CP +oy +OJ +OJ +tT +rk +Vx +ID +ID +ID +ID +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(7,1,1) = {" +Yy +Yy +Yy +Yy +ID +ID +ID +ID +Vx +Pq +OJ +OJ +oy +CP +fH +fb +OJ +oy +OJ +ja +Mz +CP +oy +OJ +OJ +oX +Yy +Yy +ID +ID +ID +ID +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(8,1,1) = {" +Yy +Yy +Yy +ID +ID +ID +ID +Vx +Yy +RC +PF +xe +CP +lx +Xn +ID +ID +ID +ID +ID +ha +xe +CP +OJ +OJ +oX +Yy +Yy +Vx +ID +ID +ID +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(9,1,1) = {" +Yy +Yy +Yy +ID +ID +ID +Yy +Vx +Yy +Yy +Yy +eI +CP +ID +ID +ID +ID +ID +ID +ID +ID +eI +CP +fH +Hg +fO +Yy +Vx +Vx +Yy +ID +ID +ID +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(10,1,1) = {" +Yy +Yy +Yy +ID +ID +Vx +Vx +Vx +Yy +Yy +Yy +ID +ID +ID +ID +ID +ID +ID +ID +ID +Ei +Ei +WL +WL +WL +uo +Ei +Ei +Vx +Vx +Vx +ID +ID +ID +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(11,1,1) = {" +Yy +Yy +Yy +Yy +ID +Yy +Yy +Vx +yg +qq +ID +ID +ID +ID +ID +ID +ID +ID +ID +Ei +Ei +hX +Ff +rA +uN +Pl +TY +Ei +Ei +Vx +Yy +Yy +ID +ID +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(12,1,1) = {" +Yy +Yy +Yy +Yy +Vx +Yy +Yy +wD +Yu +jH +ID +Ei +Ei +Ei +Ei +Ei +Ei +Ei +Ei +Ei +Gh +Ly +Sp +uN +Sp +RN +jx +FS +Ei +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(13,1,1) = {" +Yy +Yy +Yy +Vx +Vx +Yy +yg +Yu +jH +pD +Ei +Ei +nK +RV +Xx +ef +wm +qy +YO +YO +vA +ug +Au +vr +yr +uN +wu +ly +Rh +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(14,1,1) = {" +Yy +Yy +Yy +Vx +wD +qq +Xw +jH +TE +TE +Ei +Ac +nB +nB +nB +nB +nB +nB +eD +YO +dc +zQ +oU +vi +Gm +uN +ec +xh +Rh +Yy +Yy +Yy +Yy +Ei +uo +uo +uo +Ei +uo +uo +uo +Ei +Yy +Yy +Yy +"} +(15,1,1) = {" +Yy +Yy +Yy +yg +Yu +pD +pD +TE +pD +qt +Rh +qv +nB +ZR +MB +cr +Pn +nB +nB +jy +tq +MK +FY +wz +Gm +hb +pS +pS +Rh +Yy +Yy +Yy +Ei +Ei +Mt +nl +SL +BU +fj +nl +sk +Ei +Ei +Yy +Yy +"} +(16,1,1) = {" +Yy +Yy +Yy +eI +pD +TE +pD +sB +TE +TE +Rh +Dx +nB +jo +np +JP +aA +Lk +nB +uY +tq +Sw +TH +wz +uz +cO +KC +mt +Rh +Yy +Yy +Ei +Ei +pA +fE +VS +rK +an +Nl +cL +wo +VK +Ei +Ei +Yy +"} +(17,1,1) = {" +Yy +Yy +Yy +eI +sB +TE +TE +sB +TE +pD +Rh +Yf +UB +AB +Pa +NP +Pa +ov +nB +jf +tq +WP +La +wz +nU +uN +Ax +tC +Rh +Yy +Yy +Ei +Ei +Xa +Jm +Jm +Jm +Jm +Jm +Jm +Jm +aS +Ei +Ei +Yy +"} +(18,1,1) = {" +Yy +Yy +Yy +eI +NJ +TK +TK +Ha +lg +sB +Ei +sJ +jo +nB +ae +YO +uD +Ab +bT +YO +Ao +nz +lv +wz +OE +uN +HQ +fN +Ei +Yy +Yy +Yy +uo +AH +Vv +fu +fu +fu +fu +fu +fu +gU +uo +Yy +Yy +"} +(19,1,1) = {" +Yy +Yy +Yy +eI +Yw +Ln +Mj +WS +TE +eW +Ei +YO +Rf +kz +YO +YO +YO +YO +YO +YO +Uu +WP +nA +sa +aP +Db +zz +ys +Ei +ah +bd +YM +Ei +cK +fu +fu +fu +fu +fu +fu +fu +lJ +Ei +GM +Yy +"} +(20,1,1) = {" +Yy +Yy +Yy +eI +Vt +nf +nf +qh +FL +TE +uo +Ps +fg +WP +zf +WZ +TD +Fd +lN +Ya +bB +zH +lE +wz +Gm +Jl +Jl +Jl +tH +IJ +Jl +Jl +Ep +AH +fu +fu +fu +fu +fu +fu +fu +gU +la +Yy +Yy +"} +(21,1,1) = {" +Yy +Yy +Yy +eI +sB +sB +TE +eW +TE +pD +uo +JU +Tu +CO +CO +NG +mP +ok +Sz +BJ +vX +WP +yE +wz +hc +ir +ir +ir +Wb +zQ +ir +Dd +EO +AH +fu +fu +fu +fu +fu +fu +fu +gU +sW +Yy +Yy +"} +(22,1,1) = {" +Yy +Yy +Yy +eI +sB +sB +eW +TE +TE +ID +Ei +cP +tq +WP +Bz +YO +YO +AD +YO +YO +gV +wc +zx +DW +Eh +lB +mt +hR +Ei +ah +bd +YM +Ei +cK +fu +fu +fu +fu +fu +fu +fu +lJ +Ei +GM +Yy +"} +(23,1,1) = {" +Yy +Yy +Yy +eI +me +TE +TE +pD +ID +ID +Ei +Kv +EZ +Qe +BC +YO +wi +yK +yP +YO +VQ +WP +ic +wz +nU +hb +Iq +xl +Ei +Yy +Yy +Yy +uo +AH +fu +fu +fu +fu +fu +fu +fu +gU +uo +Yy +Yy +"} +(24,1,1) = {" +Yy +Yy +Yy +RC +xe +me +me +ID +ID +ID +Ei +ZX +tq +WP +Fz +YO +eo +yG +Xq +YO +CT +VV +HL +wz +XV +uN +pS +tp +Ei +Yy +Yy +Yy +uo +AH +fu +fu +fu +fu +fu +fu +fu +gU +uo +Yy +Yy +"} +(25,1,1) = {" +Yy +Yy +Yy +Yy +RC +uK +PL +Ei +Ei +Ei +Ei +Xj +Xr +WP +sp +YO +ZM +KY +Sq +YO +DF +cT +gu +wz +OE +hb +qs +dh +Ei +Yy +Yy +Yy +uo +AH +fu +fu +fu +fu +fu +fu +fu +gU +uo +Yy +Yy +"} +(26,1,1) = {" +Yy +Yy +Yy +Yy +Yy +xp +ei +ub +oG +Ym +FD +vI +wa +FB +YO +YO +Cv +KY +Jq +YO +ST +Kb +am +wz +Gd +Db +zz +ys +Ei +ah +bd +YM +Ei +cK +fu +fu +fu +fu +fu +fu +fu +lJ +Ei +GM +Yy +"} +(27,1,1) = {" +Yy +Yy +Yy +Yy +Yy +DH +lL +lH +zE +aD +EK +im +sY +fg +YO +NN +yo +KY +ny +YO +Vs +sx +sx +wq +oh +zh +zh +zh +YL +vr +zh +Ib +Ep +AH +fu +fu +fu +fu +fu +fu +fu +gU +rL +Yy +Yy +"} +(28,1,1) = {" +Yy +Yy +Yy +Yy +Yy +vR +Kc +Ei +Ei +Ei +Ei +By +sl +aq +bU +hL +xV +Vm +iw +YO +OS +OS +OS +zM +Gm +OS +OS +OS +ZD +cq +OS +OS +EO +AH +fu +fu +fu +fu +fu +fu +fu +gU +sW +Yy +Yy +"} +(29,1,1) = {" +Yy +Yy +Vx +Yy +Yy +YF +Ee +fO +ID +ID +Ei +Ei +qA +yM +YO +Vj +zW +YD +YO +YO +Nr +Mk +OK +wQ +uz +wP +KC +hR +Ei +ah +bd +YM +Ei +cK +fu +fu +fu +fu +fu +fu +fu +lJ +Ei +GM +Yy +"} +(30,1,1) = {" +Yy +Vx +Vx +Vx +Vx +Vx +Yy +Yy +Yy +ID +ID +Ei +dS +YO +YO +YO +oD +YO +YO +qU +jV +Gj +mk +wQ +aJ +hb +PH +zl +Ei +Yy +Yy +Yy +uo +AH +fu +fu +fu +fu +fu +fu +fu +gU +uo +Yy +Yy +"} +(31,1,1) = {" +Yy +Yy +ID +Yy +Yy +Vx +Vx +Vx +Vx +Vx +Ei +Ei +bl +pT +YO +mj +ty +MS +YO +rj +ma +uN +MX +Pi +Xg +hb +Cp +lw +Rh +Yy +Yy +Ei +Ei +iY +No +No +No +No +No +No +No +AW +Ei +Ei +Yy +"} +(32,1,1) = {" +Yy +ID +ID +ID +ID +Vx +Yy +Yy +Yy +Yy +Rh +Fj +td +Fp +YO +XB +MT +bo +YO +Sr +Ra +uN +jb +xc +qb +uN +pS +pS +Rh +Yy +Yy +Ei +Ei +EH +hg +Nl +NH +ZV +JR +Nl +TC +rO +Ei +Ei +Yy +"} +(33,1,1) = {" +Yy +ID +ID +ID +ID +Vx +Yy +Yy +Yy +Yy +Rh +wX +tM +hv +YO +YO +SV +YO +YO +VN +pS +XZ +jT +So +Oh +uN +zC +zC +Rh +Yy +Yy +Yy +Ei +Ei +Gt +Hd +Hd +GB +Hd +Hd +oo +Ei +Ei +Yy +Yy +"} +(34,1,1) = {" +Yy +Yy +ID +ID +ID +ID +ID +Yy +Yy +Yy +Ei +YO +YO +YO +YO +KB +VX +zj +YO +Aj +RP +gy +gb +XD +eK +hb +Yj +sI +Rh +Yy +Yy +Yy +Yy +Ei +uo +uo +uo +Ei +uo +uo +uo +Ei +Yy +Yy +Yy +"} +(35,1,1) = {" +Yy +Yy +ID +ID +ID +ID +ID +Vx +Yy +Yy +Rh +vq +QN +Yv +se +Bu +TQ +Bu +NV +AV +cI +OQ +jV +uN +kW +RN +Og +xX +Rh +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(36,1,1) = {" +Yy +Yy +Yy +ID +ID +ID +Vx +Vx +Vx +Vx +Rh +vq +ap +Kd +YO +qo +eQ +Ck +YO +YO +tX +JV +Gp +Te +Se +hb +pS +nX +Ei +Yy +Yy +Vx +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(37,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Vx +ID +Ei +Ei +jq +pE +YO +Jd +xy +Ny +YO +YO +YO +Ux +cE +eh +LH +VD +Nb +Ei +Ei +Vx +Vx +Vx +Vx +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(38,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +ID +ID +ID +Ei +Ei +Ei +Ei +WL +WL +WL +Ei +ID +Ei +Ei +WL +WL +WL +uo +Ei +Ei +Vx +Yy +Yy +ID +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(39,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +ID +ID +ID +ID +ID +ID +ID +Yy +Yy +Yy +ID +ID +ID +ID +Yy +Yy +Yy +Yy +Vx +Vx +Vx +Yy +ID +ID +ID +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(40,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +ID +ID +ID +ID +ID +Yy +Yy +Yy +Yy +Yy +ID +ID +Vx +Yy +Yy +Yy +Vx +Vx +Yy +Vx +ID +ID +ID +ID +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(41,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +ID +ID +ID +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Vx +Vx +Vx +Yy +Yy +Vx +Yy +ID +ID +ID +ID +ID +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(42,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Vx +Vx +Vx +ID +ID +ID +ID +ID +ID +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(43,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Vx +ID +ID +ID +ID +ID +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(44,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +ID +ID +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(45,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} From 4da49129e831e2bd57533371a9263df57d95b01a Mon Sep 17 00:00:00 2001 From: forest2001 Date: Mon, 9 Sep 2024 19:46:46 +0100 Subject: [PATCH 08/50] temp fax posts --- .../lazy_templates/fax_responder_base.dmm | 6959 ++++------------- 1 file changed, 1677 insertions(+), 5282 deletions(-) diff --git a/maps/templates/lazy_templates/fax_responder_base.dmm b/maps/templates/lazy_templates/fax_responder_base.dmm index 1691f89f0d7c..07ccc2ca2c5c 100644 --- a/maps/templates/lazy_templates/fax_responder_base.dmm +++ b/maps/templates/lazy_templates/fax_responder_base.dmm @@ -1,4123 +1,518 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"ae" = ( -/obj/structure/machinery/door_control{ - id = "kitchen_pizza_time"; - name = "Main Kitchen Shutters"; - pixel_x = 28 - }, -/obj/structure/safe/floor, -/obj/item/spacecash/c1000, -/obj/item/spacecash/c100, -/obj/item/spacecash/c10, -/obj/item/spacecash/c10, -/obj/item/spacecash/c10, -/obj/item/spacecash/c10, -/obj/item/spacecash/c100, -/obj/item/spacecash/c100, -/obj/item/spacecash/c100, -/obj/item/spacecash/c100, -/obj/item/spacecash/c100, -/obj/item/spacecash/c100, -/obj/item/spacecash/c50, -/obj/item/spacecash/c50, -/obj/item/spacecash/c50, -/obj/item/spacecash/c50, -/obj/item/spacecash/c50, -/obj/item/spacecash/c500, -/obj/item/spacecash/c500, -/obj/item/spacecash/c500, -/turf/open/floor/cmo, -/area/adminlevel/ert_station/fax_response_station) -"ah" = ( -/obj/structure/prop/invuln{ - desc = "An inflated membrane. This one is puncture proof. Wow!"; - icon = 'icons/obj/items/inflatable.dmi'; - icon_state = "wall"; - name = "Docking Umbilical" - }, -/obj/structure/blocker/invisible_wall, -/obj/structure/sign/safety/airlock{ - pixel_y = 32 - }, -/obj/structure/sign/safety/hazard{ - pixel_x = 15; - pixel_y = 32 - }, -/turf/open/floor/almayer_hull, -/area/adminlevel/ert_station/fax_response_station) "am" = ( -/obj/structure/surface/table/almayer, -/obj/structure/barricade/handrail/pizza{ - dir = 4; - pixel_y = -3 - }, -/obj/structure/barricade/handrail/pizza{ - pixel_y = -3 - }, -/obj/item/reagent_container/food/drinks/cans/souto/cherry{ - pixel_x = -8; - layer = 2.97 - }, -/obj/item/reagent_container/food/drinks/cans/souto/cherry{ - anchored = 1; - layer = 2.97 - }, -/obj/item/reagent_container/food/drinks/cans/souto/cherry{ - pixel_x = 8; - layer = 2.97 - }, -/obj/item/reagent_container/food/drinks/cans/souto/cherry{ - layer = 4.1; - pixel_x = -4; - pixel_y = 18 - }, -/obj/item/reagent_container/food/drinks/cans/souto/cherry{ - layer = 4.1; - pixel_x = 4; - pixel_y = 18 +/obj/structure/surface/table/woodentable/fancy, +/obj/item/folder/red{ + pixel_x = 6 }, -/obj/item/reagent_container/food/drinks/cans/souto/cherry{ - layer = 4.2; - pixel_y = 36 +/obj/item/folder/black{ + pixel_x = 12 }, -/turf/open/floor/prison/kitchen, -/area/adminlevel/ert_station/fax_response_station) -"an" = ( -/obj/structure/bed/chair/bolted{ - dir = 1; - pixel_y = 12; - buckling_y = 12 +/obj/structure/transmitter/rotary{ + pixel_x = -6; + pixel_y = 6; + networks_transmit = list("USCM","Colonist","UPP"); + phone_id = "UPP High Command"; + phone_category = "Comms Relay"; + networks_receive = list("Fax Responders"); + phone_color = "green" }, -/turf/open/floor/prison, +/turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) -"ap" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 +"bT" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/computer/cameras/almayer{ + dir = 8; + admin_console = 1; + network = list("Overwatch"); + pixel_x = 16; + pixel_y = 8; + name = "Overwatch Cameras"; + colony_camera_mapload = 0 }, -/obj/structure/pipes/vents/scrubber{ - dir = 8 +/obj/structure/machinery/computer/cameras/almayer{ + dir = 8; + admin_console = 1; + network = list("Almayer","Research","Containment","Containment Hidden"); + pixel_x = 16; + layer = 2.99; + name = "USS Almayer Cameras"; + pixel_y = -6; + colony_camera_mapload = 0 }, -/turf/open/floor/almayer/dark_sterile, +/turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) -"aq" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 4 - }, -/turf/open/floor/prison/kitchen, +"dc" = ( +/obj/structure/bed, +/obj/item/bedsheet/ce, +/turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) -"aA" = ( -/obj/structure/surface/table/reinforced, -/obj/structure/machinery/microwave{ +"gu" = ( +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) +"id" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/computer/crew/alt{ + pixel_y = 24; + pixel_x = -12; + faction = "UPP"; + name = "UPP monitoring computer" + }, +/obj/item/tool/pen/clicky, +/obj/item/tool/pen/blue/clicky{ pixel_y = 8 }, -/turf/open/floor/prison/kitchen, -/area/adminlevel/ert_station/fax_response_station) -"aD" = ( -/obj/structure/sign/safety/nonpress_0g{ - pixel_x = 32 +/obj/item/tool/pen/green/clicky{ + pixel_y = 8; + pixel_x = -8 }, -/obj/structure/sign/safety/manualopenclose{ - pixel_y = 14; - pixel_x = 32 +/obj/item/tool/pen/red/clicky{ + pixel_x = -8 }, -/turf/open/floor/plating/prison, -/area/adminlevel/ert_station/fax_response_station) -"aJ" = ( -/obj/structure/prop/souto_land/streamer{ - dir = 1; - pixel_y = 9; - pixel_x = 1 +/obj/item/paper_bin/wy{ + pixel_y = 6; + pixel_x = 8 }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/machinery/computer/crew/alt{ + pixel_y = 24; + pixel_x = 8; + name = "USCM monitoring computer" }, -/turf/open/floor/prison/red, +/turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) -"aP" = ( -/obj/structure/prop/souto_land/pole{ +"im" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/computer/cameras/almayer{ dir = 8; - pixel_y = 9 - }, -/obj/structure/prop/souto_land/streamer{ - dir = 9 - }, -/obj/structure/pipes/standard/manifold/hidden/supply, -/turf/open/floor/prison/red, -/area/adminlevel/ert_station/fax_response_station) -"aS" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out" + admin_console = 1; + network = list("Overwatch"); + pixel_x = 16; + pixel_y = 16; + name = "Overwatch Cameras"; + colony_camera_mapload = 0 }, -/obj/structure/sign/safety/debark_lounge{ - pixel_y = -32 +/obj/structure/machinery/computer/cameras/almayer{ + dir = 8; + admin_console = 1; + network = list("WY","Colony"); + pixel_x = 16; + name = "WY Cameras"; + colony_camera_mapload = 0 }, -/obj/structure/sign/safety/landingzone{ - pixel_y = -32; - pixel_x = 15 +/obj/structure/machinery/computer/cameras/almayer{ + dir = 8; + admin_console = 1; + network = list("Almayer","Research","Containment","Containment Hidden"); + pixel_x = 16; + layer = 2.99; + name = "USS Almayer Cameras"; + pixel_y = -16; + colony_camera_mapload = 0 }, -/turf/open/floor/prison/yellow, +/turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) -"bd" = ( -/obj/structure/prop/invuln{ - desc = "An inflated membrane. This one is puncture proof. Wow!"; - icon = 'icons/obj/items/inflatable.dmi'; - icon_state = "wall"; - name = "Docking Umbilical" - }, -/obj/structure/blocker/invisible_wall, -/turf/open/floor/almayer_hull, +"jh" = ( +/turf/closed/wall/r_wall/prison_unmeltable, /area/adminlevel/ert_station/fax_response_station) -"bl" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 +"jV" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/folder/red{ + pixel_x = 6 }, -/obj/effect/decal/warning_stripes{ - icon_state = "S"; - pixel_y = -1 +/obj/item/folder/black{ + pixel_x = 12 }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/transmitter/rotary{ + pixel_x = -6; + pixel_y = 6; + networks_transmit = list("USCM","Colonist","TWE"); + phone_id = "TWE High Command"; + phone_category = "Comms Relay"; + networks_receive = list("Fax Responders"); + phone_color = "yellow" }, -/turf/open/floor/corsat/retrosquareslight, +/turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) -"bo" = ( -/obj/structure/machinery/shower{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4; - health = 80 +"nB" = ( +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_x = -24 }, -/obj/structure/window/reinforced{ - dir = 8; - health = 80 +/obj/structure/machinery/cm_vending/sorted/marine_food{ + pixel_y = 16; + density = 0 }, -/turf/open/floor/plating/plating_catwalk, +/turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) -"bB" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +"ov" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/faxmachine/uscm/command/highcom{ + pixel_y = 8 }, -/turf/open/floor/prison/kitchen, +/turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) -"bT" = ( -/obj/structure/surface/table/reinforced, -/obj/structure/machinery/recharger, -/turf/open/floor/cmo, +"rV" = ( +/obj/effect/landmark/late_join/responder/uscm/provost, +/turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) -"bU" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/machinery/door/airlock/almayer/generic{ - name = "\improper Central Fridge"; - dir = 1 +"sx" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/folder/white{ + pixel_x = -6 }, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer/test_floor4, -/area/adminlevel/ert_station/fax_response_station) -"cq" = ( -/obj/structure/pipes/vents/scrubber{ - dir = 8 +/obj/item/folder/white, +/obj/item/folder/white{ + pixel_x = 6 }, -/turf/open/floor/prison/red/east, +/turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) -"cr" = ( -/obj/structure/surface/table/reinforced, -/obj/item/trash/plate{ - pixel_x = 1; - pixel_y = 3 - }, -/obj/item/trash/plate{ - pixel_x = 1; - pixel_y = 6 - }, -/obj/item/reagent_container/food/condiment/saltshaker{ - pixel_x = -4 +"tq" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/folder/red{ + pixel_x = 6 }, -/obj/item/reagent_container/food/condiment/peppermill{ - pixel_x = 4 +/obj/item/folder/black{ + pixel_x = 12 }, -/turf/open/floor/cmo, -/area/adminlevel/ert_station/fax_response_station) -"cE" = ( -/obj/structure/surface/table/reinforced/cloth, -/obj/item/trash/ceramic_plate{ - pixel_y = 4; - pixel_x = -2 +/obj/structure/transmitter/rotary{ + pixel_x = -6; + pixel_y = 6; + networks_transmit = list("USCM","Colonist"); + phone_id = "USCM High Command"; + phone_category = "Comms Relay"; + networks_receive = list("Fax Responders"); + phone_color = "blue" }, -/turf/open/floor/redyellowfull, +/turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) -"cI" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/turf/open/floor/blueyellowfull, +"tM" = ( +/obj/effect/landmark/late_join/responder/clf, +/turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) -"cK" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/structure/sign/safety/airlock{ - pixel_y = 32 - }, -/obj/structure/sign/safety/hazard{ - pixel_x = 15; - pixel_y = 32 +"wz" = ( +/turf/closed/wall/r_wall/bunker{ + hull = 1 }, -/turf/open/floor/prison/yellow/north, /area/adminlevel/ert_station/fax_response_station) -"cL" = ( -/obj/structure/bed/chair/bolted{ - dir = 8; - pixel_x = -7; - buckling_x = -7 - }, -/turf/open/floor/prison, +"xb" = ( +/obj/effect/landmark/late_join/responder/wey_yu, +/turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) -"cO" = ( -/obj/structure/barricade/handrail/pizza{ - dir = 8; - pixel_y = -3 - }, -/obj/structure/barricade/handrail/pizza{ - dir = 1; - pixel_y = 12 - }, -/obj/structure/prop/souto_land/streamer{ - dir = 6 +"xc" = ( +/turf/closed/wall/r_wall/chigusa{ + hull = 1 }, -/turf/open/floor/redyellowfull, /area/adminlevel/ert_station/fax_response_station) -"cP" = ( -/obj/structure/surface/table/reinforced, -/obj/item/trash/ceramic_plate{ - pixel_y = 5 +"yv" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/computer/crew/alt{ + pixel_y = 24; + pixel_x = -12; + faction = "TWE"; + name = "TWE monitoring computer" }, -/obj/item/trash/ceramic_plate{ +/obj/item/tool/pen/clicky, +/obj/item/tool/pen/blue/clicky{ pixel_y = 8 }, -/obj/item/trash/ceramic_plate{ - pixel_y = 11 +/obj/item/tool/pen/green/clicky{ + pixel_y = 8; + pixel_x = -8 }, -/obj/item/trash/ceramic_plate{ - pixel_y = 14 +/obj/item/tool/pen/red/clicky{ + pixel_x = -8 }, -/turf/open/floor/prison/kitchen, -/area/adminlevel/ert_station/fax_response_station) -"cT" = ( -/obj/effect/landmark/late_join/responder/clf, -/turf/open/floor/prison/kitchen, -/area/adminlevel/ert_station/fax_response_station) -"dc" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 +/obj/item/paper_bin/wy{ + pixel_y = 6; + pixel_x = 8 }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 +/obj/structure/machinery/computer/crew/alt{ + pixel_y = 24; + pixel_x = 8; + name = "USCM monitoring computer" }, -/turf/open/floor/prison/red/east, +/turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) -"dh" = ( -/obj/structure/surface/table/reinforced/cloth, -/obj/item/reagent_container/food/drinks/cans/souto/diet/cranberry{ - pixel_y = 20; - layer = 3.03; - pixel_x = 4 +"Ab" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/tool/pen/clicky, +/obj/item/tool/pen/blue/clicky{ + pixel_y = 8 }, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"dS" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/airlock/almayer/generic{ - name = "\improper Freezer" +/obj/item/tool/pen/green/clicky{ + pixel_y = 8; + pixel_x = -8 }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/item/tool/pen/red/clicky{ + pixel_x = -8 }, -/turf/open/floor/almayer/test_floor4, -/area/adminlevel/ert_station/fax_response_station) -"ec" = ( -/obj/structure/surface/table/reinforced/cloth, -/obj/item/reagent_container/food/snacks/birthdaycakeslice, -/obj/item/reagent_container/food/drinks/cans/dr_gibb{ - pixel_x = -8; - pixel_y = -6 +/obj/structure/machinery/computer/crew/alt{ + pixel_y = 24; + name = "USCM monitoring computer" + }, +/obj/item/paper_bin/uscm{ + pixel_x = 8; + pixel_y = 6 }, -/turf/open/floor/redyellowfull, +/turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) -"ef" = ( -/obj/structure/surface/rack, -/obj/item/reagent_container/food/snacks/sliceable/cheesewheel/mature{ - pixel_x = -1; - pixel_y = 7 +"Ba" = ( +/obj/structure/filingcabinet{ + density = 0; + pixel_y = 24; + pixel_x = 9 }, -/obj/item/reagent_container/food/snacks/sliceable/cheesewheel/mature{ - pixel_x = 1; - pixel_y = -5 +/obj/structure/filingcabinet{ + density = 0; + pixel_y = 24; + pixel_x = -7 }, -/turf/open/floor/cmo, +/turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) -"eh" = ( -/obj/structure/surface/table/reinforced/cloth, -/obj/item/reagent_container/food/snacks/omelette{ - pixel_y = 2; - pixel_x = 1 - }, -/obj/item/reagent_container/food/condiment/coldsauce{ - pixel_y = 22; - pixel_x = -10 +"Bp" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/tool/stamp/hos{ + name = "red stamp"; + pixel_y = 8 }, -/obj/item/tool/kitchen/utensil/fork{ - pixel_y = 2; - pixel_x = -8 +/obj/item/tool/stamp/hop{ + name = "blue stamp" }, -/obj/item/reagent_container/food/drinks/coffee{ - pixel_y = 13; - pixel_x = 5 +/obj/item/tool/stamp/ce{ + name = "yellow stamp"; + pixel_y = -8 }, -/turf/open/floor/redyellowfull, +/turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) -"ei" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer_hull, +"BC" = ( +/turf/closed/wall/r_wall/biodome/biodome_unmeltable, /area/adminlevel/ert_station/fax_response_station) -"eo" = ( -/obj/structure/closet/secure_closet/freezer/meat, -/obj/item/reagent_container/food/condiment/coldsauce, -/obj/item/reagent_container/food/condiment/coldsauce, -/obj/structure/machinery/light/small/blue{ - dir = 1; - pixel_y = 20; - pixel_x = 16 - }, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 +"CT" = ( +/obj/structure/machinery/light{ + dir = 8; + tag = "icon-tube1 (EAST)" }, -/turf/open/floor/prison/greenblue/north, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) +"Ei" = ( +/turf/closed/wall/almayer/outer, /area/adminlevel/ert_station/fax_response_station) -"eD" = ( -/obj/structure/reagent_dispensers/water_cooler/stacks{ +"EI" = ( +/obj/structure/filingcabinet{ density = 0; - pixel_x = -11; - pixel_y = -1 + pixel_y = 24; + pixel_x = -7 }, -/turf/open/floor/cmo, -/area/adminlevel/ert_station/fax_response_station) -"eI" = ( -/obj/structure/platform/kutjevo/smooth, -/turf/open/space/basic, -/area/space) -"eK" = ( -/obj/structure/prop/souto_land/pole{ - dir = 8; - pixel_y = 9; - pixel_x = 1 +/obj/structure/filingcabinet{ + density = 0; + pixel_y = 24; + pixel_x = 9 }, -/turf/open/floor/prison/red/southeast, +/turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) -"eQ" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 +"EK" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/computer/crew/alt{ + pixel_y = 24; + pixel_x = -12; + faction = "Wey-Yu"; + name = "WY monitoring computer" + }, +/obj/item/tool/pen/clicky, +/obj/item/tool/pen/blue/clicky{ + pixel_y = 8 }, -/obj/effect/decal/warning_stripes{ - icon_state = "S"; - pixel_y = -1 +/obj/item/tool/pen/green/clicky{ + pixel_y = 8; + pixel_x = -8 }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/item/tool/pen/red/clicky{ + pixel_x = -8 }, -/turf/open/floor/cmo, -/area/adminlevel/ert_station/fax_response_station) -"eW" = ( -/turf/open/mars_dirt/mars_cave_11, -/area/space) -"fb" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 +/obj/item/paper_bin/wy{ + pixel_y = 6; + pixel_x = 8 }, -/obj/structure/platform/kutjevo/smooth, -/turf/open/space, -/area/space) -"fg" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/machinery/computer/crew/alt{ + pixel_y = 24; + pixel_x = 8; + name = "USCM monitoring computer" }, -/turf/open/floor/prison/kitchen, +/turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) -"fj" = ( -/obj/structure/closet/firecloset/full, -/turf/open/floor/prison/yellow/west, -/area/adminlevel/ert_station/fax_response_station) -"fu" = ( -/turf/open/floor/plating, -/area/adminlevel/ert_station/fax_response_station) -"fE" = ( -/obj/structure/bed/sofa/south/grey/right, -/turf/open/floor/prison/yellowcorner/east, -/area/adminlevel/ert_station/fax_response_station) -"fH" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 +"FB" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/folder/red{ + pixel_x = 6 }, -/turf/open/space, -/area/space) -"fN" = ( -/obj/structure/surface/table/reinforced/cloth, -/obj/item/reagent_container/food/drinks/cans/souto/peach{ - pixel_y = 14; - pixel_x = -4 +/obj/item/folder/black{ + pixel_x = 12 }, -/obj/item/reagent_container/food/drinks/cans/souto/diet/lime{ - pixel_y = 9 +/obj/structure/transmitter/rotary{ + pixel_x = -6; + pixel_y = 6; + networks_transmit = list("USCM","Colonist","Wey-Yu","PMC"); + phone_id = "Weyland-Yutani Operations Manager"; + phone_category = "Comms Relay"; + networks_receive = list("Fax Responders") }, -/obj/structure/machinery/light, -/turf/open/floor/redyellowfull, +/turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) -"fO" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, -/turf/open/space/basic, -/area/space) -"gb" = ( -/obj/structure/barricade/handrail/pizza{ - pixel_y = -3 - }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +"FD" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/faxmachine/corporate/highcom{ + pixel_y = 8 }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 +/obj/structure/machinery/computer/crew/alt{ + pixel_y = 24; + faction = "PMC"; + name = "PMC monitoring computer" }, -/turf/open/floor/blueyellowfull, +/turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) -"gu" = ( -/obj/structure/surface/table/almayer, -/obj/structure/barricade/handrail/pizza{ - pixel_y = -3 +"HL" = ( +/obj/item/bedsheet/ce, +/obj/structure/bed, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) +"NP" = ( +/obj/structure/machinery/light, +/obj/structure/surface/table/woodentable/fancy, +/obj/item/folder/red{ + pixel_x = 6 }, -/obj/item/storage/box/drinkingglasses{ - layer = 2.97; +/obj/item/folder/black{ pixel_x = 12 }, -/obj/item/reagent_container/food/drinks/shaker{ - pixel_x = -11; - layer = 2.97; - pixel_y = 2 - }, -/obj/item/reagent_container/food/drinks/bottle/rum{ - pixel_y = 2; - pixel_x = -2; - layer = 2.97 - }, -/turf/open/floor/prison/kitchen, -/area/adminlevel/ert_station/fax_response_station) -"gy" = ( -/obj/structure/barricade/handrail/pizza{ - dir = 8 +/obj/structure/transmitter/rotary{ + pixel_x = -6; + pixel_y = 6; + networks_transmit = list("USCM","Colonist"); + phone_id = "USCM Provost Office"; + phone_category = "Comms Relay"; + networks_receive = list("Fax Responders"); + phone_color = "red" }, -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/blueyellowfull, +/turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) -"gU" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N" - }, -/turf/open/floor/prison/yellow, +"Pn" = ( +/obj/structure/window/framed/almayer/hull, +/turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) -"gV" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/light{ - pixel_x = 16; - dir = 1 +"Rh" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/computer/crew/alt{ + pixel_y = 24; + pixel_x = -12; + faction = "CLF"; + name = "CLF monitoring computer" + }, +/obj/item/tool/pen/clicky, +/obj/item/tool/pen/blue/clicky{ + pixel_y = 8 }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/item/tool/pen/green/clicky{ + pixel_y = 8; + pixel_x = -8 }, -/obj/structure/sign/safety/restrictedarea{ - pixel_y = 32 +/obj/item/tool/pen/red/clicky{ + pixel_x = -8 }, -/turf/open/floor/prison/kitchen, -/area/adminlevel/ert_station/fax_response_station) -"ha" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 +/obj/item/paper_bin/wy{ + pixel_y = 6; + pixel_x = 8 }, -/turf/open/space, -/area/space) -"hb" = ( -/obj/structure/barricade/handrail/pizza{ - dir = 1; - pixel_y = 12 +/obj/structure/machinery/computer/crew/alt{ + pixel_y = 24; + pixel_x = 8; + name = "USCM monitoring computer" }, -/turf/open/floor/redyellowfull, +/turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) -"hc" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 +"ST" = ( +/obj/structure/bed/chair/comfy/teal{ + dir = 4 }, -/turf/open/floor/prison/red, -/area/adminlevel/ert_station/fax_response_station) -"hg" = ( -/turf/open/floor/prison/yellowcorner/north, +/turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) -"hv" = ( -/obj/structure/closet/crate/freezer/cooler, -/turf/open/floor/prison/floor_marked/southwest, -/area/adminlevel/ert_station/fax_response_station) -"hL" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 4 +"UB" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/faxmachine/uscm/brig/provost{ + pixel_y = 8 }, -/turf/open/floor/prison/greenblue/north, +/turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) -"hR" = ( -/obj/structure/barricade/handrail/pizza{ +"Vs" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/computer/cameras/almayer{ dir = 8; - pixel_y = -3 - }, -/obj/structure/bed/chair/bolted{ - dir = 4; - pixel_x = 7; - buckling_x = 7 - }, -/obj/structure/sign/safety/hazard{ - pixel_x = 15; - pixel_y = -32 - }, -/obj/structure/sign/safety/airlock{ - pixel_y = -32 + admin_console = 1; + network = list("Almayer","Research","Containment","Containment Hidden"); + pixel_x = 16; + layer = 2.99; + name = "USS Almayer Cameras"; + pixel_y = -6; + colony_camera_mapload = 0 }, -/obj/structure/prop/souto_land/streamer{ - dir = 6 +/obj/structure/machinery/computer/cameras/almayer{ + dir = 8; + admin_console = 1; + network = list("Overwatch"); + pixel_x = 16; + pixel_y = 8; + name = "Overwatch Cameras"; + colony_camera_mapload = 0 }, -/turf/open/floor/redyellowfull, +/turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) -"hX" = ( -/obj/structure/bed/chair/bolted{ - pixel_y = -1; - buckling_y = -1 - }, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/redyellowfull, +"VV" = ( +/obj/effect/landmark/late_join/responder/upp, +/turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) -"ic" = ( -/obj/item/trash/plate{ - pixel_y = 4 - }, -/obj/item/trash/plate{ - pixel_y = 6 - }, -/obj/item/trash/plate{ +"Wp" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/faxmachine/corporate/highcom{ pixel_y = 8 }, -/obj/item/trash/plate{ - pixel_y = 10 - }, -/obj/structure/surface/table/almayer, -/obj/structure/barricade/handrail/pizza{ - pixel_y = -3 - }, -/obj/item/reagent_container/food/drinks/drinkingglass{ - pixel_y = 14; - pixel_x = 11 - }, -/obj/item/reagent_container/food/drinks/drinkingglass{ - pixel_y = 9; - pixel_x = 12 - }, -/turf/open/floor/prison/kitchen, -/area/adminlevel/ert_station/fax_response_station) -"im" = ( -/obj/structure/bed/chair/janicart, -/turf/open/floor/prison, +/turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) -"ir" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/prison/red/east, +"XZ" = ( +/obj/effect/landmark/late_join/responder/twe, +/turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) -"iw" = ( -/obj/structure/surface/table/reinforced, -/obj/item/reagent_container/food/snacks/tofukabob, -/obj/item/reagent_container/food/snacks/tofukabob{ - pixel_y = 10 +"Yv" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/folder/red{ + pixel_x = 6 }, -/obj/item/reagent_container/food/snacks/tofukabob{ - pixel_y = 5 +/obj/item/folder/black{ + pixel_x = 12 }, -/turf/open/floor/prison/greenblue/southeast, -/area/adminlevel/ert_station/fax_response_station) -"iY" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - layer = 2.5 +/obj/structure/transmitter/rotary{ + pixel_x = -6; + pixel_y = 6; + networks_transmit = list("USCM","Colonist","CLF"); + phone_id = "CLF Command"; + phone_category = "Comms Relay"; + networks_receive = list("Fax Responders"); + phone_color = "orange" }, -/obj/structure/sign/safety/debark_lounge{ - pixel_y = 32 +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) +"Yy" = ( +/turf/open/space/basic, +/area/space) +"YO" = ( +/obj/effect/landmark/late_join/responder/uscm, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) +"YR" = ( +/obj/structure/machinery/cm_vending/sorted/marine_food{ + pixel_y = 16; + density = 0 }, -/obj/structure/sign/safety/landingzone{ - pixel_y = 32; - pixel_x = 15 +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_x = -24 }, -/turf/open/floor/prison/yellow/north, -/area/adminlevel/ert_station/fax_response_station) -"ja" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" - }, -/turf/open/space, -/area/space) -"jb" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 - }, -/turf/open/floor/prison/red/northeast, -/area/adminlevel/ert_station/fax_response_station) -"jf" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/item/trash/ceramic_plate{ - pixel_y = 2 - }, -/obj/item/reagent_container/food/snacks/toastedsandwich{ - pixel_y = 11 - }, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - name = "\improper Kitchen Shutters"; - id = "kitchen_pizza_time" - }, -/turf/open/floor/almayer/plate, -/area/adminlevel/ert_station/fax_response_station) -"jo" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/cmo, -/area/adminlevel/ert_station/fax_response_station) -"jq" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 12 - }, -/obj/structure/mirror{ - pixel_x = 29 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_y = 1 - }, -/obj/structure/machinery/light/small{ - dir = 1; - pixel_y = 13 - }, -/turf/open/floor/plating/plating_catwalk, -/area/adminlevel/ert_station/fax_response_station) -"jx" = ( -/obj/structure/bed/chair/bolted{ - dir = 4; - pixel_x = 7; - pixel_y = -6; - buckling_x = 7; - buckling_y = -6 - }, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"jy" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/item/tool/kitchen/tray{ - pixel_y = 6 - }, -/obj/item/tool/kitchen/tray{ - pixel_y = 9 - }, -/obj/item/tool/kitchen/tray{ - pixel_y = 12 - }, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - name = "\improper Kitchen Shutters"; - id = "kitchen_pizza_time" - }, -/turf/open/floor/almayer/plate, -/area/adminlevel/ert_station/fax_response_station) -"jH" = ( -/turf/open/mars/mars_cave_10, -/area/space) -"jT" = ( -/obj/structure/barricade/handrail/pizza{ - pixel_y = -3 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/blueyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"jV" = ( -/obj/structure/barricade/handrail/pizza{ - dir = 8 - }, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"kz" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - dir = 1; - name = "\improper Kitchen" - }, -/turf/open/floor/almayer/test_floor4, -/area/adminlevel/ert_station/fax_response_station) -"kW" = ( -/obj/structure/barricade/handrail/pizza{ - dir = 8 - }, -/obj/structure/prop/souto_land/streamer{ - dir = 1; - pixel_y = 9 - }, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"la" = ( -/obj/structure/blocker/invisible_wall, -/obj/structure/machinery/door/poddoor/almayer{ - unacidable = 1 - }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - locked = 1 - }, -/turf/open/floor/almayer/test_floor4, -/area/adminlevel/ert_station/fax_response_station) -"lg" = ( -/turf/closed/shuttle/ert{ - icon_state = "leftengine_1" - }, -/area/adminlevel/ert_station/fax_response_station) -"lv" = ( -/obj/structure/surface/table/almayer, -/obj/structure/barricade/handrail/pizza{ - pixel_y = -3 - }, -/obj/item/reagent_container/food/drinks/drinkingglass/cola{ - pixel_y = 8; - pixel_x = -2 - }, -/obj/item/reagent_container/food/drinks/shaker{ - pixel_y = 5; - pixel_x = -11 - }, -/turf/open/floor/prison/kitchen, -/area/adminlevel/ert_station/fax_response_station) -"lw" = ( -/obj/structure/surface/table/reinforced/cloth, -/obj/item/reagent_container/food/condiment/coldsauce{ - pixel_y = 22; - pixel_x = -10 - }, -/obj/item/clothing/mask/cigarette{ - pixel_x = 4; - pixel_y = 11 - }, -/obj/item/ashtray/glass{ - pixel_x = -6 - }, -/obj/item/clothing/mask/cigarette{ - pixel_y = 8 - }, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"lx" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" - }, -/turf/open/space/basic, -/area/space) -"ly" = ( -/obj/structure/surface/table/reinforced/cloth, -/obj/item/reagent_container/food/drinks/cans/souto/grape{ - pixel_y = 16; - pixel_x = 9 - }, -/obj/item/reagent_container/food/drinks/cans/souto/lime{ - pixel_y = 12; - pixel_x = 5 - }, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"lB" = ( -/obj/structure/barricade/handrail/pizza{ - dir = 8; - pixel_y = -3 - }, -/obj/structure/barricade/handrail/pizza{ - dir = 1; - pixel_y = 12 - }, -/obj/item/storage/briefcase/stowaway{ - pixel_y = 11; - layer = 4.11 - }, -/obj/structure/prop/souto_land/streamer{ - dir = 6 - }, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"lE" = ( -/obj/structure/machinery/vending/dinnerware, -/obj/structure/barricade/handrail/pizza{ - pixel_y = -3 - }, -/turf/open/floor/prison/kitchen, -/area/adminlevel/ert_station/fax_response_station) -"lH" = ( -/obj/structure/machinery/door/poddoor/almayer/locked{ - icon_state = "almayer_pdoor"; - id = "pizza_takeaway_out" - }, -/turf/open/floor/almayer/test_floor4, -/area/adminlevel/ert_station/fax_response_station) -"lJ" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N" - }, -/obj/structure/sign/safety/airlock{ - pixel_y = -32 - }, -/obj/structure/sign/safety/hazard{ - pixel_x = 15; - pixel_y = -32 - }, -/turf/open/floor/prison/yellow, -/area/adminlevel/ert_station/fax_response_station) -"lL" = ( -/turf/open/floor/almayer_hull, -/area/adminlevel/ert_station/fax_response_station) -"lN" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_x = -30 - }, -/turf/open/floor/prison/bright_clean2, -/area/adminlevel/ert_station/fax_response_station) -"ma" = ( -/obj/structure/surface/table/reinforced/cloth, -/obj/item/storage/donut_box{ - pixel_y = 10; - pixel_x = 1 - }, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"me" = ( -/turf/open/mars_dirt/mars_cave_8, -/area/space) -"mj" = ( -/obj/structure/machinery/shower{ - pixel_y = 16 - }, -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, -/obj/structure/window/reinforced{ - dir = 8; - health = 80 - }, -/obj/structure/machinery/light/small{ - dir = 1; - pixel_x = 16; - pixel_y = 20 - }, -/turf/open/floor/plating/plating_catwalk, -/area/adminlevel/ert_station/fax_response_station) -"mk" = ( -/obj/structure/barricade/handrail/pizza{ - dir = 4; - pixel_y = -3 - }, -/obj/structure/barricade/handrail/pizza{ - dir = 4; - pixel_y = 16 - }, -/obj/structure/machinery/vending/snack{ - layer = 4.15; - pixel_y = 3 - }, -/turf/open/floor/prison/bright_clean2, -/area/adminlevel/ert_station/fax_response_station) -"mt" = ( -/obj/structure/barricade/handrail/pizza{ - dir = 8; - pixel_y = -3 - }, -/obj/structure/bed/chair/bolted{ - dir = 4; - pixel_x = 7; - buckling_x = 7 - }, -/obj/structure/prop/souto_land/streamer{ - dir = 6 - }, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"mP" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/sign/safety/fridge{ - pixel_x = 32 - }, -/turf/open/floor/prison/bright_clean2, -/area/adminlevel/ert_station/fax_response_station) -"nf" = ( -/turf/closed/shuttle/ert{ - icon_state = "stan5" - }, -/area/adminlevel/ert_station/fax_response_station) -"nl" = ( -/obj/structure/surface/table/almayer, -/turf/open/floor/prison/yellow/west, -/area/adminlevel/ert_station/fax_response_station) -"np" = ( -/obj/structure/surface/table/reinforced, -/obj/item/pizzabox{ - pixel_y = 5 - }, -/obj/item/pizzabox{ - pixel_y = 8 - }, -/obj/item/pizzabox{ - pixel_y = 11 - }, -/obj/item/pizzabox{ - pixel_y = 14 - }, -/turf/open/floor/cmo, -/area/adminlevel/ert_station/fax_response_station) -"ny" = ( -/obj/structure/closet/secure_closet/fridge/fish/stock, -/obj/structure/machinery/light/small/blue{ - pixel_x = 16 - }, -/turf/open/floor/prison/greenblue, -/area/adminlevel/ert_station/fax_response_station) -"nz" = ( -/obj/effect/landmark/late_join/responder/uscm/provost, -/turf/open/floor/prison/kitchen, -/area/adminlevel/ert_station/fax_response_station) -"nA" = ( -/obj/structure/surface/table/almayer, -/obj/structure/barricade/handrail/pizza{ - pixel_y = -3 - }, -/obj/item/reagent_container/food/drinks/cans/tonic{ - pixel_x = -15; - pixel_y = 10 - }, -/obj/item/reagent_container/food/drinks/cans/tonic{ - pixel_y = 6; - pixel_x = -15 - }, -/obj/structure/machinery/computer/emails{ - dir = 1; - pixel_y = 2; - pixel_x = 3; - layer = 2.97 - }, -/turf/open/floor/prison/kitchen, -/area/adminlevel/ert_station/fax_response_station) -"nB" = ( -/turf/open/floor/cmo, -/area/adminlevel/ert_station/fax_response_station) -"nK" = ( -/obj/structure/surface/table/reinforced, -/obj/item/tool/kitchen/tray, -/obj/item/tool/kitchen/knife{ - pixel_x = 3 - }, -/obj/item/tool/kitchen/knife/butcher{ - pixel_x = -8 - }, -/obj/structure/machinery/firealarm{ - pixel_x = -24 - }, -/turf/open/floor/cmo, -/area/adminlevel/ert_station/fax_response_station) -"nU" = ( -/obj/structure/prop/souto_land/streamer{ - dir = 1; - pixel_y = 9 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/prison/red, -/area/adminlevel/ert_station/fax_response_station) -"nX" = ( -/obj/structure/bed/chair/bolted{ - dir = 8; - pixel_x = -7; - buckling_x = -7 - }, -/obj/structure/machinery/light, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"oh" = ( -/obj/structure/pipes/standard/manifold/fourway/hidden/supply, -/turf/open/floor/prison/red, -/area/adminlevel/ert_station/fax_response_station) -"ok" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 - }, -/turf/open/floor/prison/bright_clean2, -/area/adminlevel/ert_station/fax_response_station) -"oo" = ( -/obj/structure/closet/emcloset, -/turf/open/floor/prison/yellow/southeast, -/area/adminlevel/ert_station/fax_response_station) -"ov" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/turf/open/floor/cmo, -/area/adminlevel/ert_station/fax_response_station) -"oy" = ( -/obj/structure/bedsheetbin{ - icon_state = "linenbin-empty"; - name = "solar lattice"; - pixel_y = 6 - }, -/turf/open/floor/almayer_hull, -/area/space) -"oD" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/airlock/almayer/maint{ - locked = 1; - name = "STAFF ONLY"; - req_one_access = null; - req_one_access_txt = "101" - }, -/turf/open/floor/almayer/test_floor4, -/area/adminlevel/ert_station/fax_response_station) -"oG" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating/prison, -/area/adminlevel/ert_station/fax_response_station) -"oU" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/turf/open/floor/prison/red/east, -/area/adminlevel/ert_station/fax_response_station) -"oX" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" - }, -/turf/open/space/basic, -/area/space) -"pA" = ( -/obj/structure/machinery/vending/coffee{ - pixel_y = 18; - density = 0 - }, -/obj/structure/machinery/alarm{ - pixel_x = -32 - }, -/turf/open/floor/prison/yellow/northwest, -/area/adminlevel/ert_station/fax_response_station) -"pD" = ( -/turf/open/mars_dirt/mars_cave_10, -/area/space) -"pE" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 12 - }, -/obj/structure/mirror{ - pixel_x = 29 - }, -/turf/open/floor/plating/plating_catwalk, -/area/adminlevel/ert_station/fax_response_station) -"pS" = ( -/obj/structure/bed/chair/bolted{ - dir = 8; - pixel_x = -7; - buckling_x = -7 - }, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"pT" = ( -/obj/structure/closet/crate/freezer/rations, -/obj/item/reagent_container/food/snacks/meat/fish/crab, -/obj/item/reagent_container/food/snacks/meat/fish/crab, -/obj/item/reagent_container/food/snacks/meat/fish/squid, -/obj/item/reagent_container/food/snacks/meat/fish/squid, -/obj/item/reagent_container/food/snacks/meat/fish/squid, -/obj/item/reagent_container/food/snacks/meat/fish/squid/alt, -/obj/item/reagent_container/food/snacks/meat/fish/squid/alt, -/obj/item/reagent_container/food/snacks/meat/fish/squid/alt, -/obj/item/reagent_container/food/snacks/meat/fish, -/obj/item/reagent_container/food/snacks/meat/fish, -/obj/item/reagent_container/food/snacks/meat/fish, -/obj/item/reagent_container/food/snacks/meat/fish, -/turf/open/floor/prison/floor_marked/southwest, -/area/adminlevel/ert_station/fax_response_station) -"qb" = ( -/obj/structure/prop/souto_land/streamer{ - dir = 1; - pixel_y = 9; - pixel_x = 2 - }, -/obj/structure/pipes/vents/scrubber{ - dir = 8 - }, -/turf/open/floor/prison/red, -/area/adminlevel/ert_station/fax_response_station) -"qh" = ( -/turf/closed/shuttle/ert{ - icon_state = "stan_rightengine" - }, -/area/adminlevel/ert_station/fax_response_station) -"qo" = ( -/obj/structure/closet{ - pixel_y = 16; - density = 0 - }, -/obj/structure/window/reinforced{ - dir = 8; - health = 80 - }, -/obj/structure/machinery/light/small{ - dir = 1; - pixel_x = 16; - pixel_y = 20 - }, -/turf/open/floor/plating/plating_catwalk, -/area/adminlevel/ert_station/fax_response_station) -"qq" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/turf/open/space/basic, -/area/space) -"qs" = ( -/obj/structure/surface/table/reinforced/cloth, -/obj/item/reagent_container/food/drinks/cans/souto/diet/classic{ - pixel_x = -2 - }, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"qt" = ( -/turf/open/mars_dirt/mars_cave_6, -/area/space) -"qv" = ( -/obj/structure/surface/table/reinforced, -/obj/item/book/manual/chef_recipes, -/obj/item/clothing/head/chefhat, -/turf/open/floor/cmo, -/area/adminlevel/ert_station/fax_response_station) -"qy" = ( -/obj/structure/surface/table/reinforced, -/obj/structure/machinery/juicer{ - pixel_y = 9 - }, -/turf/open/floor/cmo, -/area/adminlevel/ert_station/fax_response_station) -"qA" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_y = 1 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/prison/kitchen, -/area/adminlevel/ert_station/fax_response_station) -"qU" = ( -/obj/structure/barricade/handrail/pizza{ - dir = 8 - }, -/obj/structure/bed/chair/bolted{ - dir = 4; - pixel_x = 7; - buckling_x = 7 - }, -/obj/structure/machinery/alarm{ - pixel_y = 25 - }, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"qX" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/turf/open/space/basic, -/area/space) -"rj" = ( -/obj/structure/surface/table/reinforced/cloth, -/obj/item/trash/ceramic_plate{ - pixel_y = 1; - pixel_x = 2 - }, -/obj/item/reagent_container/food/snacks/meatpizzaslice{ - pixel_x = 2; - pixel_y = 4 - }, -/obj/item/reagent_container/food/drinks/cans/beer{ - pixel_x = 9; - pixel_y = 14 - }, -/obj/structure/machinery/light{ - pixel_x = 16; - dir = 1 - }, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"rk" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/obj/structure/lattice, -/turf/open/space/basic, -/area/space) -"rA" = ( -/obj/structure/bed/chair/bolted{ - dir = 1; - pixel_y = 12; - buckling_y = 12 - }, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"rK" = ( -/obj/structure/surface/table/almayer, -/turf/open/floor/prison, -/area/adminlevel/ert_station/fax_response_station) -"rL" = ( -/obj/structure/blocker/invisible_wall, -/obj/structure/machinery/door/poddoor/almayer{ - name = "\improper Umbillical Airlock"; - unacidable = 1 - }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - locked = 1 - }, -/turf/open/floor/almayer/test_floor4, -/area/adminlevel/ert_station/fax_response_station) -"rO" = ( -/obj/structure/closet/firecloset/full, -/turf/open/floor/prison/yellow/southeast, -/area/adminlevel/ert_station/fax_response_station) -"sa" = ( -/obj/structure/pipes/vents/scrubber, -/turf/open/floor/prison/red/north, -/area/adminlevel/ert_station/fax_response_station) -"se" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/machinery/door/airlock/almayer/generic{ - name = "\improper Bathroom"; - dir = 1 - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer/test_floor4, -/area/adminlevel/ert_station/fax_response_station) -"sk" = ( -/obj/structure/surface/table/almayer, -/turf/open/floor/prison/yellow/southwest, -/area/adminlevel/ert_station/fax_response_station) -"sl" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 - }, -/turf/open/floor/prison/kitchen, -/area/adminlevel/ert_station/fax_response_station) -"sp" = ( -/obj/structure/surface/table/reinforced, -/obj/item/tool/kitchen/pizzacutter, -/turf/open/floor/prison/kitchen, -/area/adminlevel/ert_station/fax_response_station) -"sx" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/prison/red/west, -/area/adminlevel/ert_station/fax_response_station) -"sB" = ( -/turf/open/mars_dirt/mars_cave_7, -/area/space) -"sI" = ( -/obj/structure/surface/table/reinforced/cloth, -/obj/item/tool/kitchen/tray{ - pixel_y = 13; - pixel_x = 16 - }, -/obj/item/reagent_container/food/snacks/sliceable/pizza/meatpizza{ - pixel_y = 13; - pixel_x = 15 - }, -/obj/item/trash/plate{ - pixel_y = 3; - pixel_x = 1 - }, -/obj/item/reagent_container/food/snacks/meatpizzaslice{ - pixel_y = 3; - pixel_x = -1 - }, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"sJ" = ( -/obj/structure/machinery/vending/ingredients, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/cmo, -/area/adminlevel/ert_station/fax_response_station) -"sW" = ( -/obj/structure/blocker/invisible_wall, -/obj/structure/machinery/door/poddoor/almayer{ - name = "\improper Umbillical Airlock"; - unacidable = 1 - }, -/turf/open/floor/almayer/test_floor4, -/area/adminlevel/ert_station/fax_response_station) -"sY" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/structure/pipes/vents/pump{ - dir = 8 - }, -/turf/open/floor/prison/kitchen, -/area/adminlevel/ert_station/fax_response_station) -"td" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S"; - pixel_y = -1 - }, -/obj/structure/pipes/vents/scrubber{ - dir = 8 - }, -/turf/open/floor/corsat/retrosquareslight, -/area/adminlevel/ert_station/fax_response_station) -"tp" = ( -/obj/structure/bed/chair/bolted{ - dir = 4; - pixel_y = 17; - pixel_x = 10; - buckling_y = 17; - buckling_x = 10 - }, -/obj/structure/machinery/light, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"tq" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/prison/kitchen, -/area/adminlevel/ert_station/fax_response_station) -"ty" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S"; - pixel_y = -1 - }, -/obj/structure/pipes/vents/scrubber{ - dir = 4 - }, -/turf/open/floor/almayer/dark_sterile, -/area/adminlevel/ert_station/fax_response_station) -"tC" = ( -/obj/structure/surface/table/reinforced/cloth, -/obj/item/reagent_container/food/condiment/peppermill{ - pixel_x = 13; - pixel_y = 12 - }, -/obj/item/reagent_container/food/condiment/saltshaker{ - pixel_x = 7; - pixel_y = 17 - }, -/obj/item/trash/plate{ - pixel_y = 5 - }, -/obj/item/reagent_container/food/snacks/cheeseburger{ - pixel_x = -1; - pixel_y = 9 - }, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"tH" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/machinery/door/poddoor/almayer/open{ - name = "\improper Umbillical Airlock"; - id = "pizza_ert_arrival" - }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper Galaxy Pizza!" - }, -/turf/open/floor/almayer/test_floor4, -/area/adminlevel/ert_station/fax_response_station) -"tM" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S"; - pixel_y = -1 - }, -/turf/open/floor/corsat/retrosquareslight, -/area/adminlevel/ert_station/fax_response_station) -"tT" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/turf/open/space, -/area/space) -"tX" = ( -/obj/structure/machinery/disposal{ - layer = 2.97 - }, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"ub" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/machinery/door/poddoor/almayer/locked{ - icon_state = "almayer_pdoor"; - id = "pizza_takeaway_out" - }, -/turf/open/floor/almayer/test_floor4, -/area/adminlevel/ert_station/fax_response_station) -"ug" = ( -/obj/structure/pipes/vents/scrubber, -/turf/open/floor/prison/red/west, -/area/adminlevel/ert_station/fax_response_station) -"uj" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/turf/open/space, -/area/space) -"uo" = ( -/obj/structure/window/framed/almayer/hull, -/turf/open/floor/plating, -/area/adminlevel/ert_station/fax_response_station) -"uz" = ( -/obj/structure/prop/souto_land/pole{ - dir = 4; - pixel_y = 9 - }, -/obj/structure/prop/souto_land/streamer{ - dir = 6 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/prison/red, -/area/adminlevel/ert_station/fax_response_station) -"uD" = ( -/obj/structure/surface/table/reinforced, -/obj/structure/machinery/processor{ - pixel_y = 10 - }, -/turf/open/floor/cmo, -/area/adminlevel/ert_station/fax_response_station) -"uK" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/obj/structure/barricade/handrail/kutjevo{ - layer = 3.01 - }, -/obj/structure/barricade/handrail/kutjevo{ - dir = 8; - layer = 3.01 - }, -/turf/open/space, -/area/space) -"uN" = ( -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"uY" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/box/cups, -/obj/item/tool/kitchen/utensil/fork{ - pixel_y = 4; - pixel_x = 11 - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/item/tool/kitchen/utensil/fork{ - pixel_y = 4; - pixel_x = 19 - }, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - name = "\improper Kitchen Shutters"; - id = "kitchen_pizza_time" - }, -/turf/open/floor/almayer/plate, -/area/adminlevel/ert_station/fax_response_station) -"vi" = ( -/obj/structure/pipes/vents/pump{ - dir = 8 - }, -/turf/open/floor/prison/redcorner/north, -/area/adminlevel/ert_station/fax_response_station) -"vq" = ( -/obj/structure/toilet{ - pixel_y = 16 - }, -/obj/structure/window/reinforced{ - dir = 8; - health = 80 - }, -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, -/turf/open/floor/plating/plating_catwalk, -/area/adminlevel/ert_station/fax_response_station) -"vr" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 - }, -/turf/open/floor/prison/red/west, -/area/adminlevel/ert_station/fax_response_station) -"vA" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/machinery/light{ - pixel_x = 16; - dir = 1 - }, -/turf/open/floor/prison/red/west, -/area/adminlevel/ert_station/fax_response_station) -"vI" = ( -/obj/structure/disposalpipe/segment, -/obj/item/storage/backpack/marine/satchel{ - desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; - icon = 'icons/obj/janitor.dmi'; - icon_state = "trashbag3"; - name = "trash bag"; - pixel_x = -1; - pixel_y = 6 - }, -/obj/item/storage/backpack/marine/satchel{ - desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; - icon = 'icons/obj/janitor.dmi'; - icon_state = "trashbag3"; - name = "trash bag"; - pixel_x = 3; - pixel_y = -2 - }, -/obj/item/weapon/broken_bottle{ - pixel_y = 7; - pixel_x = -12 - }, -/turf/open/floor/prison, -/area/adminlevel/ert_station/fax_response_station) -"vR" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/barricade/handrail/kutjevo{ - layer = 3.01 - }, -/obj/structure/lattice, -/turf/open/space/basic, -/area/space) -"vX" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/structure/pipes/standard/manifold/hidden/supply, -/turf/open/floor/prison/kitchen, -/area/adminlevel/ert_station/fax_response_station) -"wa" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 - }, -/turf/open/floor/prison/kitchen, -/area/adminlevel/ert_station/fax_response_station) -"wb" = ( -/obj/structure/platform/kutjevo/smooth, -/turf/open/space, -/area/space) -"wc" = ( -/obj/effect/landmark/late_join/responder/upp, -/turf/open/floor/prison/kitchen, -/area/adminlevel/ert_station/fax_response_station) -"wi" = ( -/obj/structure/closet/secure_closet/fridge/meat/stock, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 - }, -/turf/open/floor/prison/greenblue/northwest, -/area/adminlevel/ert_station/fax_response_station) -"wm" = ( -/obj/structure/surface/table/reinforced, -/obj/item/reagent_container/food/snacks/tomatomeat, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/cmo, -/area/adminlevel/ert_station/fax_response_station) -"wo" = ( -/obj/structure/bed/chair/bolted{ - dir = 8; - pixel_x = -7; - buckling_x = -7 - }, -/turf/open/floor/prison/yellowcorner/west, -/area/adminlevel/ert_station/fax_response_station) -"wq" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/prison/redcorner/east, -/area/adminlevel/ert_station/fax_response_station) -"wu" = ( -/obj/structure/surface/table/reinforced/cloth, -/obj/item/trash/ceramic_plate{ - pixel_y = 4; - pixel_x = -2 - }, -/obj/item/reagent_container/food/drinks/cans/beer{ - pixel_x = 13; - pixel_y = 2 - }, -/obj/item/reagent_container/food/snacks/carrotcakeslice{ - pixel_y = 6; - pixel_x = -1 - }, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"wz" = ( -/turf/open/floor/prison/red/north, -/area/adminlevel/ert_station/fax_response_station) -"wD" = ( -/obj/structure/platform_decoration/kutjevo, -/obj/structure/lattice, -/turf/open/space/basic, -/area/space) -"wP" = ( -/obj/structure/barricade/handrail/pizza{ - dir = 8; - pixel_y = -3 - }, -/obj/structure/barricade/handrail/pizza{ - dir = 1; - pixel_y = 12 - }, -/obj/structure/prop/souto_land/streamer{ - dir = 6 - }, -/obj/structure/bed/chair{ - can_buckle = 0; - dir = 4 - }, -/obj/structure/bed/chair{ - can_buckle = 0; - dir = 4; - pixel_x = 1; - pixel_y = 3 - }, -/obj/structure/bed/chair{ - can_buckle = 0; - dir = 4; - pixel_x = 2; - pixel_y = 6 - }, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"wQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/prison/red/north, -/area/adminlevel/ert_station/fax_response_station) -"wX" = ( -/obj/structure/closet/crate/freezer/cooler/oj, -/turf/open/floor/prison/floor_marked/southwest, -/area/adminlevel/ert_station/fax_response_station) -"xc" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/structure/pipes/standard/manifold/hidden/supply, -/turf/open/floor/prison/red/north, -/area/adminlevel/ert_station/fax_response_station) -"xe" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/turf/open/space/basic, -/area/space) -"xh" = ( -/obj/structure/surface/table/reinforced/cloth, -/obj/item/reagent_container/food/condiment/peppermill{ - pixel_x = -10; - pixel_y = 12 - }, -/obj/item/reagent_container/food/condiment/saltshaker{ - pixel_x = -15; - pixel_y = 17 - }, -/obj/item/trash/ceramic_plate{ - pixel_y = 5; - pixel_x = 2 - }, -/obj/item/reagent_container/food/snacks/applecakeslice{ - pixel_y = 8; - pixel_x = 3 - }, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"xl" = ( -/obj/structure/surface/table/reinforced/cloth, -/obj/item/tool/kitchen/tray{ - pixel_y = 20 - }, -/obj/item/reagent_container/food/snacks/sliceable/pizza/meatpizza{ - pixel_y = 20 - }, -/obj/item/reagent_container/food/drinks/cans/beer{ - pixel_x = 5; - pixel_y = 6 - }, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"xp" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/disposalpipe/trunk, -/obj/structure/barricade/handrail/kutjevo{ - layer = 3.01 - }, -/turf/open/space, -/area/space) -"xy" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S"; - pixel_y = -1 - }, -/obj/structure/pipes/vents/pump{ - dir = 8 - }, -/turf/open/floor/cmo, -/area/adminlevel/ert_station/fax_response_station) -"xV" = ( -/obj/structure/pipes/vents/pump{ - dir = 1 - }, -/turf/open/floor/prison/blue_plate, -/area/adminlevel/ert_station/fax_response_station) -"xX" = ( -/obj/structure/surface/table/reinforced/cloth, -/obj/item/trash/plate{ - pixel_y = 3; - pixel_x = 1 - }, -/obj/item/reagent_container/food/snacks/mushroompizzaslice{ - pixel_y = 4 - }, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"yg" = ( -/obj/structure/platform_decoration/kutjevo, -/turf/open/space/basic, -/area/space) -"yo" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/turf/open/floor/prison/greenbluecorner/east, -/area/adminlevel/ert_station/fax_response_station) -"yr" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 - }, -/turf/open/floor/prison/red/southwest, -/area/adminlevel/ert_station/fax_response_station) -"ys" = ( -/obj/structure/barricade/handrail/pizza{ - dir = 4; - pixel_y = -3 - }, -/obj/structure/bed/chair/bolted{ - dir = 8; - pixel_x = -7; - buckling_x = -7 - }, -/obj/structure/sign/safety/hazard{ - pixel_x = 15; - pixel_y = -32 - }, -/obj/structure/sign/safety/airlock{ - pixel_y = -32 - }, -/obj/structure/prop/souto_land/streamer{ - dir = 9 - }, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"yE" = ( -/obj/structure/barricade/handrail/pizza{ - pixel_y = -3 - }, -/obj/structure/surface/table/almayer, -/obj/item/trash/ceramic_plate{ - pixel_y = 6 - }, -/obj/item/reagent_container/food/snacks/toastedsandwich{ - pixel_y = 17; - pixel_x = -1 - }, -/obj/item/reagent_container/food/snacks/toastedsandwich{ - pixel_y = 15; - pixel_x = 2 - }, -/turf/open/floor/prison/kitchen, -/area/adminlevel/ert_station/fax_response_station) -"yG" = ( -/obj/structure/pipes/vents/scrubber{ - dir = 1 - }, -/turf/open/floor/prison/blue_plate, -/area/adminlevel/ert_station/fax_response_station) -"yK" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/turf/open/floor/prison/greenblue/west, -/area/adminlevel/ert_station/fax_response_station) -"yM" = ( -/obj/structure/sign/safety/fridge{ - pixel_y = -32 - }, -/obj/structure/sign/safety/fridge{ - pixel_x = 32 - }, -/obj/structure/closet/firecloset/full, -/turf/open/floor/prison/kitchen, -/area/adminlevel/ert_station/fax_response_station) -"yP" = ( -/obj/structure/surface/rack, -/obj/item/reagent_container/food/snacks/bigbiteburger{ - pixel_x = -4 - }, -/obj/item/reagent_container/food/snacks/bigbiteburger{ - pixel_x = 3 - }, -/turf/open/floor/prison/greenblue/southwest, -/area/adminlevel/ert_station/fax_response_station) -"zf" = ( -/obj/structure/sign/safety/galley{ - pixel_x = -17 - }, -/turf/open/floor/prison/kitchen, -/area/adminlevel/ert_station/fax_response_station) -"zh" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/prison/red/west, -/area/adminlevel/ert_station/fax_response_station) -"zj" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/toolbox/mechanical{ - pixel_y = -4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/adminlevel/ert_station/fax_response_station) -"zl" = ( -/obj/structure/surface/table/reinforced/cloth, -/obj/item/reagent_container/food/condiment/hotsauce/cholula{ - pixel_y = 28; - pixel_x = 16 - }, -/obj/item/reagent_container/food/condiment/saltshaker{ - pixel_x = 7; - pixel_y = 17 - }, -/obj/item/reagent_container/food/condiment/peppermill{ - pixel_x = 13; - pixel_y = 12 - }, -/obj/item/tool/kitchen/utensil/fork{ - pixel_y = 4; - pixel_x = -3 - }, -/obj/item/tool/kitchen/utensil/knife{ - pixel_y = 4; - pixel_x = 3 - }, -/obj/structure/machinery/light, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"zx" = ( -/obj/structure/surface/table/almayer, -/obj/structure/barricade/handrail/pizza{ - pixel_y = -3 - }, -/obj/item/trash/ceramic_plate{ - pixel_y = 2 - }, -/obj/item/trash/ceramic_plate{ - pixel_y = 4 - }, -/obj/item/trash/ceramic_plate{ - pixel_y = 6 - }, -/obj/item/trash/ceramic_plate{ - pixel_y = 8 - }, -/turf/open/floor/prison/kitchen, -/area/adminlevel/ert_station/fax_response_station) -"zz" = ( -/obj/structure/barricade/handrail/pizza{ - dir = 4; - pixel_y = -3 - }, -/obj/structure/bed/chair/bolted{ - dir = 8; - pixel_x = -7; - buckling_x = -7 - }, -/obj/structure/prop/souto_land/streamer{ - dir = 9 - }, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"zC" = ( -/obj/structure/bed/chair/bolted{ - dir = 4; - pixel_x = 7; - buckling_x = 7 - }, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"zE" = ( -/obj/structure/machinery/door_control/airlock{ - id = "pizza_takeaway"; - name = "Airlock - Inside"; - pixel_x = 28; - pixel_y = 8 - }, -/obj/structure/machinery/door_control/airlock{ - id = "pizza_takeaway_out"; - name = "Airlock - Out"; - pixel_x = 28; - pixel_y = 18 - }, -/turf/open/floor/plating/prison, -/area/adminlevel/ert_station/fax_response_station) -"zH" = ( -/obj/effect/landmark/late_join/responder/wey_yu, -/turf/open/floor/prison/kitchen, -/area/adminlevel/ert_station/fax_response_station) -"zM" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/prison/redcorner/north, -/area/adminlevel/ert_station/fax_response_station) -"zQ" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 4 - }, -/turf/open/floor/prison/red/east, -/area/adminlevel/ert_station/fax_response_station) -"zW" = ( -/turf/open/floor/prison/greenblue/east, -/area/adminlevel/ert_station/fax_response_station) -"Ab" = ( -/obj/structure/machinery/gibber{ - pixel_y = 10 - }, -/obj/structure/surface/table/reinforced, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/cmo, -/area/adminlevel/ert_station/fax_response_station) -"Ac" = ( -/obj/structure/closet/secure_closet/fridge/dry, -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/sign/safety/galley{ - pixel_x = -24 - }, -/turf/open/floor/cmo, -/area/adminlevel/ert_station/fax_response_station) -"Aj" = ( -/obj/structure/barricade/handrail/pizza{ - dir = 8 - }, -/obj/structure/sign/safety/bathunisex{ - pixel_x = 15; - pixel_y = 32 - }, -/turf/open/floor/blueyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"Ao" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/machinery/light{ - pixel_x = 16; - dir = 1 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/prison/kitchen, -/area/adminlevel/ert_station/fax_response_station) -"Au" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 - }, -/turf/open/floor/prison/red/west, -/area/adminlevel/ert_station/fax_response_station) -"Ax" = ( -/obj/structure/surface/table/reinforced/cloth, -/obj/item/reagent_container/food/condiment/hotsauce/franks{ - pixel_y = -3; - pixel_x = 16 - }, -/obj/item/ashtray/glass{ - pixel_x = -4; - pixel_y = -1 - }, -/obj/item/clothing/mask/cigarette, -/obj/item/clothing/mask/cigarette{ - pixel_x = -2; - pixel_y = -2 - }, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"AB" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 4 - }, -/turf/open/floor/cmo, -/area/adminlevel/ert_station/fax_response_station) -"AD" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/airlock/almayer/generic{ - name = "\improper Central Fridge" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer/test_floor4, -/area/adminlevel/ert_station/fax_response_station) -"AH" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/prison/yellow/north, -/area/adminlevel/ert_station/fax_response_station) -"AV" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/blueyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"AW" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out" - }, -/obj/structure/sign/safety/debark_lounge{ - pixel_y = -32 - }, -/obj/structure/sign/safety/landingzone{ - pixel_y = -32; - pixel_x = 15 - }, -/turf/open/floor/prison/yellow, -/area/adminlevel/ert_station/fax_response_station) -"Bu" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/cmo, -/area/adminlevel/ert_station/fax_response_station) -"By" = ( -/obj/structure/machinery/suit_storage_unit/standard_unit{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/structure/sign/safety/suit_storage{ - pixel_x = 32 - }, -/turf/open/floor/almayer/test_floor4, -/area/adminlevel/ert_station/fax_response_station) -"Bz" = ( -/obj/structure/surface/table/reinforced, -/obj/item/trash/plate{ - pixel_y = 2 - }, -/obj/item/trash/plate{ - pixel_y = 4 - }, -/obj/item/trash/plate{ - pixel_y = 6 - }, -/obj/item/trash/plate{ - pixel_y = 8 - }, -/obj/item/trash/plate{ - pixel_y = 10 - }, -/turf/open/floor/prison/kitchen, -/area/adminlevel/ert_station/fax_response_station) -"BC" = ( -/obj/structure/surface/table/reinforced, -/obj/item/pizzabox{ - pixel_y = 5 - }, -/obj/item/pizzabox{ - pixel_y = 8 - }, -/obj/item/pizzabox{ - pixel_y = 11 - }, -/obj/structure/machinery/light, -/turf/open/floor/prison/kitchen, -/area/adminlevel/ert_station/fax_response_station) -"BJ" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/disposalpipe/junction{ - dir = 1; - icon_state = "pipe-j2" - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer/test_floor4, -/area/adminlevel/ert_station/fax_response_station) -"BU" = ( -/obj/structure/bed/chair/bolted{ - dir = 1; - pixel_y = 12; - buckling_y = 12 - }, -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_x = -30 - }, -/turf/open/floor/prison/yellow/west, -/area/adminlevel/ert_station/fax_response_station) -"Ck" = ( -/obj/structure/sink{ - dir = 1; - pixel_y = -10 - }, -/obj/structure/window/reinforced{ - dir = 8; - health = 80 - }, -/obj/structure/machinery/light/small{ - pixel_x = 16 - }, -/turf/open/floor/plating/plating_catwalk, -/area/adminlevel/ert_station/fax_response_station) -"Cp" = ( -/obj/structure/surface/table/reinforced/cloth, -/obj/item/reagent_container/food/drinks/cans/waterbottle{ - pixel_x = -6; - pixel_y = 14 - }, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"Cv" = ( -/obj/structure/closet/secure_closet/freezer/fridge/full, -/obj/item/reagent_container/food/condiment/enzyme, -/obj/item/reagent_container/food/condiment/enzyme, -/obj/item/reagent_container/food/drinks/soymilk, -/obj/item/reagent_container/food/drinks/soymilk, -/obj/item/reagent_container/food/condiment/hotsauce/tabasco, -/obj/item/reagent_container/food/condiment/hotsauce/sriracha, -/obj/item/reagent_container/food/condiment/hotsauce/franks, -/obj/item/reagent_container/food/condiment/hotsauce/cholula, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/prison/greenblue/north, -/area/adminlevel/ert_station/fax_response_station) -"CO" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/prison/kitchen, -/area/adminlevel/ert_station/fax_response_station) -"CP" = ( -/turf/open/floor/almayer_hull, -/area/space) -"CT" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/chem_dispenser/soda{ - density = 0; - pixel_y = 30 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/prison/kitchen, -/area/adminlevel/ert_station/fax_response_station) -"Db" = ( -/obj/structure/barricade/handrail/pizza{ - dir = 4; - pixel_y = -3 - }, -/obj/structure/barricade/handrail/pizza{ - dir = 1; - pixel_y = 12 - }, -/obj/structure/prop/souto_land/streamer{ - dir = 9 - }, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"Dd" = ( -/obj/structure/pipes/vents/pump{ - dir = 1 - }, -/turf/open/floor/prison/red/east, -/area/adminlevel/ert_station/fax_response_station) -"Dx" = ( -/obj/structure/surface/table/reinforced, -/obj/item/reagent_container/food/snacks/sliceable/bread{ - pixel_y = 8 - }, -/obj/item/reagent_container/food/snacks/sliceable/bread{ - pixel_y = 4 - }, -/obj/item/reagent_container/food/snacks/sliceable/bread, -/turf/open/floor/cmo, -/area/adminlevel/ert_station/fax_response_station) -"DF" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/chem_dispenser/soda/beer{ - density = 0; - pixel_y = 31 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/prison/kitchen, -/area/adminlevel/ert_station/fax_response_station) -"DH" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/barricade/handrail/kutjevo{ - layer = 3.01 - }, -/turf/open/space/basic, -/area/space) -"DW" = ( -/obj/structure/pipes/vents/pump, -/turf/open/floor/prison/red/north, -/area/adminlevel/ert_station/fax_response_station) -"Ee" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/obj/structure/barricade/handrail/kutjevo{ - dir = 8; - layer = 3.01 - }, -/turf/open/space/basic, -/area/space) -"Eh" = ( -/obj/structure/prop/souto_land/pole{ - dir = 4; - pixel_y = 9 - }, -/obj/structure/prop/souto_land/streamer{ - dir = 6 - }, -/obj/structure/pipes/standard/manifold/hidden/supply, -/turf/open/floor/prison/red, -/area/adminlevel/ert_station/fax_response_station) -"Ei" = ( -/turf/closed/wall/almayer/outer, -/area/adminlevel/ert_station/fax_response_station) -"Ep" = ( -/obj/structure/machinery/door/poddoor/almayer/open{ - name = "\improper Umbillical Airlock"; - id = "pizza_ert_arrival" - }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic, -/turf/open/floor/almayer/test_floor4, -/area/adminlevel/ert_station/fax_response_station) -"EH" = ( -/obj/structure/machinery/vending/cigarette{ - pixel_y = 18; - layer = 3.01; - density = 0 - }, -/turf/open/floor/prison/yellow/northeast, -/area/adminlevel/ert_station/fax_response_station) -"EK" = ( -/obj/structure/machinery/door/poddoor/almayer/locked{ - icon_state = "almayer_pdoor"; - id = "pizza_takeaway" - }, -/turf/open/floor/almayer/test_floor4, -/area/adminlevel/ert_station/fax_response_station) -"EO" = ( -/obj/structure/machinery/door/poddoor/almayer/open{ - name = "\improper Umbillical Airlock"; - id = "pizza_ert_arrival" - }, -/turf/open/floor/almayer/test_floor4, -/area/adminlevel/ert_station/fax_response_station) -"EZ" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 - }, -/turf/open/floor/prison/kitchen, -/area/adminlevel/ert_station/fax_response_station) -"Fd" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/prison/bright_clean2, -/area/adminlevel/ert_station/fax_response_station) -"Ff" = ( -/obj/structure/surface/table/reinforced/cloth, -/obj/item/trash/plate{ - pixel_y = 10; - pixel_x = 1 - }, -/obj/item/trash/plate{ - pixel_y = -1 - }, -/obj/item/reagent_container/food/snacks/hotdog{ - pixel_y = 13 - }, -/obj/item/reagent_container/food/condiment/coldsauce{ - pixel_y = 11; - pixel_x = -7 - }, -/obj/item/reagent_container/food/snacks/grilledcheese{ - pixel_y = 6; - pixel_x = -1 - }, -/obj/item/reagent_container/food/drinks/coffee{ - pixel_y = 2; - pixel_x = 8 - }, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"Fj" = ( -/obj/structure/closet/crate/freezer, -/obj/item/reagent_container/food/snacks/ricepudding, -/turf/open/floor/prison/floor_marked/southwest, -/area/adminlevel/ert_station/fax_response_station) -"Fp" = ( -/obj/structure/closet/crate/freezer, -/obj/structure/machinery/light/blue, -/obj/item/reagent_container/food/snacks/packaged_burrito, -/obj/item/reagent_container/food/snacks/packaged_burrito, -/obj/item/reagent_container/food/snacks/packaged_burrito, -/obj/item/reagent_container/food/snacks/packaged_hdogs, -/obj/item/reagent_container/food/snacks/packaged_hdogs, -/obj/item/reagent_container/food/snacks/packaged_hdogs, -/obj/item/reagent_container/food/snacks/packaged_burger, -/obj/item/reagent_container/food/snacks/packaged_burger, -/obj/item/reagent_container/food/snacks/packaged_burger, -/turf/open/floor/prison/floor_marked/southwest, -/area/adminlevel/ert_station/fax_response_station) -"Fz" = ( -/obj/structure/surface/table/reinforced, -/obj/item/tool/kitchen/tray{ - pixel_y = 5 - }, -/obj/item/reagent_container/food/snacks/sliceable/pizza/meatpizza{ - pixel_y = 5 - }, -/turf/open/floor/prison/kitchen, -/area/adminlevel/ert_station/fax_response_station) -"FB" = ( -/obj/structure/machinery/light{ - pixel_x = 16 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 - }, -/turf/open/floor/prison/kitchen, -/area/adminlevel/ert_station/fax_response_station) -"FD" = ( -/obj/structure/machinery/door/poddoor/almayer/locked{ - icon_state = "almayer_pdoor"; - id = "pizza_takeaway" - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer/test_floor4, -/area/adminlevel/ert_station/fax_response_station) -"FL" = ( -/turf/closed/shuttle/ert{ - icon_state = "rightengine_1"; - opacity = 0 - }, -/area/adminlevel/ert_station/fax_response_station) -"FS" = ( -/obj/structure/machinery/light, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"FY" = ( -/obj/structure/surface/table/almayer, -/obj/structure/barricade/handrail/pizza{ - dir = 8; - pixel_y = -3 - }, -/obj/structure/barricade/handrail/pizza{ - pixel_y = -3 - }, -/obj/item/reagent_container/food/drinks/cans/cola{ - pixel_y = 6; - pixel_x = -6 - }, -/obj/item/reagent_container/food/drinks/cans/cola{ - pixel_y = 4; - pixel_x = -3 - }, -/obj/item/reagent_container/food/drinks/cans/iced_tea{ - pixel_x = 8; - pixel_y = 10 - }, -/obj/item/reagent_container/food/drinks/cans/iced_tea{ - pixel_x = 11; - pixel_y = 5 - }, -/turf/open/floor/prison/kitchen, -/area/adminlevel/ert_station/fax_response_station) -"Gd" = ( -/obj/structure/prop/souto_land/pole{ - dir = 8; - pixel_y = 9 - }, -/obj/structure/prop/souto_land/streamer{ - dir = 9 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/prison/red, -/area/adminlevel/ert_station/fax_response_station) -"Gh" = ( -/obj/structure/machinery/disposal{ - layer = 2.97 - }, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/structure/sign/poster{ - desc = "Eat an EAT bar! ...Aren't they called MEAT bars?"; - icon_state = "poster7"; - name = "EAT - poster"; - pixel_y = 30 - }, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"Gj" = ( -/obj/structure/barricade/handrail/pizza{ - dir = 8 - }, -/obj/structure/barricade/handrail/pizza{ - pixel_y = -3 - }, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"Gm" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/prison/red, -/area/adminlevel/ert_station/fax_response_station) -"Gn" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/turf/open/space/basic, -/area/space) -"Gp" = ( -/obj/structure/surface/table/reinforced/cloth, -/obj/item/reagent_container/food/snacks/mushroomsoup{ - pixel_y = 6 - }, -/obj/item/tool/kitchen/utensil/spoon{ - pixel_y = 4; - pixel_x = 7 - }, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"Gt" = ( -/obj/structure/machinery/atm{ - pixel_y = 32; - pixel_x = 2 - }, -/turf/open/floor/prison/yellow/northeast, -/area/adminlevel/ert_station/fax_response_station) -"GB" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_x = 30 - }, -/turf/open/floor/prison/yellow/east, -/area/adminlevel/ert_station/fax_response_station) -"GM" = ( -/obj/structure/sign/safety/airlock{ - pixel_y = 32 - }, -/obj/structure/sign/safety/hazard{ - pixel_x = 15; - pixel_y = 32 - }, -/turf/open/space/basic, -/area/space) -"Ha" = ( -/turf/closed/shuttle/ert{ - icon_state = "stan_leftengine" - }, -/area/adminlevel/ert_station/fax_response_station) -"Hd" = ( -/turf/open/floor/prison/yellow/east, -/area/adminlevel/ert_station/fax_response_station) -"Hg" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/turf/open/space, -/area/space) -"HL" = ( -/obj/structure/surface/table/almayer, -/obj/structure/barricade/handrail/pizza{ - pixel_y = -3 - }, -/obj/item/reagent_container/food/drinks/coffeecup{ - pixel_x = -5; - pixel_y = 4 - }, -/obj/item/reagent_container/food/drinks/coffeecup{ - pixel_y = 4; - pixel_x = 5 - }, -/obj/item/reagent_container/food/drinks/coffeecup{ - pixel_y = 2 - }, -/turf/open/floor/prison/kitchen, -/area/adminlevel/ert_station/fax_response_station) -"HQ" = ( -/obj/structure/surface/table/reinforced/cloth, -/obj/item/trash/plate{ - pixel_y = 5 - }, -/obj/item/reagent_container/food/snacks/bigbiteburger{ - pixel_y = 10; - pixel_x = -1 - }, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"Ib" = ( -/obj/structure/pipes/vents/pump{ - dir = 1 - }, -/turf/open/floor/prison/red/west, -/area/adminlevel/ert_station/fax_response_station) -"Iq" = ( -/obj/structure/surface/table/reinforced/cloth, -/obj/item/reagent_container/food/drinks/cans/beer{ - pixel_x = 5; - pixel_y = 13 - }, -/obj/item/trash/ceramic_plate{ - pixel_y = 1 - }, -/obj/item/reagent_container/food/snacks/meatpizzaslice{ - pixel_x = -1; - pixel_y = 3 - }, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"ID" = ( -/turf/closed/wall/rock/red, -/area/space) -"IJ" = ( -/obj/structure/pipes/vents/scrubber{ - dir = 4 - }, -/turf/open/floor/prison/red/west, -/area/adminlevel/ert_station/fax_response_station) -"Jd" = ( -/obj/structure/closet{ - pixel_y = 16; - density = 0 - }, -/turf/open/floor/plating/plating_catwalk, -/area/adminlevel/ert_station/fax_response_station) -"Jl" = ( -/turf/open/floor/prison/red/west, -/area/adminlevel/ert_station/fax_response_station) -"Jm" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E" - }, -/turf/open/floor/prison, -/area/adminlevel/ert_station/fax_response_station) -"Jq" = ( -/obj/structure/closet/secure_closet/fridge/organic/stock, -/turf/open/floor/prison/greenblue, -/area/adminlevel/ert_station/fax_response_station) -"JP" = ( -/obj/structure/surface/table/reinforced, -/obj/item/tool/kitchen/knife/butcher, -/turf/open/floor/cmo, -/area/adminlevel/ert_station/fax_response_station) -"JR" = ( -/obj/structure/bed/sofa/vert/grey/bot, -/turf/open/floor/prison, -/area/adminlevel/ert_station/fax_response_station) -"JU" = ( -/obj/structure/janitorialcart{ - pixel_y = 15 - }, -/obj/item/tool/wet_sign{ - pixel_x = -8; - pixel_y = 6 - }, -/obj/item/tool/wet_sign{ - pixel_x = -3; - pixel_y = 2 - }, -/obj/item/reagent_container/glass/bucket{ - pixel_x = 9 - }, -/turf/open/floor/prison/kitchen, -/area/adminlevel/ert_station/fax_response_station) -"JV" = ( -/obj/structure/barricade/handrail/pizza{ - dir = 1; - pixel_y = 12 - }, -/obj/structure/bed/chair/bolted{ - pixel_y = -1; - buckling_y = -1 - }, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"Kb" = ( -/obj/structure/surface/table/almayer, -/obj/structure/barricade/handrail/pizza{ - dir = 4; - pixel_y = -3 - }, -/obj/item/corncob, -/obj/item/corncob{ - pixel_y = 7 - }, -/turf/open/floor/prison/kitchen, -/area/adminlevel/ert_station/fax_response_station) -"Kc" = ( -/obj/structure/sign/safety/airlock{ - pixel_y = -32 - }, -/obj/structure/sign/safety/hazard{ - pixel_x = 15; - pixel_y = -32 - }, -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/door_control/airlock{ - id = "pizza_takeaway_out"; - name = "Airlock - Out"; - pixel_x = 2; - pixel_y = 18 - }, -/obj/structure/sign/safety/manualopenclose{ - pixel_y = -3; - pixel_x = 7 - }, -/turf/open/floor/almayer_hull, -/area/adminlevel/ert_station/fax_response_station) -"Kd" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer/dark_sterile, -/area/adminlevel/ert_station/fax_response_station) -"Kv" = ( -/obj/structure/surface/table/reinforced, -/obj/structure/sink/kitchen{ - pixel_y = 12 - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/prison/kitchen, -/area/adminlevel/ert_station/fax_response_station) -"KB" = ( -/obj/structure/sign/safety/bathunisex{ - pixel_x = 15; - pixel_y = 32 - }, -/obj/structure/surface/table/almayer, -/obj/structure/machinery/washing_machine{ - pixel_y = 10 - }, -/obj/structure/sign/safety/water{ - pixel_x = -17 - }, -/turf/open/floor/plating/plating_catwalk, -/area/adminlevel/ert_station/fax_response_station) -"KC" = ( -/obj/structure/barricade/handrail/pizza{ - dir = 8; - pixel_y = -3 - }, -/obj/structure/prop/souto_land/streamer{ - dir = 6 - }, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"KY" = ( -/turf/open/floor/prison/blue_plate, -/area/adminlevel/ert_station/fax_response_station) -"La" = ( -/obj/structure/surface/table/almayer, -/obj/structure/barricade/handrail/pizza{ - pixel_y = -3 - }, -/obj/item/reagent_container/food/condiment/hotsauce/franks/macho{ - pixel_y = 11; - pixel_x = -6 - }, -/obj/item/reagent_container/food/condiment/hotsauce/franks{ - pixel_y = 11; - pixel_x = 6 - }, -/obj/item/reagent_container/food/condiment/coldsauce{ - pixel_y = 11 - }, -/obj/item/reagent_container/food/condiment/hotsauce/cholula{ - pixel_y = 6 - }, -/turf/open/floor/prison/kitchen, -/area/adminlevel/ert_station/fax_response_station) -"Lk" = ( -/obj/structure/pipes/vents/scrubber{ - dir = 4 - }, -/turf/open/floor/cmo, -/area/adminlevel/ert_station/fax_response_station) -"Ln" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/computer{ - icon_state = "security_det"; - name = "Shuttle control deck"; - pixel_y = 6 - }, -/obj/structure/machinery/light/small{ - dir = 8; - pixel_x = -11; - pixel_y = 10 - }, -/turf/open/floor/plating/prison, -/area/adminlevel/ert_station/fax_response_station) -"Ly" = ( -/obj/structure/barricade/handrail/pizza{ - dir = 4 - }, -/obj/structure/barricade/handrail/pizza{ - dir = 1; - pixel_y = 12 - }, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"LH" = ( -/obj/structure/bed/chair/bolted{ - dir = 1; - pixel_y = 12; - buckling_y = 12 - }, -/obj/structure/prop/souto_land/pole{ - dir = 8; - pixel_y = 9 - }, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"Mj" = ( -/obj/structure/bed/chair/dropship/pilot{ - dir = 1 - }, -/obj/structure/machinery/light/small{ - dir = 8; - pixel_x = -11; - pixel_y = 10 - }, -/turf/open/floor/plating/prison, -/area/adminlevel/ert_station/fax_response_station) -"Mk" = ( -/obj/structure/machinery/vending/coffee{ - pixel_y = 12 - }, -/obj/structure/barricade/handrail/pizza{ - pixel_y = -3 - }, -/turf/open/floor/prison/bright_clean2, -/area/adminlevel/ert_station/fax_response_station) -"Mt" = ( -/obj/structure/bed/sofa/south/grey/left, -/obj/item/storage/briefcase/stowaway, -/turf/open/floor/prison/yellow/northwest, -/area/adminlevel/ert_station/fax_response_station) -"Mz" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/turf/open/space, -/area/space) -"MB" = ( -/obj/structure/surface/table/reinforced, -/obj/item/pizzabox/meat, -/obj/item/tool/kitchen/pizzacutter, -/turf/open/floor/cmo, -/area/adminlevel/ert_station/fax_response_station) -"MK" = ( -/obj/structure/surface/table/almayer, -/obj/structure/barricade/handrail/pizza{ - dir = 8; - pixel_y = -3 - }, -/obj/item/reagent_container/food/drinks/bottle/wine{ - pixel_y = 7; - pixel_x = -6 - }, -/obj/item/reagent_container/food/drinks/bottle/vermouth{ - pixel_y = 5; - pixel_x = -2 - }, -/obj/item/reagent_container/food/drinks/bottle/whiskey{ - pixel_x = -4 - }, -/turf/open/floor/prison/kitchen, -/area/adminlevel/ert_station/fax_response_station) -"MS" = ( -/obj/structure/machinery/shower{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8; - health = 80 - }, -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, -/obj/structure/machinery/light/small{ - pixel_x = 16 - }, -/turf/open/floor/plating/plating_catwalk, -/area/adminlevel/ert_station/fax_response_station) -"MT" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S"; - pixel_y = -1 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer/dark_sterile, -/area/adminlevel/ert_station/fax_response_station) -"MX" = ( -/turf/open/floor/prison/red/northwest, -/area/adminlevel/ert_station/fax_response_station) -"Nb" = ( -/obj/item/reagent_container/food/condiment/hotsauce/franks/macho{ - pixel_y = 18; - pixel_x = -6 - }, -/obj/item/reagent_container/food/condiment/hotsauce/franks{ - pixel_y = 18; - pixel_x = 6 - }, -/obj/item/reagent_container/food/condiment/hotsauce/cholula{ - pixel_y = 16 - }, -/obj/structure/surface/table/almayer, -/obj/item/reagent_container/food/condiment/coldsauce{ - pixel_y = 13; - pixel_x = 8 - }, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"Nl" = ( -/turf/open/floor/prison, -/area/adminlevel/ert_station/fax_response_station) -"No" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/turf/open/floor/prison, -/area/adminlevel/ert_station/fax_response_station) -"Nr" = ( -/obj/structure/machinery/vending/cola{ - pixel_y = 12 - }, -/obj/structure/sign/safety/coffee{ - pixel_y = 32; - pixel_x = -13 - }, -/turf/open/floor/prison/bright_clean2, -/area/adminlevel/ert_station/fax_response_station) -"Ny" = ( -/obj/structure/sink{ - dir = 1; - pixel_y = -10 - }, -/turf/open/floor/plating/plating_catwalk, -/area/adminlevel/ert_station/fax_response_station) -"NG" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer/test_floor4, -/area/adminlevel/ert_station/fax_response_station) -"NH" = ( -/obj/structure/bed/sofa/vert/grey/top, -/turf/open/floor/prison, -/area/adminlevel/ert_station/fax_response_station) -"NJ" = ( -/turf/closed/shuttle/ert{ - icon_state = "stan20" - }, -/area/adminlevel/ert_station/fax_response_station) -"NN" = ( -/obj/structure/closet/secure_closet/fridge/groceries/stock, -/obj/structure/machinery/light/small/blue{ - dir = 1; - pixel_y = 20 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 - }, -/turf/open/floor/prison/greenblue/northwest, -/area/adminlevel/ert_station/fax_response_station) -"NP" = ( -/obj/structure/sink/kitchen{ - pixel_x = 11; - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/sign/safety/water{ - pixel_x = 38 - }, -/turf/open/floor/cmo, -/area/adminlevel/ert_station/fax_response_station) -"NT" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/turf/open/space, -/area/space) -"NV" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/machinery/door/airlock/almayer/generic{ - name = "\improper Showers & Bathroom"; - dir = 1 - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer/test_floor4, -/area/adminlevel/ert_station/fax_response_station) -"Og" = ( -/obj/structure/surface/table/reinforced/cloth, -/obj/item/reagent_container/food/snacks/sliceable/pizza/mushroompizza{ - pixel_y = -2; - pixel_x = -16 - }, -/obj/item/trash/plate{ - pixel_y = 8; - pixel_x = 3 - }, -/obj/item/reagent_container/food/snacks/meatpizzaslice{ - pixel_y = 8; - pixel_x = -1 - }, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"Oh" = ( -/obj/structure/prop/souto_land/streamer{ - pixel_y = 9; - pixel_x = 1 - }, -/turf/open/floor/prison/red, -/area/adminlevel/ert_station/fax_response_station) -"OE" = ( -/obj/structure/prop/souto_land/streamer{ - pixel_y = 9; - pixel_x = -1 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/prison/red, -/area/adminlevel/ert_station/fax_response_station) -"OG" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" - }, -/obj/structure/lattice, -/turf/open/space, -/area/space) -"OJ" = ( -/turf/open/floor/solarpanel, -/area/space) -"OK" = ( -/obj/structure/machinery/vending/cigarette{ - pixel_y = 3; - layer = 4.15 - }, -/obj/structure/barricade/handrail/pizza{ - dir = 8 - }, -/turf/open/floor/prison/bright_clean2, -/area/adminlevel/ert_station/fax_response_station) -"OQ" = ( -/obj/structure/barricade/handrail/pizza{ - dir = 1; - pixel_y = 12 - }, -/obj/structure/barricade/handrail/pizza{ - dir = 8; - pixel_y = 13 - }, -/obj/structure/barricade/handrail/pizza{ - dir = 8 - }, -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_27"; - pixel_y = 13; - pixel_x = -2; - layer = 4.11 - }, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"OS" = ( -/turf/open/floor/prison/red/east, -/area/adminlevel/ert_station/fax_response_station) -"Pa" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/cmo, -/area/adminlevel/ert_station/fax_response_station) -"Pi" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 - }, -/turf/open/floor/prison/red/north, -/area/adminlevel/ert_station/fax_response_station) -"Pl" = ( -/obj/structure/barricade/handrail/pizza{ - dir = 1; - pixel_y = 12 - }, -/obj/structure/reagent_dispensers/water_cooler/stacks{ - density = 0; - pixel_x = -8; - pixel_y = 15; - layer = 4.11 - }, -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_17"; - pixel_x = -8; - pixel_y = 2; - layer = 4.12 - }, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"Pn" = ( -/obj/structure/surface/table/reinforced, -/obj/item/clothing/suit/chef/classic, -/obj/item/clothing/gloves/latex, -/obj/item/clothing/suit/chef/classic, -/turf/open/floor/prison/kitchen, -/area/adminlevel/ert_station/fax_response_station) -"Pq" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/lattice, -/turf/open/space/basic, -/area/space) -"Ps" = ( -/obj/item/reagent_container/glass/bucket/janibucket{ - pixel_x = -5; - pixel_y = 10 - }, -/obj/item/tool/mop{ - pixel_x = -2; - pixel_y = 8 - }, -/turf/open/floor/prison/kitchen, -/area/adminlevel/ert_station/fax_response_station) -"Py" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" - }, -/turf/open/space, -/area/space) -"PF" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/turf/open/space/basic, -/area/space) -"PH" = ( -/obj/structure/surface/table/reinforced/cloth, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"PL" = ( -/obj/structure/sign/safety/airlock{ - pixel_y = -32 - }, -/obj/structure/sign/safety/hazard{ - pixel_x = 15; - pixel_y = -32 - }, -/turf/open/floor/almayer_hull, -/area/adminlevel/ert_station/fax_response_station) -"Qe" = ( -/obj/structure/pipes/vents/scrubber{ - dir = 1 - }, -/turf/open/floor/prison/kitchen, -/area/adminlevel/ert_station/fax_response_station) -"QN" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 - }, -/turf/open/floor/almayer/dark_sterile, -/area/adminlevel/ert_station/fax_response_station) -"Ra" = ( -/obj/structure/surface/table/reinforced/cloth, -/obj/item/trash/plate{ - pixel_y = 10 - }, -/obj/item/reagent_container/food/snacks/vegetablepizzaslice{ - pixel_y = 10; - pixel_x = -2 - }, -/obj/item/reagent_container/food/drinks/cans/boda{ - pixel_y = 16; - pixel_x = -11; - layer = 3.03 - }, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"Rf" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer/test_floor4, -/area/adminlevel/ert_station/fax_response_station) -"Rh" = ( -/obj/structure/window/framed/almayer/hull, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/turf/open/floor/plating, -/area/adminlevel/ert_station/fax_response_station) -"RC" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/turf/open/space/basic, -/area/space) -"RG" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/obj/structure/platform/kutjevo/smooth, -/turf/open/space/basic, -/area/space) -"RN" = ( -/obj/structure/barricade/handrail/pizza{ - dir = 1; - pixel_y = 12; - layer = 4.11 - }, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"RP" = ( -/obj/structure/barricade/handrail/pizza{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 - }, -/turf/open/floor/blueyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"RV" = ( -/obj/item/clothing/suit/chef/classic, -/obj/item/clothing/gloves/latex, -/obj/item/clothing/head/chefhat, -/obj/structure/surface/table/reinforced, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/cmo, -/area/adminlevel/ert_station/fax_response_station) -"Se" = ( -/obj/structure/bed/chair/bolted{ - dir = 1; - pixel_y = 12; - buckling_y = 12 - }, -/obj/structure/prop/souto_land/streamer{ - pixel_y = 9 - }, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"Sg" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" - }, -/turf/open/space, -/area/space) -"So" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/prison/red/north, -/area/adminlevel/ert_station/fax_response_station) -"Sp" = ( -/obj/structure/barricade/handrail/pizza{ - dir = 4 - }, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"Sq" = ( -/obj/structure/kitchenspike, -/obj/item/reagent_container/food/snacks/meat{ - pixel_y = -5 - }, -/obj/item/reagent_container/food/snacks/meat{ - pixel_y = 2 - }, -/obj/effect/decal/cleanable/blood, -/turf/open/floor/prison/greenblue, -/area/adminlevel/ert_station/fax_response_station) -"Sr" = ( -/obj/structure/surface/table/reinforced/cloth, -/obj/item/reagent_container/food/drinks/cans/beer{ - pixel_x = -13; - pixel_y = -6 - }, -/obj/item/tool/kitchen/utensil/fork{ - pixel_y = 1; - pixel_x = 5 - }, -/obj/item/tool/kitchen/utensil/knife{ - pixel_y = 3; - pixel_x = 9 - }, -/obj/item/reagent_container/food/snacks/meatsteak{ - pixel_y = 5; - pixel_x = 1 - }, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"Sw" = ( -/obj/effect/landmark/late_join/responder/uscm, -/turf/open/floor/prison/kitchen, -/area/adminlevel/ert_station/fax_response_station) -"Sz" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/prison/bright_clean2, -/area/adminlevel/ert_station/fax_response_station) -"SL" = ( -/obj/structure/surface/table/almayer, -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_21"; - pixel_y = 28; - pixel_x = 3 - }, -/obj/item/reagent_container/food/drinks/cans/souto/diet/lime{ - pixel_y = 15; - pixel_x = -8 - }, -/turf/open/floor/prison/yellow/west, -/area/adminlevel/ert_station/fax_response_station) -"ST" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/sign/poster/ad{ - icon_state = "poster41"; - pixel_y = 32 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/prison/kitchen, -/area/adminlevel/ert_station/fax_response_station) -"SV" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/airlock/almayer/generic{ - name = "\improper Showers" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer/test_floor4, -/area/adminlevel/ert_station/fax_response_station) -"Te" = ( -/obj/structure/surface/table/reinforced/cloth, -/obj/item/reagent_container/food/condiment/hotsauce/cholula{ - pixel_y = 28; - pixel_x = 16 - }, -/obj/item/tool/kitchen/utensil/pknife{ - pixel_x = 13; - pixel_y = 1 - }, -/obj/item/tool/kitchen/utensil/pfork{ - pixel_x = -5; - pixel_y = 5 - }, -/obj/item/reagent_container/food/snacks/chocolatecakeslice{ - pixel_y = 2; - pixel_x = 2 - }, -/obj/item/reagent_container/food/drinks/coffee{ - pixel_y = 13; - pixel_x = 5 - }, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"Tu" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 - }, -/turf/open/floor/prison/kitchen, -/area/adminlevel/ert_station/fax_response_station) -"TC" = ( -/turf/open/floor/prison/yellowcorner, -/area/adminlevel/ert_station/fax_response_station) -"TD" = ( -/turf/open/floor/prison/bright_clean2, -/area/adminlevel/ert_station/fax_response_station) -"TE" = ( -/turf/open/mars_dirt/mars_cave_3, -/area/space) -"TH" = ( -/obj/structure/surface/table/almayer, -/obj/structure/barricade/handrail/pizza{ - pixel_y = -3 - }, -/obj/item/storage/box/drinkingglasses{ - layer = 2.97; - pixel_x = 14 - }, -/obj/item/reagent_container/food/drinks/bottle/orangejuice{ - layer = 2.97 - }, -/turf/open/floor/prison/kitchen, -/area/adminlevel/ert_station/fax_response_station) -"TK" = ( -/turf/closed/shuttle/ert, -/area/adminlevel/ert_station/fax_response_station) -"TQ" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - 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_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_y = -1 - }, -/obj/structure/pipes/standard/manifold/fourway/hidden/supply, -/turf/open/floor/cmo, -/area/adminlevel/ert_station/fax_response_station) -"TY" = ( -/obj/structure/bed/chair{ - can_buckle = 0; - dir = 4 - }, -/obj/structure/bed/chair{ - can_buckle = 0; - dir = 4; - pixel_x = 1; - pixel_y = 3 - }, -/obj/structure/bed/chair{ - can_buckle = 0; - dir = 4; - pixel_x = 2; - pixel_y = 6 - }, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"Uu" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/power/apc/antag{ - dir = 1 - }, -/turf/open/floor/prison/kitchen, -/area/adminlevel/ert_station/fax_response_station) -"Ux" = ( -/obj/structure/barricade/handrail/pizza{ - dir = 1; - pixel_y = 12 - }, -/obj/structure/bed/chair/bolted{ - pixel_y = -1; - buckling_y = -1 - }, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"UB" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 - }, -/turf/open/floor/cmo, -/area/adminlevel/ert_station/fax_response_station) -"Vj" = ( -/obj/structure/closet/secure_closet/fridge/dry/stock, -/turf/open/floor/prison/greenblue/northeast, -/area/adminlevel/ert_station/fax_response_station) -"Vm" = ( -/obj/structure/surface/table/reinforced, -/obj/item/tool/kitchen/tray{ - pixel_y = 2 - }, -/obj/item/reagent_container/food/snacks/sliceable/pizza/mushroompizza{ - pixel_y = 1 - }, -/turf/open/floor/prison/greenbluecorner, -/area/adminlevel/ert_station/fax_response_station) -"Vs" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/structure/machinery/light{ - pixel_x = 16; - dir = 1 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/turf/open/floor/prison/red/west, -/area/adminlevel/ert_station/fax_response_station) -"Vt" = ( -/turf/closed/shuttle/ert{ - icon_state = "stan25" - }, -/area/adminlevel/ert_station/fax_response_station) -"Vv" = ( -/obj/docking_port/stationary/emergency_response/idle_port4, -/turf/open/floor/plating, -/area/adminlevel/ert_station/fax_response_station) -"Vx" = ( -/obj/structure/lattice, -/turf/open/space/basic, -/area/space) -"VD" = ( -/obj/structure/barricade/handrail/pizza{ - dir = 1; - pixel_y = 12 - }, -/obj/structure/reagent_dispensers/water_cooler/stacks{ - density = 0; - pixel_x = -3; - pixel_y = 15; - layer = 4.03 - }, -/obj/structure/surface/table/almayer{ - layer = 4.02 - }, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"VK" = ( -/turf/open/floor/prison/yellow/southwest, -/area/adminlevel/ert_station/fax_response_station) -"VN" = ( -/obj/structure/bed/chair/bolted{ - dir = 8; - pixel_x = -7; - buckling_x = -7 - }, -/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 = 6; - pixel_y = 30; - serial_number = 12 - }, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"VQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/prison/kitchen, -/area/adminlevel/ert_station/fax_response_station) -"VS" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/donut_box{ - pixel_y = -8 - }, -/turf/open/floor/prison, -/area/adminlevel/ert_station/fax_response_station) -"VV" = ( -/obj/effect/landmark/late_join/responder/twe, -/turf/open/floor/prison/kitchen, -/area/adminlevel/ert_station/fax_response_station) -"VX" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S"; - pixel_y = -1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/cmo, -/area/adminlevel/ert_station/fax_response_station) -"Wb" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/machinery/door/poddoor/almayer/open{ - name = "\improper Umbillical Airlock"; - id = "pizza_ert_arrival" - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer/test_floor4, -/area/adminlevel/ert_station/fax_response_station) -"WL" = ( -/obj/structure/window/framed/almayer/hull, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/turf/open/floor/plating, -/area/adminlevel/ert_station/fax_response_station) -"WP" = ( -/turf/open/floor/prison/kitchen, -/area/adminlevel/ert_station/fax_response_station) -"WS" = ( -/obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ - dir = 1; - req_one_access = null - }, -/turf/open/floor/plating/prison, -/area/adminlevel/ert_station/fax_response_station) -"WZ" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper Kitchen and Cleaning" - }, -/turf/open/floor/almayer/test_floor4, -/area/adminlevel/ert_station/fax_response_station) -"Xa" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out" - }, -/obj/structure/sign/safety/debark_lounge{ - pixel_y = 32 - }, -/obj/structure/sign/safety/landingzone{ - pixel_y = 32; - pixel_x = 15 - }, -/turf/open/floor/prison/yellow/north, -/area/adminlevel/ert_station/fax_response_station) -"Xg" = ( -/obj/structure/prop/souto_land/streamer{ - pixel_y = 9; - pixel_x = 1 - }, -/obj/structure/pipes/standard/manifold/hidden/supply, -/turf/open/floor/prison/red, -/area/adminlevel/ert_station/fax_response_station) -"Xj" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E" - }, -/obj/structure/sign/safety/airlock{ - pixel_y = 32 - }, -/obj/structure/sign/safety/hazard{ - pixel_x = 15; - pixel_y = 32 - }, -/obj/structure/closet/crate/trashcart, -/obj/item/storage/bag/trash, -/obj/item/storage/bag/trash{ - pixel_x = -6; - pixel_y = 5 - }, -/turf/open/floor/prison/kitchen, -/area/adminlevel/ert_station/fax_response_station) -"Xn" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, -/turf/open/space, -/area/space) -"Xq" = ( -/obj/structure/surface/rack, -/obj/structure/machinery/light/small/blue{ - pixel_x = 16 - }, -/obj/item/reagent_container/food/snacks/bigbiteburger{ - pixel_x = -2 - }, -/obj/item/reagent_container/food/snacks/bigbiteburger{ - pixel_x = 4 - }, -/turf/open/floor/prison/greenblue, -/area/adminlevel/ert_station/fax_response_station) -"Xr" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 1 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/prison/kitchen, -/area/adminlevel/ert_station/fax_response_station) -"Xw" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/turf/open/space/basic, -/area/space) -"Xx" = ( -/obj/structure/surface/table/reinforced, -/obj/item/reagent_container/food/snacks/sliceable/flatdough, -/obj/item/tool/kitchen/rollingpin, -/turf/open/floor/cmo, -/area/adminlevel/ert_station/fax_response_station) -"XB" = ( -/obj/structure/machinery/shower{ - pixel_y = 16 - }, -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, -/obj/structure/window/reinforced{ - dir = 8; - health = 80 - }, -/turf/open/floor/plating/plating_catwalk, -/area/adminlevel/ert_station/fax_response_station) -"XD" = ( -/obj/structure/pipes/vents/pump{ - dir = 8 - }, -/turf/open/floor/prison/red/northeast, -/area/adminlevel/ert_station/fax_response_station) -"XV" = ( -/obj/structure/prop/souto_land/streamer{ - dir = 4; - pixel_y = 9 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/prison/red, -/area/adminlevel/ert_station/fax_response_station) -"XZ" = ( -/obj/structure/barricade/handrail/pizza{ - pixel_y = -3 - }, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"Ya" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "STAFF ONLY" - }, -/turf/open/floor/almayer/test_floor4, -/area/adminlevel/ert_station/fax_response_station) -"Yf" = ( -/obj/structure/surface/table/reinforced, -/obj/item/reagent_container/food/condiment/hotsauce/franks/macho{ - pixel_y = 18; - pixel_x = -6 - }, -/obj/item/reagent_container/food/condiment/hotsauce/franks{ - pixel_y = 18; - pixel_x = 6 - }, -/obj/item/reagent_container/food/condiment/hotsauce/cholula{ - pixel_y = 16 - }, -/obj/item/reagent_container/food/drinks/drinkingglass{ - pixel_y = 1; - pixel_x = -4 - }, -/obj/item/reagent_container/food/drinks/drinkingglass{ - pixel_y = 3; - pixel_x = 6 - }, -/turf/open/floor/cmo, -/area/adminlevel/ert_station/fax_response_station) -"Yj" = ( -/obj/structure/surface/table/reinforced/cloth, -/obj/item/tool/kitchen/utensil/pknife{ - pixel_x = -6 - }, -/obj/item/tool/kitchen/utensil/pfork{ - pixel_y = 3; - pixel_x = -3 - }, -/obj/item/reagent_container/food/drinks/cans/souto/blue{ - pixel_x = 5; - pixel_y = 10 - }, -/obj/item/tool/kitchen/tray{ - pixel_y = -2; - pixel_x = 16 - }, -/turf/open/floor/redyellowfull, -/area/adminlevel/ert_station/fax_response_station) -"Ym" = ( -/obj/structure/sign/safety/nonpress_0g{ - pixel_x = -16 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating/prison, -/area/adminlevel/ert_station/fax_response_station) -"Yo" = ( -/turf/open/space, -/area/space) -"Yu" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/obj/structure/lattice, -/turf/open/space/basic, -/area/space) -"Yv" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer/dark_sterile, -/area/adminlevel/ert_station/fax_response_station) -"Yw" = ( -/turf/closed/shuttle/ert{ - icon_state = "stan27" - }, -/area/adminlevel/ert_station/fax_response_station) -"Yy" = ( -/turf/open/space/basic, -/area/space) -"YD" = ( -/obj/structure/surface/table/reinforced, -/obj/item/tool/kitchen/tray{ - pixel_y = 6 - }, -/obj/item/reagent_container/food/snacks/sliceable/pizza/meatpizza{ - pixel_y = 5 - }, -/turf/open/floor/prison/greenblue/southeast, -/area/adminlevel/ert_station/fax_response_station) -"YF" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/obj/structure/lattice, -/turf/open/space/basic, -/area/space) -"YL" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/machinery/door/poddoor/almayer/open{ - name = "\improper Umbillical Airlock"; - id = "pizza_ert_arrival" - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper Galaxy Pizza!" - }, -/turf/open/floor/almayer/test_floor4, -/area/adminlevel/ert_station/fax_response_station) -"YM" = ( -/obj/structure/prop/invuln{ - desc = "An inflated membrane. This one is puncture proof. Wow!"; - icon = 'icons/obj/items/inflatable.dmi'; - icon_state = "wall"; - name = "Docking Umbilical" - }, -/obj/structure/blocker/invisible_wall, -/obj/structure/sign/safety/airlock{ - pixel_y = -32 - }, -/obj/structure/sign/safety/hazard{ - pixel_x = 15; - pixel_y = -32 - }, -/turf/open/floor/almayer_hull, -/area/adminlevel/ert_station/fax_response_station) -"YO" = ( -/turf/closed/wall/almayer, -/area/adminlevel/ert_station/fax_response_station) -"ZD" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/machinery/door/poddoor/almayer/open{ - name = "\improper Umbillical Airlock"; - id = "pizza_ert_arrival" - }, -/turf/open/floor/almayer/test_floor4, -/area/adminlevel/ert_station/fax_response_station) -"ZM" = ( -/obj/structure/closet/secure_closet/freezer/fridge/full, -/obj/item/reagent_container/food/condiment/enzyme, -/obj/item/reagent_container/food/drinks/soymilk, -/obj/item/reagent_container/food/drinks/soymilk, -/obj/item/reagent_container/food/condiment/hotsauce/tabasco, -/obj/item/reagent_container/food/condiment/hotsauce/sriracha, -/obj/item/reagent_container/food/condiment/hotsauce/franks, -/obj/item/reagent_container/food/condiment/hotsauce/cholula, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/prison/greenblue/north, -/area/adminlevel/ert_station/fax_response_station) -"ZR" = ( -/obj/structure/pipes/vents/pump{ - dir = 4 - }, -/turf/open/floor/cmo, -/area/adminlevel/ert_station/fax_response_station) -"ZV" = ( -/obj/structure/bed/sofa/vert/grey, -/turf/open/floor/prison, -/area/adminlevel/ert_station/fax_response_station) -"ZX" = ( -/obj/structure/surface/table/reinforced, -/obj/structure/sign/poster/ad{ - icon_state = "poster12"; - pixel_y = 32 - }, -/obj/item/tool/kitchen/tray{ - pixel_y = 6 - }, -/obj/item/tool/kitchen/tray{ - pixel_y = 9 - }, -/obj/item/tool/kitchen/tray{ - pixel_y = 12 - }, -/turf/open/floor/prison/kitchen, +/turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) (1,1,1) = {" @@ -4166,8 +561,1071 @@ Yy Yy Yy Yy -"} -(2,1,1) = {" +"} +(2,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(3,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(4,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(5,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(6,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(7,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(8,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(9,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(10,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(11,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(12,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(13,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Ei +Ei +Ei +Ei +Ei +Ei +Ei +Ei +Ei +Ei +Ei +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(14,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Ei +YR +CT +rV +HL +Ei +nB +CT +YO +dc +Ei +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(15,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Ei +EI +gu +gu +gu +Pn +Ba +gu +gu +gu +Ei +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(16,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Ei +gu +gu +gu +gu +Pn +gu +gu +gu +gu +Ei +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(17,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Ei +UB +ST +gu +NP +Pn +ov +ST +gu +tq +Ei +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(18,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Ei +Ab +bT +Bp +sx +Ei +Ab +bT +Bp +sx +Ei +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(19,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Ei +Ei +Ei +Ei +Ei +Ei +Ei +Ei +Ei +Ei +Ei +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(20,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(21,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(22,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(23,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +BC +BC +BC +BC +BC +BC +Yy +Yy +Yy +wz +wz +wz +wz +wz +wz +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(24,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +BC +YR +CT +xb +HL +BC +Yy +Yy +Yy +wz +YR +CT +VV +HL +wz +Yy +Yy +Yy +Yy +Yy Yy Yy Yy @@ -4184,17 +1642,35 @@ Yy Yy Yy Yy +"} +(25,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy Yy Yy Yy -Yo +BC +Ba +gu +gu +gu +BC Yy Yy Yy +wz +Ba +gu +gu +gu +wz Yy Yy Yy -Yo Yy Yy Yy @@ -4214,7 +1690,7 @@ Yy Yy Yy "} -(3,1,1) = {" +(26,1,1) = {" Yy Yy Yy @@ -4224,21 +1700,21 @@ Yy Yy Yy Yy +BC +FD +ST +gu +FB +BC +Yy Yy Yy -yg -qq -qq -qX -yg -uj -qq -qq -NT -yg -qq -qq -qX +wz +Wp +ST +gu +am +wz Yy Yy Yy @@ -4261,7 +1737,9 @@ Yy Yy Yy "} -(4,1,1) = {" +(27,1,1) = {" +Yy +Yy Yy Yy Yy @@ -4269,28 +1747,26 @@ Yy Yy Yy Yy +BC +EK +im +Bp +sx +BC +Yy +Yy Yy +wz +id +Vs +Bp +sx +wz Yy Yy -yg -RG -OJ -OJ -Sg -eI -OJ -OJ -OJ -Sg -wb -OJ -OJ -Py -NT Yy Yy Yy -ID Yy Yy Yy @@ -4308,37 +1784,37 @@ Yy Yy Yy "} -(5,1,1) = {" +(28,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy Yy Yy +BC +BC +BC +BC +BC +BC +Yy +Yy +Yy +wz +wz +wz +wz +wz +wz +Yy Yy Yy Yy Yy -ID -ID Yy -yg -Xw -OJ -OJ -OJ -tT -Xw -OJ -OJ -OJ -Gn -Xw -OJ -OJ -OJ -OG -Vx -ID -ID -ID -ID Yy Yy Yy @@ -4355,38 +1831,19 @@ Yy Yy Yy "} -(6,1,1) = {" +(29,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy Yy Yy Yy Yy Yy -ID -ID -ID -ID -eI -OJ -OJ -OJ -oy -CP -CP -OJ -OJ -OJ -CP -CP -oy -OJ -OJ -tT -rk -Vx -ID -ID -ID -ID Yy Yy Yy @@ -4401,40 +1858,12 @@ Yy Yy Yy Yy -"} -(7,1,1) = {" Yy Yy Yy Yy -ID -ID -ID -ID -Vx -Pq -OJ -OJ -oy -CP -fH -fb -OJ -oy -OJ -ja -Mz -CP -oy -OJ -OJ -oX Yy Yy -ID -ID -ID -ID Yy Yy Yy @@ -4449,39 +1878,18 @@ Yy Yy Yy "} -(8,1,1) = {" +(30,1,1) = {" +Yy +Yy +Yy +Yy +Yy Yy Yy Yy -ID -ID -ID -ID -Vx Yy -RC -PF -xe -CP -lx -Xn -ID -ID -ID -ID -ID -ha -xe -CP -OJ -OJ -oX Yy Yy -Vx -ID -ID -ID Yy Yy Yy @@ -4495,41 +1903,15 @@ Yy Yy Yy Yy -"} -(9,1,1) = {" Yy Yy Yy -ID -ID -ID Yy -Vx Yy Yy Yy -eI -CP -ID -ID -ID -ID -ID -ID -ID -ID -eI -CP -fH -Hg -fO Yy -Vx -Vx Yy -ID -ID -ID Yy Yy Yy @@ -4543,41 +1925,13 @@ Yy Yy Yy "} -(10,1,1) = {" +(31,1,1) = {" Yy Yy Yy -ID -ID -Vx -Vx -Vx Yy Yy Yy -ID -ID -ID -ID -ID -ID -ID -ID -ID -Ei -Ei -WL -WL -WL -uo -Ei -Ei -Vx -Vx -Vx -ID -ID -ID Yy Yy Yy @@ -4589,42 +1943,14 @@ Yy Yy Yy Yy -"} -(11,1,1) = {" Yy Yy Yy Yy -ID Yy Yy -Vx -yg -qq -ID -ID -ID -ID -ID -ID -ID -ID -ID -Ei -Ei -hX -Ff -rA -uN -Pl -TY -Ei -Ei -Vx Yy Yy -ID -ID Yy Yy Yy @@ -4636,40 +1962,17 @@ Yy Yy Yy Yy -"} -(12,1,1) = {" Yy Yy Yy Yy -Vx Yy Yy -wD -Yu -jH -ID -Ei -Ei -Ei -Ei -Ei -Ei -Ei -Ei -Ei -Gh -Ly -Sp -uN -Sp -RN -jx -FS -Ei Yy Yy Yy +"} +(32,1,1) = {" Yy Yy Yy @@ -4679,41 +1982,26 @@ Yy Yy Yy Yy +jh +jh +jh +jh +jh +jh Yy Yy Yy +xc +xc +xc +xc +xc +xc Yy -"} -(13,1,1) = {" Yy Yy Yy -Vx -Vx Yy -yg -Yu -jH -pD -Ei -Ei -nK -RV -Xx -ef -wm -qy -YO -YO -vA -ug -Au -vr -yr -uN -wu -ly -Rh Yy Yy Yy @@ -4731,1023 +2019,253 @@ Yy Yy Yy "} -(14,1,1) = {" +(33,1,1) = {" Yy Yy Yy -Vx -wD -qq -Xw -jH -TE -TE -Ei -Ac -nB -nB -nB -nB -nB -nB -eD -YO -dc -zQ -oU -vi -Gm -uN -ec -xh -Rh Yy Yy Yy Yy -Ei -uo -uo -uo -Ei -uo -uo -uo -Ei +Yy +Yy +jh +YR +CT +tM +HL +jh +Yy +Yy +Yy +xc +YR +CT +XZ +HL +xc +Yy +Yy +Yy +Yy Yy Yy Yy -"} -(15,1,1) = {" Yy Yy Yy -yg -Yu -pD -pD -TE -pD -qt -Rh -qv -nB -ZR -MB -cr -Pn -nB -nB -jy -tq -MK -FY -wz -Gm -hb -pS -pS -Rh Yy Yy Yy -Ei -Ei -Mt -nl -SL -BU -fj -nl -sk -Ei -Ei Yy Yy -"} -(16,1,1) = {" Yy Yy Yy -eI -pD -TE -pD -sB -TE -TE -Rh -Dx -nB -jo -np -JP -aA -Lk -nB -uY -tq -Sw -TH -wz -uz -cO -KC -mt -Rh Yy Yy -Ei -Ei -pA -fE -VS -rK -an -Nl -cL -wo -VK -Ei -Ei Yy "} -(17,1,1) = {" +(34,1,1) = {" Yy Yy Yy -eI -sB -TE -TE -sB -TE -pD -Rh -Yf -UB -AB -Pa -NP -Pa -ov -nB -jf -tq -WP -La -wz -nU -uN -Ax -tC -Rh Yy Yy -Ei -Ei -Xa -Jm -Jm -Jm -Jm -Jm -Jm -Jm -aS -Ei -Ei Yy -"} -(18,1,1) = {" Yy Yy Yy -eI -NJ -TK -TK -Ha -lg -sB -Ei -sJ -jo -nB -ae -YO -uD -Ab -bT -YO -Ao -nz -lv -wz -OE -uN -HQ -fN -Ei +jh +Ba +gu +gu +gu +jh +Yy +Yy +Yy +xc +Ba +gu +gu +gu +xc +Yy +Yy +Yy +Yy Yy Yy Yy -uo -AH -Vv -fu -fu -fu -fu -fu -fu -gU -uo Yy Yy -"} -(19,1,1) = {" Yy Yy Yy -eI -Yw -Ln -Mj -WS -TE -eW -Ei -YO -Rf -kz -YO -YO -YO -YO -YO -YO -Uu -WP -nA -sa -aP -Db -zz -ys -Ei -ah -bd -YM -Ei -cK -fu -fu -fu -fu -fu -fu -fu -lJ -Ei -GM Yy -"} -(20,1,1) = {" Yy Yy Yy -eI -Vt -nf -nf -qh -FL -TE -uo -Ps -fg -WP -zf -WZ -TD -Fd -lN -Ya -bB -zH -lE -wz -Gm -Jl -Jl -Jl -tH -IJ -Jl -Jl -Ep -AH -fu -fu -fu -fu -fu -fu -fu -gU -la Yy Yy -"} -(21,1,1) = {" Yy Yy Yy -eI -sB -sB -TE -eW -TE -pD -uo -JU -Tu -CO -CO -NG -mP -ok -Sz -BJ -vX -WP -yE -wz -hc -ir -ir -ir -Wb -zQ -ir -Dd -EO -AH -fu -fu -fu -fu -fu -fu -fu -gU -sW +"} +(35,1,1) = {" Yy Yy -"} -(22,1,1) = {" Yy Yy Yy -eI -sB -sB -eW -TE -TE -ID -Ei -cP -tq -WP -Bz -YO -YO -AD -YO -YO -gV -wc -zx -DW -Eh -lB -mt -hR -Ei -ah -bd -YM -Ei -cK -fu -fu -fu -fu -fu -fu -fu -lJ -Ei -GM Yy -"} -(23,1,1) = {" Yy Yy Yy -eI -me -TE -TE -pD -ID -ID -Ei -Kv -EZ -Qe -BC -YO -wi -yK -yP -YO -VQ -WP -ic -wz -nU -hb -Iq -xl -Ei +jh +Wp +ST +gu +Yv +jh Yy Yy Yy -uo -AH -fu -fu -fu -fu -fu -fu -fu -gU -uo +xc +Wp +ST +gu +jV +xc Yy Yy -"} -(24,1,1) = {" Yy Yy Yy -RC -xe -me -me -ID -ID -ID -Ei -ZX -tq -WP -Fz -YO -eo -yG -Xq -YO -CT -VV -HL -wz -XV -uN -pS -tp -Ei Yy Yy Yy -uo -AH -fu -fu -fu -fu -fu -fu -fu -gU -uo Yy Yy -"} -(25,1,1) = {" Yy Yy Yy Yy -RC -uK -PL -Ei -Ei -Ei -Ei -Xj -Xr -WP -sp -YO -ZM -KY -Sq -YO -DF -cT -gu -wz -OE -hb -qs -dh -Ei Yy Yy Yy -uo -AH -fu -fu -fu -fu -fu -fu -fu -gU -uo Yy Yy -"} -(26,1,1) = {" Yy Yy +"} +(36,1,1) = {" Yy Yy Yy -xp -ei -ub -oG -Ym -FD -vI -wa -FB -YO -YO -Cv -KY -Jq -YO -ST -Kb -am -wz -Gd -Db -zz -ys -Ei -ah -bd -YM -Ei -cK -fu -fu -fu -fu -fu -fu -fu -lJ -Ei -GM Yy -"} -(27,1,1) = {" Yy Yy Yy Yy Yy -DH -lL -lH -zE -aD -EK -im -sY -fg -YO -NN -yo -KY -ny -YO +jh +Rh Vs +Bp sx -sx -wq -oh -zh -zh -zh -YL -vr -zh -Ib -Ep -AH -fu -fu -fu -fu -fu -fu -fu -gU -rL +jh Yy Yy -"} -(28,1,1) = {" +Yy +xc +yv +Vs +Bp +sx +xc Yy Yy Yy Yy Yy -vR -Kc -Ei -Ei -Ei -Ei -By -sl -aq -bU -hL -xV -Vm -iw -YO -OS -OS -OS -zM -Gm -OS -OS -OS -ZD -cq -OS -OS -EO -AH -fu -fu -fu -fu -fu -fu -fu -gU -sW Yy Yy -"} -(29,1,1) = {" Yy Yy -Vx Yy Yy -YF -Ee -fO -ID -ID -Ei -Ei -qA -yM -YO -Vj -zW -YD -YO -YO -Nr -Mk -OK -wQ -uz -wP -KC -hR -Ei -ah -bd -YM -Ei -cK -fu -fu -fu -fu -fu -fu -fu -lJ -Ei -GM Yy -"} -(30,1,1) = {" Yy -Vx -Vx -Vx -Vx -Vx Yy Yy Yy -ID -ID -Ei -dS -YO -YO -YO -oD -YO -YO -qU -jV -Gj -mk -wQ -aJ -hb -PH -zl -Ei Yy Yy Yy -uo -AH -fu -fu -fu -fu -fu -fu -fu -gU -uo Yy Yy "} -(31,1,1) = {" +(37,1,1) = {" Yy Yy -ID Yy Yy -Vx -Vx -Vx -Vx -Vx -Ei -Ei -bl -pT -YO -mj -ty -MS -YO -rj -ma -uN -MX -Pi -Xg -hb -Cp -lw -Rh Yy Yy -Ei -Ei -iY -No -No -No -No -No -No -No -AW -Ei -Ei Yy -"} -(32,1,1) = {" Yy -ID -ID -ID -ID -Vx Yy +jh +jh +jh +jh +jh +jh Yy Yy Yy -Rh -Fj -td -Fp -YO -XB -MT -bo -YO -Sr -Ra -uN -jb xc -qb -uN -pS -pS -Rh +xc +xc +xc +xc +xc Yy Yy -Ei -Ei -EH -hg -Nl -NH -ZV -JR -Nl -TC -rO -Ei -Ei Yy -"} -(33,1,1) = {" Yy -ID -ID -ID -ID -Vx Yy Yy Yy Yy -Rh -wX -tM -hv -YO -YO -SV -YO -YO -VN -pS -XZ -jT -So -Oh -uN -zC -zC -Rh Yy Yy Yy -Ei -Ei -Gt -Hd -Hd -GB -Hd -Hd -oo -Ei -Ei Yy Yy -"} -(34,1,1) = {" Yy Yy -ID -ID -ID -ID -ID Yy Yy Yy -Ei -YO -YO -YO -YO -KB -VX -zj -YO -Aj -RP -gy -gb -XD -eK -hb -Yj -sI -Rh +Yy +Yy +Yy +"} +(38,1,1) = {" Yy Yy Yy Yy -Ei -uo -uo -uo -Ei -uo -uo -uo -Ei Yy Yy Yy -"} -(35,1,1) = {" Yy Yy -ID -ID -ID -ID -ID -Vx Yy Yy -Rh -vq -QN -Yv -se -Bu -TQ -Bu -NV -AV -cI -OQ -jV -uN -kW -RN -Og -xX -Rh Yy Yy Yy @@ -5764,40 +2282,11 @@ Yy Yy Yy Yy -"} -(36,1,1) = {" Yy Yy Yy -ID -ID -ID -Vx -Vx -Vx -Vx -Rh -vq -ap -Kd -YO -qo -eQ -Ck -YO -YO -tX -JV -Gp -Te -Se -hb -pS -nX -Ei Yy Yy -Vx Yy Yy Yy @@ -5812,7 +2301,7 @@ Yy Yy Yy "} -(37,1,1) = {" +(39,1,1) = {" Yy Yy Yy @@ -5821,31 +2310,6 @@ Yy Yy Yy Yy -Vx -ID -Ei -Ei -jq -pE -YO -Jd -xy -Ny -YO -YO -YO -Ux -cE -eh -LH -VD -Nb -Ei -Ei -Vx -Vx -Vx -Vx Yy Yy Yy @@ -5858,8 +2322,6 @@ Yy Yy Yy Yy -"} -(38,1,1) = {" Yy Yy Yy @@ -5868,30 +2330,8 @@ Yy Yy Yy Yy -ID -ID -ID -Ei -Ei -Ei -Ei -WL -WL -WL -Ei -ID -Ei -Ei -WL -WL -WL -uo -Ei -Ei -Vx Yy Yy -ID Yy Yy Yy @@ -5905,41 +2345,25 @@ Yy Yy Yy Yy -"} -(39,1,1) = {" Yy Yy +"} +(40,1,1) = {" +Yy Yy Yy Yy Yy Yy Yy -ID -ID -ID -ID -ID -ID -ID Yy Yy Yy -ID -ID -ID -ID Yy Yy Yy Yy -Vx -Vx -Vx Yy -ID -ID -ID Yy Yy Yy @@ -5952,8 +2376,6 @@ Yy Yy Yy Yy -"} -(40,1,1) = {" Yy Yy Yy @@ -5963,30 +2385,17 @@ Yy Yy Yy Yy -ID -ID -ID -ID -ID Yy Yy Yy Yy Yy -ID -ID -Vx Yy Yy Yy -Vx -Vx Yy -Vx -ID -ID -ID -ID +"} +(41,1,1) = {" Yy Yy Yy @@ -5999,8 +2408,6 @@ Yy Yy Yy Yy -"} -(41,1,1) = {" Yy Yy Yy @@ -6011,9 +2418,6 @@ Yy Yy Yy Yy -ID -ID -ID Yy Yy Yy @@ -6021,18 +2425,9 @@ Yy Yy Yy Yy -Vx -Vx -Vx Yy Yy -Vx Yy -ID -ID -ID -ID -ID Yy Yy Yy @@ -6070,15 +2465,15 @@ Yy Yy Yy Yy -Vx -Vx -Vx -ID -ID -ID -ID -ID -ID +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy Yy Yy Yy @@ -6118,12 +2513,12 @@ Yy Yy Yy Yy -Vx -ID -ID -ID -ID -ID +Yy +Yy +Yy +Yy +Yy +Yy Yy Yy Yy @@ -6167,8 +2562,8 @@ Yy Yy Yy Yy -ID -ID +Yy +Yy Yy Yy Yy From 2f4ae2d0dafc3b75f28919dbe6772df76b7c6ab1 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Mon, 9 Sep 2024 19:57:28 +0100 Subject: [PATCH 09/50] fax machines added to bases w phones --- code/game/machinery/fax_machine.dm | 33 ++- .../lazy_templates/fax_responder_base.dmm | 260 +++++++++++++++--- 2 files changed, 247 insertions(+), 46 deletions(-) diff --git a/code/game/machinery/fax_machine.dm b/code/game/machinery/fax_machine.dm index b15117bb2554..9cab258037d4 100644 --- a/code/game/machinery/fax_machine.dm +++ b/code/game/machinery/fax_machine.dm @@ -470,7 +470,6 @@ GLOBAL_LIST_EMPTY(alldepartments) /obj/structure/machinery/faxmachine/cmb name = "\improper CMB Incident Command Center Fax Machine" - department = "Colonial Marshal Bureau, Anchorpoint Station" network = "NC4 UA Federal Secure Network - CMB Relay" department = DEPARTMENT_CMB @@ -517,6 +516,38 @@ GLOBAL_LIST_EMPTY(alldepartments) target_department = "Brig" network = "USCM High Command Quantum Relay" +/obj/structure/machinery/faxmachine/upp + name = "\improper UPP Military Fax Machine" + department = "UPP Local Operations" + network = "UPP Encrypted Network" + target_department = DEPARTMENT_UPP + +/obj/structure/machinery/faxmachine/upp/highcom + department = DEPARTMENT_UPP + network = "UPP High Command Quantum Relay" + target_department = "UPP Local Operations" + +/obj/structure/machinery/faxmachine/clf + name = "\improper Hacked General Purpose Fax Machine" + department = "CLF Local Operations" + network = "Perseus Encrypted Network" + target_department = DEPARTMENT_CLF + +/obj/structure/machinery/faxmachine/clf/highcom + department = DEPARTMENT_CLF + network = "Perseus Quantum Relay" + target_department = "UPP Local Operations" + +/obj/structure/machinery/faxmachine/twe + name = "\improper TWE Military Fax Machine" + department = "TWE Local Operations" + network = "TWE Encrypted Network" + target_department = DEPARTMENT_TWE + +/obj/structure/machinery/faxmachine/twe/highcom + department = DEPARTMENT_TWE + network = "TWE High Command Quantum Relay" + target_department = "TWE Local Operations" ///The deployed fax machine backpack /obj/structure/machinery/faxmachine/backpack diff --git a/maps/templates/lazy_templates/fax_responder_base.dmm b/maps/templates/lazy_templates/fax_responder_base.dmm index 07ccc2ca2c5c..be9e64f1ae18 100644 --- a/maps/templates/lazy_templates/fax_responder_base.dmm +++ b/maps/templates/lazy_templates/fax_responder_base.dmm @@ -10,7 +10,7 @@ /obj/structure/transmitter/rotary{ pixel_x = -6; pixel_y = 6; - networks_transmit = list("USCM","Colonist","UPP"); + networks_transmit = list("USCM","Colonist","UPP","Fax Responders"); phone_id = "UPP High Command"; phone_category = "Comms Relay"; networks_receive = list("Fax Responders"); @@ -18,6 +18,13 @@ }, /turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) +"bl" = ( +/obj/structure/machinery/light{ + dir = 8; + tag = "icon-tube1 (EAST)" + }, +/turf/open/floor/wood/ship, +/area/space) "bT" = ( /obj/structure/surface/table/woodentable/fancy, /obj/structure/machinery/computer/cameras/almayer{ @@ -49,6 +56,10 @@ "gu" = ( /turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) +"hh" = ( +/obj/effect/landmark/late_join/responder/upp, +/turf/open/floor/wood/ship, +/area/space) "id" = ( /obj/structure/surface/table/woodentable/fancy, /obj/structure/machinery/computer/crew/alt{ @@ -113,6 +124,19 @@ "jh" = ( /turf/closed/wall/r_wall/prison_unmeltable, /area/adminlevel/ert_station/fax_response_station) +"jG" = ( +/obj/structure/filingcabinet{ + density = 0; + pixel_y = 24; + pixel_x = 9 + }, +/obj/structure/filingcabinet{ + density = 0; + pixel_y = 24; + pixel_x = -7 + }, +/turf/open/floor/wood/ship, +/area/space) "jV" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/folder/red{ @@ -124,7 +148,7 @@ /obj/structure/transmitter/rotary{ pixel_x = -6; pixel_y = 6; - networks_transmit = list("USCM","Colonist","TWE"); + networks_transmit = list("USCM","Colonist","TWE","Fax Responders"); phone_id = "TWE High Command"; phone_category = "Comms Relay"; networks_receive = list("Fax Responders"); @@ -132,6 +156,19 @@ }, /turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) +"kz" = ( +/obj/structure/bed/chair/comfy/teal{ + dir = 4 + }, +/turf/open/floor/wood/ship, +/area/space) +"ny" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/faxmachine/cmb{ + pixel_y = 8 + }, +/turf/open/floor/wood/ship, +/area/space) "nB" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_x = -24 @@ -149,6 +186,13 @@ }, /turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) +"oA" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/faxmachine/twe/highcom{ + pixel_y = 8 + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) "rV" = ( /obj/effect/landmark/late_join/responder/uscm/provost, /turf/open/floor/wood/ship, @@ -175,7 +219,7 @@ /obj/structure/transmitter/rotary{ pixel_x = -6; pixel_y = 6; - networks_transmit = list("USCM","Colonist"); + networks_transmit = list("USCM","Colonist","Fax Responders"); phone_id = "USCM High Command"; phone_category = "Comms Relay"; networks_receive = list("Fax Responders"); @@ -187,6 +231,51 @@ /obj/effect/landmark/late_join/responder/clf, /turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) +"tR" = ( +/turf/open/floor/wood/ship, +/area/space) +"uX" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/faxmachine/clf/highcom{ + pixel_y = 8 + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) +"vf" = ( +/obj/item/bedsheet/ce, +/obj/structure/bed, +/turf/open/floor/wood/ship, +/area/space) +"wx" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/computer/crew/alt{ + pixel_y = 24; + pixel_x = -12; + faction = "Colonial Marshal"; + name = "CMB monitoring computer" + }, +/obj/item/tool/pen/clicky, +/obj/item/tool/pen/blue/clicky{ + pixel_y = 8 + }, +/obj/item/tool/pen/green/clicky{ + pixel_y = 8; + pixel_x = -8 + }, +/obj/item/tool/pen/red/clicky{ + pixel_x = -8 + }, +/obj/item/paper_bin/wy{ + pixel_y = 6; + pixel_x = 8 + }, +/obj/structure/machinery/computer/crew/alt{ + pixel_y = 24; + pixel_x = 8; + name = "USCM monitoring computer" + }, +/turf/open/floor/wood/ship, +/area/space) "wz" = ( /turf/closed/wall/r_wall/bunker{ hull = 1 @@ -201,6 +290,9 @@ hull = 1 }, /area/adminlevel/ert_station/fax_response_station) +"xX" = ( +/turf/closed/wall/r_wall/unmeltable, +/area/space) "yv" = ( /obj/structure/surface/table/woodentable/fancy, /obj/structure/machinery/computer/crew/alt{ @@ -285,6 +377,25 @@ "BC" = ( /turf/closed/wall/r_wall/biodome/biodome_unmeltable, /area/adminlevel/ert_station/fax_response_station) +"BQ" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/folder/red{ + pixel_x = 6 + }, +/obj/item/folder/black{ + pixel_x = 12 + }, +/obj/structure/transmitter/rotary{ + pixel_x = -6; + pixel_y = 6; + networks_transmit = list("USCM","Colonist","Colonial Marshal","Fax Responders"); + phone_id = "UPP High Command"; + phone_category = "Comms Relay"; + networks_receive = list("Fax Responders"); + phone_color = "green" + }, +/turf/open/floor/wood/ship, +/area/space) "CT" = ( /obj/structure/machinery/light{ dir = 8; @@ -349,7 +460,7 @@ /obj/structure/transmitter/rotary{ pixel_x = -6; pixel_y = 6; - networks_transmit = list("USCM","Colonist","Wey-Yu","PMC"); + networks_transmit = list("USCM","Colonist","Wey-Yu","PMC","Fax Responders"); phone_id = "Weyland-Yutani Operations Manager"; phone_category = "Comms Relay"; networks_receive = list("Fax Responders") @@ -373,6 +484,39 @@ /obj/structure/bed, /turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) +"Js" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/computer/cameras/almayer{ + dir = 8; + admin_console = 1; + network = list("Almayer","Research","Containment","Containment Hidden"); + pixel_x = 16; + layer = 2.99; + name = "USS Almayer Cameras"; + pixel_y = -6; + colony_camera_mapload = 0 + }, +/obj/structure/machinery/computer/cameras/almayer{ + dir = 8; + admin_console = 1; + network = list("Overwatch"); + pixel_x = 16; + pixel_y = 8; + name = "Overwatch Cameras"; + colony_camera_mapload = 0 + }, +/turf/open/floor/wood/ship, +/area/space) +"Le" = ( +/obj/structure/machinery/cm_vending/sorted/marine_food{ + pixel_y = 16; + density = 0 + }, +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_x = -24 + }, +/turf/open/floor/wood/ship, +/area/space) "NP" = ( /obj/structure/machinery/light, /obj/structure/surface/table/woodentable/fancy, @@ -385,7 +529,7 @@ /obj/structure/transmitter/rotary{ pixel_x = -6; pixel_y = 6; - networks_transmit = list("USCM","Colonist"); + networks_transmit = list("USCM","Colonist","Fax Responders"); phone_id = "USCM Provost Office"; phone_category = "Comms Relay"; networks_receive = list("Fax Responders"); @@ -433,6 +577,17 @@ }, /turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) +"TW" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/folder/white{ + pixel_x = -6 + }, +/obj/item/folder/white, +/obj/item/folder/white{ + pixel_x = 6 + }, +/turf/open/floor/wood/ship, +/area/space) "UB" = ( /obj/structure/surface/table/woodentable/fancy, /obj/structure/machinery/faxmachine/uscm/brig/provost{ @@ -469,11 +624,26 @@ /area/adminlevel/ert_station/fax_response_station) "Wp" = ( /obj/structure/surface/table/woodentable/fancy, -/obj/structure/machinery/faxmachine/corporate/highcom{ +/obj/structure/machinery/faxmachine/upp/highcom{ pixel_y = 8 }, /turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) +"Ww" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/tool/stamp/hos{ + name = "red stamp"; + pixel_y = 8 + }, +/obj/item/tool/stamp/hop{ + name = "blue stamp" + }, +/obj/item/tool/stamp/ce{ + name = "yellow stamp"; + pixel_y = -8 + }, +/turf/open/floor/wood/ship, +/area/space) "XZ" = ( /obj/effect/landmark/late_join/responder/twe, /turf/open/floor/wood/ship, @@ -489,7 +659,7 @@ /obj/structure/transmitter/rotary{ pixel_x = -6; pixel_y = 6; - networks_transmit = list("USCM","Colonist","CLF"); + networks_transmit = list("USCM","Colonist","CLF","Fax Responders"); phone_id = "CLF Command"; phone_category = "Comms Relay"; networks_receive = list("Fax Responders"); @@ -1577,12 +1747,12 @@ wz Yy Yy Yy -Yy -Yy -Yy -Yy -Yy -Yy +xX +xX +xX +xX +xX +xX Yy Yy Yy @@ -1624,12 +1794,12 @@ wz Yy Yy Yy -Yy -Yy -Yy -Yy -Yy -Yy +xX +Le +bl +hh +vf +xX Yy Yy Yy @@ -1671,12 +1841,12 @@ wz Yy Yy Yy -Yy -Yy -Yy -Yy -Yy -Yy +xX +jG +tR +tR +tR +xX Yy Yy Yy @@ -1718,12 +1888,12 @@ wz Yy Yy Yy -Yy -Yy -Yy -Yy -Yy -Yy +xX +ny +kz +tR +BQ +xX Yy Yy Yy @@ -1765,12 +1935,12 @@ wz Yy Yy Yy -Yy -Yy -Yy -Yy -Yy -Yy +xX +wx +Js +Ww +TW +xX Yy Yy Yy @@ -1812,12 +1982,12 @@ wz Yy Yy Yy -Yy -Yy -Yy -Yy -Yy -Yy +xX +xX +xX +xX +xX +xX Yy Yy Yy @@ -2124,7 +2294,7 @@ Yy Yy Yy jh -Wp +uX ST gu Yv @@ -2133,7 +2303,7 @@ Yy Yy Yy xc -Wp +oA ST gu jV From 17e43329b0e36f3cf89767584388f5f85d907835 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Tue, 10 Sep 2024 21:34:01 +0100 Subject: [PATCH 10/50] fax machine ID --- code/game/machinery/fax_machine.dm | 143 ++++++++++++------- code/modules/gear_presets/fax_responders.dm | 7 + tgui/packages/tgui/interfaces/FaxMachine.jsx | 7 +- 3 files changed, 104 insertions(+), 53 deletions(-) diff --git a/code/game/machinery/fax_machine.dm b/code/game/machinery/fax_machine.dm index 9cab258037d4..8ec3bd82033b 100644 --- a/code/game/machinery/fax_machine.dm +++ b/code/game/machinery/fax_machine.dm @@ -11,6 +11,20 @@ GLOBAL_LIST_EMPTY(alldepartments) #define DEPARTMENT_CLF "Colonial Liberation Front" #define HIGHCOM_DEPARTMENTS list(DEPARTMENT_WY, DEPARTMENT_HC, DEPARTMENT_CMB, DEPARTMENT_PROVOST, DEPARTMENT_PRESS, DEPARTMENT_TWE, DEPARTMENT_UPP, DEPARTMENT_CLF) +#define FAX_NET_USCM "USCM Encrypted Network" +#define FAX_NET_USCM_HC "USCM High Command Quantum Relay" +#define FAX_NET_WY "Weyland-Yutani Secure Network" +#define FAX_NET_WY_COL "Weyland-Yutani Public Network" +#define FAX_NET_WY_HC "Weyland-Yutani Quantum Relay" +#define FAX_NET_CMB "NC4 UA Federal Secure Network - CMB Relay" +#define FAX_NET_TWE "TWE Encrypted Network" +#define FAX_NET_TWE_HC "TWE Imperial Command Quantum Relay" +#define FAX_NET_UPP "UPP Encrypted Network" +#define FAX_NET_UPP_HC "UPP High Command Quantum Relay" +#define FAX_NET_CLF "Peridia Encrypted Network" +#define FAX_NET_CLF_HC "Peridia Quantum Relay" +#define FAX_HC_NETWORKS list(FAX_NET_USCM_HC, FAX_NET_WY_HC, FAX_NET_CMB, FAX_NET_TWE_HC, FAX_NET_UPP_HC, FAX_NET_CLF_HC) + /obj/structure/machinery/faxmachine // why not fax_machine? name = "\improper General Purpose Fax Machine" icon = 'icons/obj/structures/machinery/library.dmi' @@ -40,16 +54,54 @@ GLOBAL_LIST_EMPTY(alldepartments) var/list/photo_list = list() ///Fluff network shown by fax machine when logged in - var/network = "Weyland-Yutani Public Network" + var/network = FAX_NET_WY_COL ///storer var for cooldown on sending faxes var/fax_cooldown = 300 COOLDOWN_DECLARE(send_cooldown) + var/machine_id_tag + /obj/structure/machinery/faxmachine/Initialize(mapload, ...) . = ..() GLOB.allfaxes += src update_departments() + generate_id_tag() + +/obj/structure/machinery/faxmachine/proc/generate_id_tag() + var/id_tag_prefix + var/id_tag_suffix = "[rand(1000, 9999)][pick(GLOB.alphabet_uppercase)][pick(GLOB.alphabet_uppercase)]" + var/id_tag_final + switch(network) + if(FAX_NET_USCM) + id_tag_prefix = "UA-M"//United Americas Military + if(FAX_NET_USCM_HC) + id_tag_final = FAX_NET_USCM_HC + if(FAX_NET_CMB) + id_tag_final = FAX_NET_CMB + if(FAX_NET_WY) + id_tag_prefix = "WY-SCN"//Weyland Yutani Secure Corporate Network + if(FAX_NET_WY_COL) + id_tag_prefix = "WYC"//Weyland Yutani Communications + if(FAX_NET_WY_HC) + id_tag_final = FAX_NET_WY_HC + if(FAX_NET_TWE) + id_tag_prefix = "ICN"//Imperial Communication Network + if(FAX_NET_TWE_HC) + id_tag_final = FAX_NET_TWE_HC + if(FAX_NET_UPP) + id_tag_prefix = "UFR"//Union Fax Relay + if(FAX_NET_UPP_HC) + id_tag_final = FAX_NET_UPP_HC + if(FAX_NET_CLF) + id_tag_prefix = "PRD"//PeRiDia + if(FAX_NET_CLF_HC) + id_tag_final = FAX_NET_CLF_HC + + if(!id_tag_final) + id_tag_final = "[id_tag_prefix]-[id_tag_suffix]" + + machine_id_tag = id_tag_final /obj/structure/machinery/faxmachine/Destroy() GLOB.allfaxes -= src @@ -169,6 +221,7 @@ GLOBAL_LIST_EMPTY(alldepartments) data["department"] = department data["network"] = network + data["machine_id_tag"] = machine_id_tag return data @@ -418,65 +471,51 @@ GLOBAL_LIST_EMPTY(alldepartments) P.name = "faxed message" P.info = "[faxcontents.data]" P.update_icon() + var/image/stampoverlay = image('icons/obj/items/paper.dmi') + var/encrypted = FALSE switch(network) - if("USCM High Command Quantum Relay") - var/image/stampoverlay = image('icons/obj/items/paper.dmi') + if(FAX_NET_USCM_HC) stampoverlay.icon_state = "paper_stamp-uscm" - P.stamps += "
This paper has been stamped by the USCM High Command Quantum Relay." - if("NC4 UA Federal Secure Network - CMB Relay") - var/image/stampoverlay = image('icons/obj/items/paper.dmi') + encrypted = TRUE + if(FAX_NET_CMB) stampoverlay.icon_state = "paper_stamp-cmb" - if(!P.stamped) - P.stamped = new - P.stamped += /obj/item/tool/stamp - P.overlays += stampoverlay - P.stamps += "
This paper has been stamped by The Office of Colonial Marshals." - if("Weyland-Yutani Quantum Relay") - var/image/stampoverlay = image('icons/obj/items/paper.dmi') + network = "NC4 UA Federal Secure Network." + encrypted = TRUE + if(FAX_NET_WY_HC) stampoverlay.icon_state = "paper_stamp-weyyu" - if(!P.stamped) - P.stamped = new - P.stamped += /obj/item/tool/stamp - P.overlays += stampoverlay - P.stamps += "
This paper has been stamped and encrypted by the Weyland-Yutani Quantum Relay (tm)." - if("TWE Royal Marines Commando Quantum Relay") - var/image/stampoverlay = image('icons/obj/items/paper.dmi') + encrypted = TRUE + if(FAX_NET_TWE_HC) stampoverlay.icon_state = "paper_stamp-twe" - if(!P.stamped) - P.stamped = new - P.stamped += /obj/item/tool/stamp - P.overlays += stampoverlay - P.stamps += "
This paper has been stamped by the TWE Royal Marines Commando Quantum Relay." - if("UPP High Kommand Quantum Relay") - var/image/stampoverlay = image('icons/obj/items/paper.dmi') + encrypted = TRUE + if(FAX_NET_UPP_HC) stampoverlay.icon_state = "paper_stamp-upp" - if(!P.stamped) - P.stamped = new - P.stamped += /obj/item/tool/stamp - P.overlays += stampoverlay - P.stamps += "
This paper has been stamped by the UPP High Kommand Quantum Relay." - if("CLF Gureilla Command Quantum Relay") - var/image/stampoverlay = image('icons/obj/items/paper.dmi') + encrypted = TRUE + if(FAX_NET_CLF_HC) stampoverlay.icon_state = "paper_stamp-clf" - if(!P.stamped) - P.stamped = new - P.stamped += /obj/item/tool/stamp - P.overlays += stampoverlay - P.stamps += "
This paper has been stamped and encrypted by the CLF Gureilla Command Quantum Relay." + encrypted = TRUE + + if(encrypted) + if(!P.stamped) + P.stamped = new + P.stamped += /obj/item/tool/stamp + P.overlays += stampoverlay + P.stamps += "
This paper has been stamped and encrypted by the [network]." + else + P.stamps += "
This paper has been sent by [machine_id_tag]." playsound(F.loc, "sound/items/polaroid1.ogg", 15, 1) qdel(faxcontents) /obj/structure/machinery/faxmachine/cmb name = "\improper CMB Incident Command Center Fax Machine" - network = "NC4 UA Federal Secure Network - CMB Relay" + network = FAX_NET_CMB department = DEPARTMENT_CMB /obj/structure/machinery/faxmachine/corporate name = "\improper W-Y Corporate Fax Machine" department = "W-Y Local Office" - network = "Weyland-Yutani Secure Network" + network = FAX_NET_WY /obj/structure/machinery/faxmachine/corporate/liaison department = "W-Y Liaison" @@ -484,12 +523,12 @@ GLOBAL_LIST_EMPTY(alldepartments) /obj/structure/machinery/faxmachine/corporate/highcom department = DEPARTMENT_WY target_department = "W-Y Liaison" - network = "Weyland-Yutani Quantum Relay" + network = FAX_NET_WY_HC /obj/structure/machinery/faxmachine/uscm name = "\improper USCM Military Fax Machine" department = "USCM Local Operations" - network = "USCM Encrypted Network" + network = FAX_NET_USCM target_department = DEPARTMENT_HC /obj/structure/machinery/faxmachine/uscm/command @@ -501,7 +540,7 @@ GLOBAL_LIST_EMPTY(alldepartments) /obj/structure/machinery/faxmachine/uscm/command/highcom department = DEPARTMENT_HC target_department = "Commanding Officer" - network = "USCM High Command Quantum Relay" + network = FAX_NET_USCM_HC /obj/structure/machinery/faxmachine/uscm/brig name = "\improper USCM Provost Fax Machine" @@ -514,39 +553,39 @@ GLOBAL_LIST_EMPTY(alldepartments) /obj/structure/machinery/faxmachine/uscm/brig/provost department = DEPARTMENT_PROVOST target_department = "Brig" - network = "USCM High Command Quantum Relay" + network = FAX_NET_USCM_HC /obj/structure/machinery/faxmachine/upp name = "\improper UPP Military Fax Machine" department = "UPP Local Operations" - network = "UPP Encrypted Network" + network = FAX_NET_UPP target_department = DEPARTMENT_UPP /obj/structure/machinery/faxmachine/upp/highcom department = DEPARTMENT_UPP - network = "UPP High Command Quantum Relay" + network = FAX_NET_UPP_HC target_department = "UPP Local Operations" /obj/structure/machinery/faxmachine/clf name = "\improper Hacked General Purpose Fax Machine" department = "CLF Local Operations" - network = "Perseus Encrypted Network" + network = FAX_NET_CLF target_department = DEPARTMENT_CLF /obj/structure/machinery/faxmachine/clf/highcom department = DEPARTMENT_CLF - network = "Perseus Quantum Relay" - target_department = "UPP Local Operations" + network = FAX_NET_CLF_HC + target_department = "CLF Local Operations" /obj/structure/machinery/faxmachine/twe name = "\improper TWE Military Fax Machine" department = "TWE Local Operations" - network = "TWE Encrypted Network" + network = FAX_NET_TWE target_department = DEPARTMENT_TWE /obj/structure/machinery/faxmachine/twe/highcom department = DEPARTMENT_TWE - network = "TWE High Command Quantum Relay" + network = FAX_NET_TWE_HC target_department = "TWE Local Operations" ///The deployed fax machine backpack diff --git a/code/modules/gear_presets/fax_responders.dm b/code/modules/gear_presets/fax_responders.dm index fa26bd1fca91..78af5dc0bf8c 100644 --- a/code/modules/gear_presets/fax_responders.dm +++ b/code/modules/gear_presets/fax_responders.dm @@ -53,6 +53,13 @@ rank = JOB_FAX_RESPONDER_USCM_PVST /datum/equipment_preset/fax_responder/uscm/provost/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/mp/provost/chief(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/provost/chief(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/marine/mp/provost/chief(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/notepad/red(new_human), WEAR_R_STORE) . = ..() diff --git a/tgui/packages/tgui/interfaces/FaxMachine.jsx b/tgui/packages/tgui/interfaces/FaxMachine.jsx index e374bf4b210a..11da63613736 100644 --- a/tgui/packages/tgui/interfaces/FaxMachine.jsx +++ b/tgui/packages/tgui/interfaces/FaxMachine.jsx @@ -17,7 +17,7 @@ export const FaxMachine = () => { const { idcard } = data; const body = idcard ? : ; const windowWidth = idcard ? 600 : 400; - const windowHeight = idcard ? 270 : 215; + const windowHeight = idcard ? 295 : 215; return ( @@ -27,10 +27,15 @@ export const FaxMachine = () => { }; const FaxMain = (props) => { + const { data } = useBackend(); + const { machine_id_tag } = data; return ( <> + + The machine identification is {machine_id_tag} + ); }; From e43e9b0aff246869f6722ca461a9117a2978aab2 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Tue, 10 Sep 2024 21:53:34 +0100 Subject: [PATCH 11/50] Lobby Fix F Revert Intercomms lobby fix t --- code/game/gamemodes/cm_initialize.dm | 11 +- code/modules/mob/new_player/new_player.dm | 5 +- .../lazy_templates/fax_responder_base.dmm | 131 +++--------------- 3 files changed, 28 insertions(+), 119 deletions(-) diff --git a/code/game/gamemodes/cm_initialize.dm b/code/game/gamemodes/cm_initialize.dm index b74bc357e09b..508063b37a1d 100644 --- a/code/game/gamemodes/cm_initialize.dm +++ b/code/game/gamemodes/cm_initialize.dm @@ -260,14 +260,20 @@ Additional game mode variables. //===================================================\\ -/datum/game_mode/proc/check_fax_responder_late_join(mob/responder, show_warning = TRUE) +/datum/game_mode/proc/check_fax_responder_late_join(mob/responder, show_warning = TRUE, lobby_attempt = FALSE) if(!responder.client) return FALSE if(!(responder?.client.check_whitelist_status(WHITELIST_FAX_RESPONDER))) if(show_warning) to_chat(responder, SPAN_WARNING("You are not whitelisted!")) + if(lobby_attempt) + var/mob/new_player/lobbied = responder + lobbied.new_player_panel() return FALSE if(show_warning && tgui_alert(responder, "Confirm joining as a Fax Responder.", "Confirmation", list("Yes", "No"), 10 SECONDS) != "Yes") + if(lobby_attempt) + var/mob/new_player/lobbied = responder + lobbied.new_player_panel() return FALSE return TRUE @@ -299,7 +305,8 @@ Additional game mode variables. message_admins("([new_responder.key]) joined as a Fax Responder, [new_responder.real_name].") - if(responder_candidate) responder_candidate.moveToNullspace() //Nullspace it for garbage collection later. + if(responder_candidate) + responder_candidate.moveToNullspace() //Nullspace it for garbage collection later. return TRUE /datum/game_mode/proc/transform_fax_responder(mob/responder_candidate, sub_job) diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index c784d2115cb1..ab84d680f8a3 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -202,10 +202,9 @@ return if(alert(src,"Are you sure you want to attempt joining as a Fax Responder?","Confirmation","Yes","No") == "Yes" ) - if(SSticker.mode.check_fax_responder_late_join(src, FALSE)) + if(SSticker.mode.check_fax_responder_late_join(src, FALSE, TRUE)) close_spawn_windows() - if(!SSticker.mode.attempt_to_join_as_fax_responder(src)) - new_player_panel() + SSticker.mode.attempt_to_join_as_fax_responder(src) else to_chat(src, SPAN_WARNING("You are no longer able to join as a Fax Responder.")) new_player_panel() diff --git a/maps/templates/lazy_templates/fax_responder_base.dmm b/maps/templates/lazy_templates/fax_responder_base.dmm index be9e64f1ae18..7af99a93240c 100644 --- a/maps/templates/lazy_templates/fax_responder_base.dmm +++ b/maps/templates/lazy_templates/fax_responder_base.dmm @@ -18,13 +18,6 @@ }, /turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) -"bl" = ( -/obj/structure/machinery/light{ - dir = 8; - tag = "icon-tube1 (EAST)" - }, -/turf/open/floor/wood/ship, -/area/space) "bT" = ( /obj/structure/surface/table/woodentable/fancy, /obj/structure/machinery/computer/cameras/almayer{ @@ -56,10 +49,6 @@ "gu" = ( /turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) -"hh" = ( -/obj/effect/landmark/late_join/responder/upp, -/turf/open/floor/wood/ship, -/area/space) "id" = ( /obj/structure/surface/table/woodentable/fancy, /obj/structure/machinery/computer/crew/alt{ @@ -124,19 +113,6 @@ "jh" = ( /turf/closed/wall/r_wall/prison_unmeltable, /area/adminlevel/ert_station/fax_response_station) -"jG" = ( -/obj/structure/filingcabinet{ - density = 0; - pixel_y = 24; - pixel_x = 9 - }, -/obj/structure/filingcabinet{ - density = 0; - pixel_y = 24; - pixel_x = -7 - }, -/turf/open/floor/wood/ship, -/area/space) "jV" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/folder/red{ @@ -156,19 +132,13 @@ }, /turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) -"kz" = ( -/obj/structure/bed/chair/comfy/teal{ - dir = 4 - }, -/turf/open/floor/wood/ship, -/area/space) "ny" = ( /obj/structure/surface/table/woodentable/fancy, /obj/structure/machinery/faxmachine/cmb{ pixel_y = 8 }, /turf/open/floor/wood/ship, -/area/space) +/area/adminlevel/ert_station/fax_response_station) "nB" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_x = -24 @@ -231,9 +201,6 @@ /obj/effect/landmark/late_join/responder/clf, /turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) -"tR" = ( -/turf/open/floor/wood/ship, -/area/space) "uX" = ( /obj/structure/surface/table/woodentable/fancy, /obj/structure/machinery/faxmachine/clf/highcom{ @@ -241,11 +208,6 @@ }, /turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) -"vf" = ( -/obj/item/bedsheet/ce, -/obj/structure/bed, -/turf/open/floor/wood/ship, -/area/space) "wx" = ( /obj/structure/surface/table/woodentable/fancy, /obj/structure/machinery/computer/crew/alt{ @@ -275,7 +237,7 @@ name = "USCM monitoring computer" }, /turf/open/floor/wood/ship, -/area/space) +/area/adminlevel/ert_station/fax_response_station) "wz" = ( /turf/closed/wall/r_wall/bunker{ hull = 1 @@ -292,7 +254,7 @@ /area/adminlevel/ert_station/fax_response_station) "xX" = ( /turf/closed/wall/r_wall/unmeltable, -/area/space) +/area/adminlevel/ert_station/fax_response_station) "yv" = ( /obj/structure/surface/table/woodentable/fancy, /obj/structure/machinery/computer/crew/alt{ @@ -395,7 +357,7 @@ phone_color = "green" }, /turf/open/floor/wood/ship, -/area/space) +/area/adminlevel/ert_station/fax_response_station) "CT" = ( /obj/structure/machinery/light{ dir = 8; @@ -484,39 +446,6 @@ /obj/structure/bed, /turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) -"Js" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/structure/machinery/computer/cameras/almayer{ - dir = 8; - admin_console = 1; - network = list("Almayer","Research","Containment","Containment Hidden"); - pixel_x = 16; - layer = 2.99; - name = "USS Almayer Cameras"; - pixel_y = -6; - colony_camera_mapload = 0 - }, -/obj/structure/machinery/computer/cameras/almayer{ - dir = 8; - admin_console = 1; - network = list("Overwatch"); - pixel_x = 16; - pixel_y = 8; - name = "Overwatch Cameras"; - colony_camera_mapload = 0 - }, -/turf/open/floor/wood/ship, -/area/space) -"Le" = ( -/obj/structure/machinery/cm_vending/sorted/marine_food{ - pixel_y = 16; - density = 0 - }, -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_x = -24 - }, -/turf/open/floor/wood/ship, -/area/space) "NP" = ( /obj/structure/machinery/light, /obj/structure/surface/table/woodentable/fancy, @@ -577,17 +506,6 @@ }, /turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) -"TW" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/item/folder/white{ - pixel_x = -6 - }, -/obj/item/folder/white, -/obj/item/folder/white{ - pixel_x = 6 - }, -/turf/open/floor/wood/ship, -/area/space) "UB" = ( /obj/structure/surface/table/woodentable/fancy, /obj/structure/machinery/faxmachine/uscm/brig/provost{ @@ -629,21 +547,6 @@ }, /turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) -"Ww" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/item/tool/stamp/hos{ - name = "red stamp"; - pixel_y = 8 - }, -/obj/item/tool/stamp/hop{ - name = "blue stamp" - }, -/obj/item/tool/stamp/ce{ - name = "yellow stamp"; - pixel_y = -8 - }, -/turf/open/floor/wood/ship, -/area/space) "XZ" = ( /obj/effect/landmark/late_join/responder/twe, /turf/open/floor/wood/ship, @@ -1795,10 +1698,10 @@ Yy Yy Yy xX -Le -bl -hh -vf +YR +CT +gu +HL xX Yy Yy @@ -1842,10 +1745,10 @@ Yy Yy Yy xX -jG -tR -tR -tR +Ba +gu +gu +gu xX Yy Yy @@ -1890,8 +1793,8 @@ Yy Yy xX ny -kz -tR +ST +gu BQ xX Yy @@ -1937,9 +1840,9 @@ Yy Yy xX wx -Js -Ww -TW +Vs +Bp +sx xX Yy Yy From 54e4662328a95a0599a63154e159f07de53e456b Mon Sep 17 00:00:00 2001 From: forest2001 Date: Tue, 10 Sep 2024 22:14:09 +0100 Subject: [PATCH 12/50] Preset Tweaks --- code/__DEFINES/job.dm | 3 +- code/datums/skills/civilian.dm | 12 ++++++ code/game/jobs/job/special/responders.dm | 12 +++++- code/modules/gear_presets/fax_responders.dm | 46 ++++++++++++++++++++- 4 files changed, 68 insertions(+), 5 deletions(-) diff --git a/code/__DEFINES/job.dm b/code/__DEFINES/job.dm index 36de99ef09d6..7372c6717b71 100644 --- a/code/__DEFINES/job.dm +++ b/code/__DEFINES/job.dm @@ -377,8 +377,9 @@ GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST) #define JOB_FAX_RESPONDER_UPP "UPP Fax Responder" #define JOB_FAX_RESPONDER_TWE "TWE Fax Responder" #define JOB_FAX_RESPONDER_CLF "CLF Fax Responder" +#define JOB_FAX_RESPONDER_CMB "CMB Fax Responder" -#define FAX_RESPONDER_JOB_LIST list(JOB_FAX_RESPONDER_USCM_HC, JOB_FAX_RESPONDER_USCM_PVST, JOB_FAX_RESPONDER_WY, JOB_FAX_RESPONDER_UPP, JOB_FAX_RESPONDER_TWE, JOB_FAX_RESPONDER_CLF) +#define FAX_RESPONDER_JOB_LIST list(JOB_FAX_RESPONDER_USCM_HC, JOB_FAX_RESPONDER_USCM_PVST, JOB_FAX_RESPONDER_WY, JOB_FAX_RESPONDER_UPP, JOB_FAX_RESPONDER_TWE, JOB_FAX_RESPONDER_CLF, JOB_FAX_RESPONDER_CMB) //---------- ANTAG ----------// diff --git a/code/datums/skills/civilian.dm b/code/datums/skills/civilian.dm index ff9cadf02913..66bca6b0fbef 100644 --- a/code/datums/skills/civilian.dm +++ b/code/datums/skills/civilian.dm @@ -224,3 +224,15 @@ CIVILIAN SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, ) + +/datum/skills/civilian/fax_responder + name = "Comms Relay Worker" //Used for fax responder presets, allowing use of appropriate HUDs and basics. + skills = list( + SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, + SKILL_LEADERSHIP = SKILL_LEAD_MASTER, + SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, + SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, + SKILL_ENGINEER = SKILL_ENGINEER_NOVICE, + SKILL_VEHICLE = SKILL_VEHICLE_SMALL, + SKILL_INTEL = SKILL_INTEL_EXPERT, + ) diff --git a/code/game/jobs/job/special/responders.dm b/code/game/jobs/job/special/responders.dm index 41af237b0f76..744f26cb72b8 100644 --- a/code/game/jobs/job/special/responders.dm +++ b/code/game/jobs/job/special/responders.dm @@ -13,7 +13,6 @@ entry_message_body = "Your job is to answer faxes sent to your fax machine. You are answering on behalf of the CMSS13 staff team and are therefore expected to behave appropriately. You are not able to authorise ERTs." AddTimelock(/datum/job/fax_responder, list( - JOB_POLICE_ROLES = 25 HOURS, JOB_COMMAND_ROLES = 75 HOURS, )) @@ -21,13 +20,18 @@ AddTimelock(/datum/job/fax_responder, list( title = JOB_FAX_RESPONDER_USCM_HC gear_preset = /datum/equipment_preset/fax_responder/uscm +AddTimelock(/datum/job/fax_responder/uscm_hc, list( + JOB_POLICE_ROLES = 25 HOURS, + JOB_COMMAND_ROLES = 75 HOURS, +)) + /datum/job/fax_responder/uscm_pvst title = JOB_FAX_RESPONDER_USCM_PVST gear_preset = /datum/equipment_preset/fax_responder/uscm/provost AddTimelock(/datum/job/fax_responder/uscm_pvst, list( JOB_POLICE_ROLES = 150 HOURS, - JOB_COMMAND_ROLES = 50 HOURS, + JOB_COMMAND_ROLES = 75 HOURS, )) /datum/job/fax_responder/wy @@ -49,3 +53,7 @@ AddTimelock(/datum/job/fax_responder/wy, list( /datum/job/fax_responder/clf title = JOB_FAX_RESPONDER_CLF gear_preset = /datum/equipment_preset/fax_responder/clf + +/datum/job/fax_responder/cmb + title = JOB_FAX_RESPONDER_CMB + gear_preset = /datum/equipment_preset/fax_responder/cmb diff --git a/code/modules/gear_presets/fax_responders.dm b/code/modules/gear_presets/fax_responders.dm index 78af5dc0bf8c..24a7666c02ca 100644 --- a/code/modules/gear_presets/fax_responders.dm +++ b/code/modules/gear_presets/fax_responders.dm @@ -9,13 +9,18 @@ faction = FACTION_NEUTRAL access = list(ACCESS_CIVILIAN_PUBLIC) - skills = /datum/skills/civilian + skills = /datum/skills/civilian/fax_responder idtype = /obj/item/card/id/lanyard + paygrades = list(PAY_SHORT_CIV = JOB_PLAYTIME_TIER_0) + + var/obj/item/device/radio/headset/headset_type = /obj/item/device/radio/headset + /datum/equipment_preset/fax_responder/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/tool/pen/fountain(new_human), WEAR_R_EAR) + new_human.equip_to_slot_or_del(new headset_type(new_human), WEAR_L_EAR) /datum/equipment_preset/fax_responder/load_id(mob/living/carbon/human/new_human, client/mob_client) @@ -36,6 +41,8 @@ idtype = /obj/item/card/id/gold skills = /datum/skills/XO access = list(ACCESS_MARINE_COMMAND, ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_DATABASE, ACCESS_MARINE_MEDBAY) + headset_type = /obj/item/device/radio/headset/almayer/highcom + idtype = /obj/item/card/id/gold /datum/equipment_preset/fax_responder/uscm/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/marine/dress_cover/officer(new_human), WEAR_HEAD) @@ -51,6 +58,7 @@ name = JOB_FAX_RESPONDER_USCM_PVST assignment = JOB_FAX_RESPONDER_USCM_PVST rank = JOB_FAX_RESPONDER_USCM_PVST + idtype = /obj/item/card/id/provost /datum/equipment_preset/fax_responder/uscm/provost/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/mp/provost/chief(new_human), WEAR_BODY) @@ -59,6 +67,7 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/provost/chief(new_human), WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/marine/mp/provost/chief(new_human), WEAR_HEAD) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud, WEAR_EYES) new_human.equip_to_slot_or_del(new /obj/item/notepad/red(new_human), WEAR_R_STORE) . = ..() @@ -70,6 +79,8 @@ assignment = JOB_FAX_RESPONDER_WY rank = JOB_FAX_RESPONDER_WY paygrades = list(PAY_SHORT_WYC5 = JOB_PLAYTIME_TIER_0, PAY_SHORT_WYC6 = JOB_PLAYTIME_TIER_1, PAY_SHORT_WYC7 = JOB_PLAYTIME_TIER_3) + headset_type = /obj/item/device/radio/headset/distress/pmc/command + idtype = /obj/item/card/id/pmc /datum/equipment_preset/fax_responder/wey_yu/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/blue(new_human), WEAR_BODY) @@ -87,6 +98,8 @@ rank = JOB_FAX_RESPONDER_UPP paygrades = list(PAY_SHORT_UO2 = JOB_PLAYTIME_TIER_0, PAY_SHORT_UO3 = JOB_PLAYTIME_TIER_1, PAY_SHORT_UO4 = JOB_PLAYTIME_TIER_3) skills = /datum/skills/upp/kapitan + headset_type = /obj/item/device/radio/headset/distress/UPP/kdo/command + idtype = /obj/item/card/id/gold /datum/equipment_preset/fax_responder/upp/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/beret, WEAR_HEAD) @@ -95,7 +108,7 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp, WEAR_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp/naval, WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp/knife, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp, WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) new_human.equip_to_slot_or_del(new /obj/item/notepad/green(new_human), WEAR_R_STORE) @@ -107,6 +120,9 @@ name = JOB_FAX_RESPONDER_TWE assignment = JOB_FAX_RESPONDER_TWE rank = JOB_FAX_RESPONDER_TWE + headset_type = /obj/item/device/radio/headset/distress/royal_marine + idtype = /obj/item/card/id/gold + paygrades = list(PAY_SHORT_RNO2 = JOB_PLAYTIME_TIER_0, PAY_SHORT_RNO3 = JOB_PLAYTIME_TIER_1, PAY_SHORT_RNO4 = JOB_PLAYTIME_TIER_3) /datum/equipment_preset/fax_responder/twe/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/twe_suit(new_human), WEAR_BODY) @@ -122,3 +138,29 @@ name = JOB_FAX_RESPONDER_CLF assignment = JOB_FAX_RESPONDER_CLF rank = JOB_FAX_RESPONDER_CLF + headset_type = /obj/item/device/radio/headset/distress/CLF/command + paygrades = list(PAY_SHORT_REBC = JOB_PLAYTIME_TIER_0) + +/datum/equipment_preset/fax_responder/clf/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/clf(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp(new_human), WEAR_FEET) + +//*****************************************************************************************************/ + +/datum/equipment_preset/fax_responder/cmb + name = JOB_FAX_RESPONDER_CMB + assignment = JOB_FAX_RESPONDER_CMB + rank = JOB_FAX_RESPONDER_CMB + headset_type = /obj/item/device/radio/headset/distress/CMB + idtype = /obj/item/card/id/marshal + paygrades = list(PAY_SHORT_CMBM = JOB_PLAYTIME_TIER_0) + +/datum/equipment_preset/fax_responder/cmb/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/CM_uniform, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/holobadge/cord, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/CMB/marshal, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/CMB, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud, WEAR_EYES) From 84c6b0a97d49d587e96a874a620a44bc6ef66076 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Wed, 11 Sep 2024 00:14:55 +0100 Subject: [PATCH 13/50] single target faxes --- code/game/machinery/fax_machine.dm | 178 +++++++++++++++++------------ 1 file changed, 104 insertions(+), 74 deletions(-) diff --git a/code/game/machinery/fax_machine.dm b/code/game/machinery/fax_machine.dm index 8ec3bd82033b..93b0bb357b82 100644 --- a/code/game/machinery/fax_machine.dm +++ b/code/game/machinery/fax_machine.dm @@ -1,5 +1,6 @@ -GLOBAL_LIST_INIT_TYPED(allfaxes, /obj/structure/machinery/faxmachine, list()) -GLOBAL_LIST_EMPTY(alldepartments) +GLOBAL_LIST_INIT_TYPED(all_faxmachines, /obj/structure/machinery/faxmachine, list()) +GLOBAL_LIST_EMPTY(all_fax_departments) +GLOBAL_LIST_EMPTY(all_faxcodes) #define DEPARTMENT_WY "Weyland-Yutani" #define DEPARTMENT_HC "USCM High Command" @@ -9,6 +10,7 @@ GLOBAL_LIST_EMPTY(alldepartments) #define DEPARTMENT_TWE "Three World Empire" #define DEPARTMENT_UPP "Union of Progress Peoples" #define DEPARTMENT_CLF "Colonial Liberation Front" +#define DEPARTMENT_TARGET "Specific Machine Code"//Used to send to a single specific machine. #define HIGHCOM_DEPARTMENTS list(DEPARTMENT_WY, DEPARTMENT_HC, DEPARTMENT_CMB, DEPARTMENT_PROVOST, DEPARTMENT_PRESS, DEPARTMENT_TWE, DEPARTMENT_UPP, DEPARTMENT_CLF) #define FAX_NET_USCM "USCM Encrypted Network" @@ -49,6 +51,7 @@ GLOBAL_LIST_EMPTY(alldepartments) ///Target department var/target_department = DEPARTMENT_WY + var/target_machine_id = "No ID Selected" // list for img and their photo reference to be stored into the admin's cache. var/list/photo_list = list() @@ -64,11 +67,14 @@ GLOBAL_LIST_EMPTY(alldepartments) /obj/structure/machinery/faxmachine/Initialize(mapload, ...) . = ..() - GLOB.allfaxes += src + GLOB.all_faxmachines += src update_departments() generate_id_tag() /obj/structure/machinery/faxmachine/proc/generate_id_tag() + if(machine_id_tag) + GLOB.all_faxcodes -= machine_id_tag + var/id_tag_prefix var/id_tag_suffix = "[rand(1000, 9999)][pick(GLOB.alphabet_uppercase)][pick(GLOB.alphabet_uppercase)]" var/id_tag_final @@ -102,9 +108,10 @@ GLOBAL_LIST_EMPTY(alldepartments) id_tag_final = "[id_tag_prefix]-[id_tag_suffix]" machine_id_tag = id_tag_final + GLOB.all_faxcodes += id_tag_final /obj/structure/machinery/faxmachine/Destroy() - GLOB.allfaxes -= src + GLOB.all_faxmachines -= src . = ..() /obj/structure/machinery/faxmachine/initialize_pass_flags(datum/pass_flags_container/PF) @@ -181,24 +188,26 @@ GLOBAL_LIST_EMPTY(alldepartments) return /obj/structure/machinery/faxmachine/proc/update_departments() - if( !("[department]" in GLOB.alldepartments) ) //Initialize departments. This will work with multiple fax machines. - GLOB.alldepartments += department - if(!(DEPARTMENT_WY in GLOB.alldepartments)) - GLOB.alldepartments += DEPARTMENT_WY - if(!(DEPARTMENT_HC in GLOB.alldepartments)) - GLOB.alldepartments += DEPARTMENT_HC - if(!(DEPARTMENT_PROVOST in GLOB.alldepartments)) - GLOB.alldepartments += DEPARTMENT_PROVOST - if(!(DEPARTMENT_CMB in GLOB.alldepartments)) - GLOB.alldepartments += DEPARTMENT_CMB - if(!(DEPARTMENT_PRESS in GLOB.alldepartments)) - GLOB.alldepartments += DEPARTMENT_PRESS - if(!(DEPARTMENT_TWE in GLOB.alldepartments)) - GLOB.alldepartments += DEPARTMENT_TWE - if(!(DEPARTMENT_UPP in GLOB.alldepartments)) - GLOB.alldepartments += DEPARTMENT_UPP - if(!(DEPARTMENT_CLF in GLOB.alldepartments)) - GLOB.alldepartments += DEPARTMENT_CLF + if(!(DEPARTMENT_TARGET in GLOB.all_fax_departments)) + GLOB.all_fax_departments += DEPARTMENT_TARGET + if( !("[department]" in GLOB.all_fax_departments) ) //Initialize departments. This will work with multiple fax machines. + GLOB.all_fax_departments += department + if(!(DEPARTMENT_WY in GLOB.all_fax_departments)) + GLOB.all_fax_departments += DEPARTMENT_WY + if(!(DEPARTMENT_HC in GLOB.all_fax_departments)) + GLOB.all_fax_departments += DEPARTMENT_HC + if(!(DEPARTMENT_PROVOST in GLOB.all_fax_departments)) + GLOB.all_fax_departments += DEPARTMENT_PROVOST + if(!(DEPARTMENT_CMB in GLOB.all_fax_departments)) + GLOB.all_fax_departments += DEPARTMENT_CMB + if(!(DEPARTMENT_PRESS in GLOB.all_fax_departments)) + GLOB.all_fax_departments += DEPARTMENT_PRESS + if(!(DEPARTMENT_TWE in GLOB.all_fax_departments)) + GLOB.all_fax_departments += DEPARTMENT_TWE + if(!(DEPARTMENT_UPP in GLOB.all_fax_departments)) + GLOB.all_fax_departments += DEPARTMENT_UPP + if(!(DEPARTMENT_CLF in GLOB.all_fax_departments)) + GLOB.all_fax_departments += DEPARTMENT_CLF // TGUI SHIT \\ @@ -234,7 +243,10 @@ GLOBAL_LIST_EMPTY(alldepartments) data["paper_name"] = original_fax.name data["authenticated"] = authenticated + data["target_department"] = target_department + if(target_department == DEPARTMENT_TARGET) + data["target_department"] = target_machine_id data["worldtime"] = world.time data["nextfaxtime"] = send_cooldown @@ -319,8 +331,15 @@ GLOBAL_LIST_EMPTY(alldepartments) if("select") var/last_target_department = target_department - target_department = tgui_input_list(ui.user, "Which department?", "Choose a department", GLOB.alldepartments) - if(!target_department) target_department = last_target_department + target_department = tgui_input_list(ui.user, "Which department?", "Choose a department", GLOB.all_fax_departments) + if(!target_department) + target_department = last_target_department + if(target_department == DEPARTMENT_TARGET) + var/new_target_machine_id = tgui_input_list(ui.user, "Which machine?", "Choose a machine code", GLOB.all_faxcodes) + if(!new_target_machine_id) + target_department = last_target_department + else + target_machine_id = new_target_machine_id . = TRUE if("auth") @@ -388,10 +407,13 @@ GLOBAL_LIST_EMPTY(alldepartments) GLOB.fax_contents += faxcontents var/scan_department = target_department + var/the_target_department = target_department if(department in HIGHCOM_DEPARTMENTS) scan_department = department + else if(target_department == DEPARTMENT_TARGET) + the_target_department = "Fax Machine [target_machine_id]" - var/msg_admin = SPAN_STAFF_IC("[target_department]: [key_name(user, 1)] ") + var/msg_admin = SPAN_STAFF_IC("[the_target_department]: [key_name(user, 1)] ") msg_admin += "[CC_MARK(user)] [ADMIN_PP(user)] [ADMIN_VV(user)] [ADMIN_SM(user)] [ADMIN_JMP_USER(user)] " switch(scan_department) @@ -425,7 +447,7 @@ GLOBAL_LIST_EMPTY(alldepartments) msg_admin += SPAN_STAFF_IC("Receiving fax via secure connection ... view message") - var/msg_ghost = SPAN_NOTICE("[target_department]: ") + var/msg_ghost = SPAN_NOTICE("[the_target_department]: ") msg_ghost += "Receiving fax via secure connection ... view message" send_fax(faxcontents) @@ -457,54 +479,62 @@ GLOBAL_LIST_EMPTY(alldepartments) /obj/structure/machinery/faxmachine/proc/send_fax(datum/fax/faxcontents) - for(var/obj/structure/machinery/faxmachine/F in GLOB.allfaxes) - if(F != src && F.department == target_department) - if(!faxcontents) - return - if(! (F.inoperable() ) ) - - flick("[initial(icon_state)]receive", F) - - // give the sprite some time to flick - spawn(30) - var/obj/item/paper/P = new(F.loc,faxcontents.photo_list) - P.name = "faxed message" - P.info = "[faxcontents.data]" - P.update_icon() - var/image/stampoverlay = image('icons/obj/items/paper.dmi') - var/encrypted = FALSE - - switch(network) - if(FAX_NET_USCM_HC) - stampoverlay.icon_state = "paper_stamp-uscm" - encrypted = TRUE - if(FAX_NET_CMB) - stampoverlay.icon_state = "paper_stamp-cmb" - network = "NC4 UA Federal Secure Network." - encrypted = TRUE - if(FAX_NET_WY_HC) - stampoverlay.icon_state = "paper_stamp-weyyu" - encrypted = TRUE - if(FAX_NET_TWE_HC) - stampoverlay.icon_state = "paper_stamp-twe" - encrypted = TRUE - if(FAX_NET_UPP_HC) - stampoverlay.icon_state = "paper_stamp-upp" - encrypted = TRUE - if(FAX_NET_CLF_HC) - stampoverlay.icon_state = "paper_stamp-clf" - encrypted = TRUE - - - if(encrypted) - if(!P.stamped) - P.stamped = new - P.stamped += /obj/item/tool/stamp - P.overlays += stampoverlay - P.stamps += "
This paper has been stamped and encrypted by the [network]." - else - P.stamps += "
This paper has been sent by [machine_id_tag]." - playsound(F.loc, "sound/items/polaroid1.ogg", 15, 1) + var/list/target_machines = list() + for(var/obj/structure/machinery/faxmachine/pos_target in GLOB.all_faxmachines) + if(target_department == DEPARTMENT_TARGET) + if(pos_target != src && pos_target.machine_id_tag == target_machine_id) + target_machines += pos_target + else + if(pos_target != src && pos_target.department == target_department) + target_machines += pos_target + + for(var/obj/structure/machinery/faxmachine/target in target_machines) + if(!faxcontents) + return + if(!(target.inoperable())) + + flick("[initial(icon_state)]receive", target) + + // give the sprite some time to flick + spawn(30) + var/obj/item/paper/P = new(target.loc,faxcontents.photo_list) + P.name = "faxed message" + P.info = "[faxcontents.data]" + P.update_icon() + var/image/stampoverlay = image('icons/obj/items/paper.dmi') + var/encrypted = FALSE + + switch(network) + if(FAX_NET_USCM_HC) + stampoverlay.icon_state = "paper_stamp-uscm" + encrypted = TRUE + if(FAX_NET_CMB) + stampoverlay.icon_state = "paper_stamp-cmb" + network = "NC4 UA Federal Secure Network." + encrypted = TRUE + if(FAX_NET_WY_HC) + stampoverlay.icon_state = "paper_stamp-weyyu" + encrypted = TRUE + if(FAX_NET_TWE_HC) + stampoverlay.icon_state = "paper_stamp-twe" + encrypted = TRUE + if(FAX_NET_UPP_HC) + stampoverlay.icon_state = "paper_stamp-upp" + encrypted = TRUE + if(FAX_NET_CLF_HC) + stampoverlay.icon_state = "paper_stamp-clf" + encrypted = TRUE + + + if(encrypted) + if(!P.stamped) + P.stamped = new + P.stamped += /obj/item/tool/stamp + P.overlays += stampoverlay + P.stamps += "
This paper has been stamped and encrypted by the [network]." + else + P.stamps += "
This paper has been sent by [machine_id_tag]." + playsound(target.loc, "sound/items/polaroid1.ogg", 15, 1) qdel(faxcontents) /obj/structure/machinery/faxmachine/cmb From 438c2c5362ffad2ca4cfbbb31c7e4619ffac442d Mon Sep 17 00:00:00 2001 From: forest2001 Date: Wed, 11 Sep 2024 00:42:07 +0100 Subject: [PATCH 14/50] fix dupes --- code/game/machinery/fax_machine.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/game/machinery/fax_machine.dm b/code/game/machinery/fax_machine.dm index 93b0bb357b82..2c5addb5e6d6 100644 --- a/code/game/machinery/fax_machine.dm +++ b/code/game/machinery/fax_machine.dm @@ -106,9 +106,15 @@ GLOBAL_LIST_EMPTY(all_faxcodes) if(!id_tag_final) id_tag_final = "[id_tag_prefix]-[id_tag_suffix]" + if(id_tag_final in GLOB.all_faxcodes) + generate_id_tag() + return FALSE machine_id_tag = id_tag_final + if(machine_id_tag == network) + return TRUE GLOB.all_faxcodes += id_tag_final + return TRUE /obj/structure/machinery/faxmachine/Destroy() GLOB.all_faxmachines -= src From fee7f90cf489ca503a302302c1a2997cfb33617d Mon Sep 17 00:00:00 2001 From: forest2001 Date: Wed, 11 Sep 2024 00:52:51 +0100 Subject: [PATCH 15/50] compat --- code/modules/gear_presets/fax_responders.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/gear_presets/fax_responders.dm b/code/modules/gear_presets/fax_responders.dm index 24a7666c02ca..0a0f941183f6 100644 --- a/code/modules/gear_presets/fax_responders.dm +++ b/code/modules/gear_presets/fax_responders.dm @@ -19,7 +19,6 @@ /datum/equipment_preset/fax_responder/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/tool/pen/fountain(new_human), WEAR_R_EAR) new_human.equip_to_slot_or_del(new headset_type(new_human), WEAR_L_EAR) From 9d60ee8d0dfbd7c3dae1fe3ffeaa2c3cadd0df86 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Wed, 11 Sep 2024 04:17:54 +0100 Subject: [PATCH 16/50] map tweak and cmb --- code/game/gamemodes/cm_initialize.dm | 2 +- .../objects/effects/landmarks/landmarks.dm | 4 +- .../lazy_templates/fax_responder_base.dmm | 983 +++++++++--------- 3 files changed, 509 insertions(+), 480 deletions(-) diff --git a/code/game/gamemodes/cm_initialize.dm b/code/game/gamemodes/cm_initialize.dm index 508063b37a1d..b5a0b48c18dc 100644 --- a/code/game/gamemodes/cm_initialize.dm +++ b/code/game/gamemodes/cm_initialize.dm @@ -303,7 +303,7 @@ Additional game mode variables. if(!new_responder) return FALSE - message_admins("([new_responder.key]) joined as a Fax Responder, [new_responder.real_name].") + message_admins(SPAN_HIGHDANGER("([new_responder.key]) joined as a Fax Responder, [new_responder.real_name].")) if(responder_candidate) responder_candidate.moveToNullspace() //Nullspace it for garbage collection later. diff --git a/code/game/objects/effects/landmarks/landmarks.dm b/code/game/objects/effects/landmarks/landmarks.dm index d3ba4fd3215a..4988e60e0014 100644 --- a/code/game/objects/effects/landmarks/landmarks.dm +++ b/code/game/objects/effects/landmarks/landmarks.dm @@ -477,7 +477,9 @@ name = "CLF Fax Responder late join" job = JOB_FAX_RESPONDER_CLF - +/obj/effect/landmark/late_join/responder/cmb + name = "CMB Fax Responder late join" + job = JOB_FAX_RESPONDER_CMB //****************************************** STATIC COMMS ************************************************// /obj/effect/landmark/static_comms diff --git a/maps/templates/lazy_templates/fax_responder_base.dmm b/maps/templates/lazy_templates/fax_responder_base.dmm index 7af99a93240c..35e41ac4143e 100644 --- a/maps/templates/lazy_templates/fax_responder_base.dmm +++ b/maps/templates/lazy_templates/fax_responder_base.dmm @@ -41,9 +41,8 @@ }, /turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) -"dc" = ( -/obj/structure/bed, -/obj/item/bedsheet/ce, +"fr" = ( +/obj/structure/machinery/cryopod, /turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) "gu" = ( @@ -163,6 +162,25 @@ }, /turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) +"pu" = ( +/obj/structure/machinery/door_control/brbutton{ + pixel_y = 24; + id = "Faxes" + }, +/turf/open/floor/plating, +/area/adminlevel/ert_station/fax_response_station) +"pH" = ( +/obj/structure/machinery/door/airlock/almayer/maint/reinforced/colony{ + dir = 1 + }, +/obj/structure/machinery/door/poddoor/almayer{ + unacidable = 1; + use_power = 0; + needs_power = 0; + id = "Faxes" + }, +/turf/open/floor/almayer/test_floor4, +/area/adminlevel/ert_station/fax_response_station) "rV" = ( /obj/effect/landmark/late_join/responder/uscm/provost, /turf/open/floor/wood/ship, @@ -208,6 +226,9 @@ }, /turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) +"vc" = ( +/turf/open/floor/plating, +/area/adminlevel/ert_station/fax_response_station) "wx" = ( /obj/structure/surface/table/woodentable/fancy, /obj/structure/machinery/computer/crew/alt{ @@ -243,6 +264,17 @@ hull = 1 }, /area/adminlevel/ert_station/fax_response_station) +"wK" = ( +/obj/structure/machinery/door/airlock/almayer/maint/reinforced/colony, +/obj/structure/machinery/door/poddoor/almayer{ + unacidable = 1; + use_power = 0; + needs_power = 0; + dir = 4; + id = "Faxes" + }, +/turf/open/floor/almayer/test_floor4, +/area/adminlevel/ert_station/fax_response_station) "xb" = ( /obj/effect/landmark/late_join/responder/wey_yu, /turf/open/floor/wood/ship, @@ -339,7 +371,7 @@ "BC" = ( /turf/closed/wall/r_wall/biodome/biodome_unmeltable, /area/adminlevel/ert_station/fax_response_station) -"BQ" = ( +"BL" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/folder/red{ pixel_x = 6 @@ -351,7 +383,7 @@ pixel_x = -6; pixel_y = 6; networks_transmit = list("USCM","Colonist","Colonial Marshal","Fax Responders"); - phone_id = "UPP High Command"; + phone_id = "Colonial Marshal Bureau"; phone_category = "Comms Relay"; networks_receive = list("Fax Responders"); phone_color = "green" @@ -441,11 +473,6 @@ }, /turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) -"HL" = ( -/obj/item/bedsheet/ce, -/obj/structure/bed, -/turf/open/floor/wood/ship, -/area/adminlevel/ert_station/fax_response_station) "NP" = ( /obj/structure/machinery/light, /obj/structure/surface/table/woodentable/fancy, @@ -789,17 +816,17 @@ Yy Yy Yy Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy +Ei +Ei +Ei +Ei +Ei +Ei +Ei +Ei +Ei +Ei +Ei Yy Yy Yy @@ -836,17 +863,17 @@ Yy Yy Yy Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy +Ei +YR +CT +rV +fr +Ei +nB +CT +YO +fr +Ei Yy Yy Yy @@ -881,6 +908,21 @@ Yy Yy Yy Yy +xX +xX +Ei +EI +gu +gu +gu +Pn +EI +gu +gu +gu +Ei +xX +xX Yy Yy Yy @@ -901,6 +943,8 @@ Yy Yy Yy Yy +"} +(8,1,1) = {" Yy Yy Yy @@ -911,13 +955,26 @@ Yy Yy Yy Yy +xX +vc +pH +gu +gu +gu +gu +Pn +gu +gu +gu +gu +pH +vc +xX Yy Yy Yy Yy Yy -"} -(8,1,1) = {" Yy Yy Yy @@ -933,6 +990,8 @@ Yy Yy Yy Yy +"} +(9,1,1) = {" Yy Yy Yy @@ -943,6 +1002,21 @@ Yy Yy Yy Yy +xX +vc +Ei +gu +gu +gu +gu +Pn +gu +gu +gu +gu +Ei +vc +xX Yy Yy Yy @@ -964,7 +1038,7 @@ Yy Yy Yy "} -(9,1,1) = {" +(10,1,1) = {" Yy Yy Yy @@ -975,6 +1049,21 @@ Yy Yy Yy Yy +xX +vc +Ei +UB +ST +gu +NP +Pn +ov +ST +gu +tq +Ei +vc +xX Yy Yy Yy @@ -995,6 +1084,8 @@ Yy Yy Yy Yy +"} +(11,1,1) = {" Yy Yy Yy @@ -1005,13 +1096,26 @@ Yy Yy Yy Yy +xX +vc +Ei +Ab +bT +Bp +sx +Ei +Ab +bT +Bp +sx +Ei +vc +xX Yy Yy Yy Yy Yy -"} -(10,1,1) = {" Yy Yy Yy @@ -1027,6 +1131,8 @@ Yy Yy Yy Yy +"} +(12,1,1) = {" Yy Yy Yy @@ -1037,6 +1143,21 @@ Yy Yy Yy Yy +xX +vc +Ei +Ei +Ei +Ei +Ei +Ei +Ei +Ei +Ei +Ei +Ei +vc +xX Yy Yy Yy @@ -1058,7 +1179,7 @@ Yy Yy Yy "} -(11,1,1) = {" +(13,1,1) = {" Yy Yy Yy @@ -1069,6 +1190,21 @@ Yy Yy Yy Yy +xX +vc +vc +vc +vc +vc +vc +vc +vc +vc +vc +vc +vc +vc +xX Yy Yy Yy @@ -1089,6 +1225,8 @@ Yy Yy Yy Yy +"} +(14,1,1) = {" Yy Yy Yy @@ -1099,13 +1237,26 @@ Yy Yy Yy Yy +xX +xX +xX +xX +xX +xX +xX +vc +xX +xX +xX +xX +xX +xX +xX Yy Yy Yy Yy Yy -"} -(12,1,1) = {" Yy Yy Yy @@ -1121,6 +1272,8 @@ Yy Yy Yy Yy +"} +(15,1,1) = {" Yy Yy Yy @@ -1131,6 +1284,21 @@ Yy Yy Yy Yy +xX +BC +BC +BC +BC +BC +BC +vc +wz +wz +wz +wz +wz +wz +xX Yy Yy Yy @@ -1152,11 +1320,7 @@ Yy Yy Yy "} -(13,1,1) = {" -Yy -Yy -Yy -Yy +(16,1,1) = {" Yy Yy Yy @@ -1164,20 +1328,24 @@ Yy Yy Yy Yy -Ei -Ei -Ei -Ei -Ei -Ei -Ei -Ei -Ei -Ei -Ei Yy Yy Yy +xX +BC +YR +CT +xb +fr +BC +vc +wz +YR +CT +VV +fr +wz +xX Yy Yy Yy @@ -1199,11 +1367,7 @@ Yy Yy Yy "} -(14,1,1) = {" -Yy -Yy -Yy -Yy +(17,1,1) = {" Yy Yy Yy @@ -1211,20 +1375,24 @@ Yy Yy Yy Yy -Ei -YR -CT -rV -HL -Ei -nB -CT -YO -dc -Ei Yy Yy Yy +xX +BC +EI +gu +gu +gu +BC +vc +wz +Ba +gu +gu +gu +wz +xX Yy Yy Yy @@ -1246,8 +1414,7 @@ Yy Yy Yy "} -(15,1,1) = {" -Yy +(18,1,1) = {" Yy Yy Yy @@ -1258,20 +1425,21 @@ Yy Yy Yy Yy -Ei -EI +xX +BC gu gu gu -Pn -Ba gu +pH +vc +pH gu gu -Ei -Yy -Yy -Yy +gu +gu +wz +xX Yy Yy Yy @@ -1293,55 +1461,7 @@ Yy Yy Yy "} -(16,1,1) = {" -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Ei -gu -gu -gu -gu -Pn -gu -gu -gu -gu -Ei -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -"} -(17,1,1) = {" -Yy +(19,1,1) = {" Yy Yy Yy @@ -1352,20 +1472,21 @@ Yy Yy Yy Yy -Ei -UB +xX +BC +FD ST gu -NP -Pn -ov +FB +BC +vc +wz +Wp ST gu -tq -Ei -Yy -Yy -Yy +am +wz +xX Yy Yy Yy @@ -1387,8 +1508,7 @@ Yy Yy Yy "} -(18,1,1) = {" -Yy +(20,1,1) = {" Yy Yy Yy @@ -1399,20 +1519,21 @@ Yy Yy Yy Yy -Ei -Ab -bT +xX +BC +EK +im Bp sx -Ei -Ab -bT +BC +vc +wz +id +Vs Bp sx -Ei -Yy -Yy -Yy +wz +xX Yy Yy Yy @@ -1434,8 +1555,7 @@ Yy Yy Yy "} -(19,1,1) = {" -Yy +(21,1,1) = {" Yy Yy Yy @@ -1446,20 +1566,21 @@ Yy Yy Yy Yy -Ei -Ei -Ei -Ei -Ei -Ei -Ei -Ei -Ei -Ei -Ei -Yy -Yy -Yy +xX +BC +BC +BC +BC +BC +BC +vc +wz +wz +wz +wz +wz +wz +xX Yy Yy Yy @@ -1481,22 +1602,7 @@ Yy Yy Yy "} -(20,1,1) = {" -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy +(22,1,1) = {" Yy Yy Yy @@ -1507,6 +1613,21 @@ Yy Yy Yy Yy +xX +xX +xX +xX +xX +xX +xX +pu +xX +xX +xX +xX +xX +xX +xX Yy Yy Yy @@ -1528,22 +1649,7 @@ Yy Yy Yy "} -(21,1,1) = {" -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy +(23,1,1) = {" Yy Yy Yy @@ -1554,6 +1660,21 @@ Yy Yy Yy Yy +xX +xX +xX +xX +xX +xX +xX +vc +xX +xX +xX +xX +xX +xX +xX Yy Yy Yy @@ -1575,22 +1696,7 @@ Yy Yy Yy "} -(22,1,1) = {" -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy +(24,1,1) = {" Yy Yy Yy @@ -1601,6 +1707,21 @@ Yy Yy Yy Yy +xX +jh +jh +jh +jh +jh +jh +vc +xc +xc +xc +xc +xc +xc +xX Yy Yy Yy @@ -1622,8 +1743,7 @@ Yy Yy Yy "} -(23,1,1) = {" -Yy +(25,1,1) = {" Yy Yy Yy @@ -1632,77 +1752,26 @@ Yy Yy Yy Yy -BC -BC -BC -BC -BC -BC -Yy -Yy -Yy -wz -wz -wz -wz -wz -wz -Yy Yy Yy xX -xX -xX -xX -xX -xX -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -"} -(24,1,1) = {" -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -BC +jh YR CT -xb -HL -BC -Yy -Yy -Yy -wz +tM +fr +jh +vc +xc YR CT -VV -HL -wz +XZ +fr +xc +xX Yy Yy Yy -xX -YR -CT -gu -HL -xX Yy Yy Yy @@ -1715,135 +1784,49 @@ Yy Yy Yy Yy -"} -(25,1,1) = {" Yy Yy Yy Yy Yy +"} +(26,1,1) = {" Yy Yy Yy Yy -BC -Ba -gu -gu -gu -BC Yy Yy Yy -wz -Ba -gu -gu -gu -wz Yy Yy Yy xX +jh Ba gu gu gu -xX -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -"} -(26,1,1) = {" -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -BC -FD -ST +jh +vc +xc +Ba gu -FB -BC -Yy -Yy -Yy -wz -Wp -ST gu -am -wz -Yy -Yy -Yy -xX -ny -ST gu -BQ -xX -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -"} -(27,1,1) = {" -Yy -Yy -Yy -Yy +xc +xX Yy Yy Yy Yy Yy -BC -EK -im -Bp -sx -BC Yy Yy Yy -wz -id -Vs -Bp -sx -wz Yy Yy Yy -xX -wx -Vs -Bp -sx -xX Yy Yy Yy @@ -1853,11 +1836,11 @@ Yy Yy Yy Yy +"} +(27,1,1) = {" Yy Yy Yy -"} -(28,1,1) = {" Yy Yy Yy @@ -1865,32 +1848,29 @@ Yy Yy Yy Yy +xX +jh +gu +gu +gu +gu +pH +vc +pH +gu +gu +gu +gu +xc +xX Yy Yy -BC -BC -BC -BC -BC -BC Yy Yy Yy -wz -wz -wz -wz -wz -wz Yy Yy Yy -xX -xX -xX -xX -xX -xX Yy Yy Yy @@ -1904,7 +1884,7 @@ Yy Yy Yy "} -(29,1,1) = {" +(28,1,1) = {" Yy Yy Yy @@ -1915,6 +1895,21 @@ Yy Yy Yy Yy +xX +jh +uX +ST +gu +Yv +jh +vc +xc +oA +ST +gu +jV +xc +xX Yy Yy Yy @@ -1935,6 +1930,8 @@ Yy Yy Yy Yy +"} +(29,1,1) = {" Yy Yy Yy @@ -1945,13 +1942,26 @@ Yy Yy Yy Yy +xX +jh +Rh +Vs +Bp +sx +jh +vc +xc +yv +Vs +Bp +sx +xc +xX Yy Yy Yy Yy Yy -"} -(30,1,1) = {" Yy Yy Yy @@ -1967,6 +1977,8 @@ Yy Yy Yy Yy +"} +(30,1,1) = {" Yy Yy Yy @@ -1977,6 +1989,21 @@ Yy Yy Yy Yy +xX +jh +jh +jh +jh +jh +jh +vc +xc +xc +xc +xc +xc +xc +xX Yy Yy Yy @@ -2009,6 +2036,21 @@ Yy Yy Yy Yy +xX +xX +xX +xX +xX +xX +xX +vc +xX +xX +xX +xX +xX +xX +xX Yy Yy Yy @@ -2029,6 +2071,8 @@ Yy Yy Yy Yy +"} +(32,1,1) = {" Yy Yy Yy @@ -2044,9 +2088,10 @@ Yy Yy Yy Yy -"} -(32,1,1) = {" Yy +xX +vc +xX Yy Yy Yy @@ -2055,21 +2100,9 @@ Yy Yy Yy Yy -jh -jh -jh -jh -jh -jh Yy Yy Yy -xc -xc -xc -xc -xc -xc Yy Yy Yy @@ -2085,14 +2118,14 @@ Yy Yy Yy Yy +"} +(33,1,1) = {" Yy Yy Yy Yy Yy Yy -"} -(33,1,1) = {" Yy Yy Yy @@ -2101,22 +2134,16 @@ Yy Yy Yy Yy +xX +xX +xX +wK +xX +xX Yy -jh -YR -CT -tM -HL -jh Yy Yy Yy -xc -YR -CT -XZ -HL -xc Yy Yy Yy @@ -2149,21 +2176,21 @@ Yy Yy Yy Yy -jh -Ba -gu -gu -gu -jh Yy Yy Yy -xc -Ba -gu -gu +Yy +Yy +xX +nB +CT gu -xc +fr +xX +Yy +Yy +Yy +Yy Yy Yy Yy @@ -2196,21 +2223,21 @@ Yy Yy Yy Yy -jh -uX -ST -gu -Yv -jh Yy Yy Yy -xc -oA -ST +Yy +Yy +xX +EI gu -jV -xc +gu +gu +xX +Yy +Yy +Yy +Yy Yy Yy Yy @@ -2243,23 +2270,17 @@ Yy Yy Yy Yy -jh -Rh -Vs -Bp -sx -jh Yy Yy Yy -xc -yv -Vs -Bp -sx -xc Yy Yy +xX +gu +gu +gu +gu +xX Yy Yy Yy @@ -2279,32 +2300,20 @@ Yy Yy Yy Yy -"} -(37,1,1) = {" Yy Yy Yy Yy Yy Yy +"} +(37,1,1) = {" Yy Yy Yy -jh -jh -jh -jh -jh -jh Yy Yy Yy -xc -xc -xc -xc -xc -xc Yy Yy Yy @@ -2313,6 +2322,12 @@ Yy Yy Yy Yy +xX +ny +ST +gu +BL +xX Yy Yy Yy @@ -2326,8 +2341,6 @@ Yy Yy Yy Yy -"} -(38,1,1) = {" Yy Yy Yy @@ -2340,6 +2353,8 @@ Yy Yy Yy Yy +"} +(38,1,1) = {" Yy Yy Yy @@ -2354,6 +2369,12 @@ Yy Yy Yy Yy +xX +wx +Vs +Bp +sx +xX Yy Yy Yy @@ -2373,14 +2394,14 @@ Yy Yy Yy Yy -"} -(39,1,1) = {" Yy Yy Yy Yy Yy Yy +"} +(39,1,1) = {" Yy Yy Yy @@ -2395,6 +2416,12 @@ Yy Yy Yy Yy +xX +xX +xX +xX +xX +xX Yy Yy Yy From 78f356cad53ac9e244dba3db022f8fb97ca04276 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Wed, 11 Sep 2024 04:20:02 +0100 Subject: [PATCH 17/50] s --- maps/templates/lazy_templates/fax_responder_base.dmm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/maps/templates/lazy_templates/fax_responder_base.dmm b/maps/templates/lazy_templates/fax_responder_base.dmm index 35e41ac4143e..0b5ef1e58bab 100644 --- a/maps/templates/lazy_templates/fax_responder_base.dmm +++ b/maps/templates/lazy_templates/fax_responder_base.dmm @@ -229,6 +229,10 @@ "vc" = ( /turf/open/floor/plating, /area/adminlevel/ert_station/fax_response_station) +"wv" = ( +/obj/effect/landmark/late_join/responder/cmb, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) "wx" = ( /obj/structure/surface/table/woodentable/fancy, /obj/structure/machinery/computer/crew/alt{ @@ -2184,7 +2188,7 @@ Yy xX nB CT -gu +wv fr xX Yy From f3e3faefabf0d738362bf8e6c9af317c4cdebcd7 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Wed, 11 Sep 2024 04:47:42 +0100 Subject: [PATCH 18/50] latejoin fix --- code/game/jobs/job/special/responders.dm | 2 ++ code/game/machinery/cryopod.dm | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/code/game/jobs/job/special/responders.dm b/code/game/jobs/job/special/responders.dm index 744f26cb72b8..ab5bb294b26f 100644 --- a/code/game/jobs/job/special/responders.dm +++ b/code/game/jobs/job/special/responders.dm @@ -6,6 +6,8 @@ total_positions = 1 spawn_positions = 1 + late_joinable = FALSE + flags_startup_parameters = ROLE_ADMIN_NOTIFY|ROLE_WHITELISTED|ROLE_NO_ACCOUNT|ROLE_CUSTOM_SPAWN|ROLE_HIDDEN flags_whitelist = WHITELIST_FAX_RESPONDER diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index cb1a812aa07e..4baaafd9eb01 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -232,7 +232,7 @@ GLOBAL_LIST_INIT(frozen_items, list(SQUAD_MARINE_1 = list(), SQUAD_MARINE_2 = li dept_console = GLOB.frozen_items["Eng"] if(JOB_PREDATOR) dept_console = GLOB.frozen_items["Yautja"] - if(JOB_FAX_RESPONDER_USCM_HC, JOB_FAX_RESPONDER_USCM_PVST, JOB_FAX_RESPONDER_WY, JOB_FAX_RESPONDER_TWE, JOB_FAX_RESPONDER_UPP, JOB_FAX_RESPONDER_CLF) + if(JOB_FAX_RESPONDER_USCM_HC, JOB_FAX_RESPONDER_USCM_PVST, JOB_FAX_RESPONDER_WY, JOB_FAX_RESPONDER_TWE, JOB_FAX_RESPONDER_UPP, JOB_FAX_RESPONDER_CLF, JOB_FAX_RESPONDER_CMB) dept_console = GLOB.frozen_items["Responders"] H.species.handle_cryo(H) From 77aba18d9b61bd77406e6a686d90269733f2a001 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Wed, 11 Sep 2024 18:43:09 +0100 Subject: [PATCH 19/50] WL test fix --- code/game/jobs/job/special/responders.dm | 9 +++++---- code/modules/client/client_procs.dm | 5 ++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/code/game/jobs/job/special/responders.dm b/code/game/jobs/job/special/responders.dm index ab5bb294b26f..911a6b1350c5 100644 --- a/code/game/jobs/job/special/responders.dm +++ b/code/game/jobs/job/special/responders.dm @@ -14,10 +14,6 @@ gear_preset = /datum/equipment_preset/fax_responder entry_message_body = "Your job is to answer faxes sent to your fax machine. You are answering on behalf of the CMSS13 staff team and are therefore expected to behave appropriately. You are not able to authorise ERTs." -AddTimelock(/datum/job/fax_responder, list( - JOB_COMMAND_ROLES = 75 HOURS, -)) - /datum/job/fax_responder/uscm_hc title = JOB_FAX_RESPONDER_USCM_HC gear_preset = /datum/equipment_preset/fax_responder/uscm @@ -59,3 +55,8 @@ AddTimelock(/datum/job/fax_responder/wy, list( /datum/job/fax_responder/cmb title = JOB_FAX_RESPONDER_CMB gear_preset = /datum/equipment_preset/fax_responder/cmb + +AddTimelock(/datum/job/fax_responder/uscm_pvst, list( + JOB_POLICE_ROLES = 75 HOURS, + JOB_COMMAND_ROLES = 25 HOURS, +)) diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index 87574cadbebf..08e4b2f8567e 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -882,7 +882,10 @@ GLOBAL_LIST_INIT(whitelisted_client_procs, list( if((flag_to_check & WHITELIST_MENTOR) && CLIENT_IS_MENTOR(src)) return TRUE - if(CLIENT_IS_STAFF(src) && (flag_to_check & WHITELIST_JOE|WHITELIST_FAX_RESPONDER)) + if((flag_to_check & WHITELIST_JOE) && CLIENT_IS_STAFF(src)) + return TRUE + + if((flag_to_check & WHITELIST_FAX_RESPONDER) && CLIENT_IS_STAFF(src)) return TRUE if(!player_data) From 4a9cf67078c78e0bb417b30f090d63134f0a966a Mon Sep 17 00:00:00 2001 From: forest2001 Date: Thu, 12 Sep 2024 13:21:04 +0100 Subject: [PATCH 20/50] rebrand F --- code/__DEFINES/job.dm | 15 +- code/__DEFINES/urls.dm | 1 + code/game/jobs/job/special/responders.dm | 19 +- code/modules/gear_presets/fax_responders.dm | 14 +- .../lazy_templates/fax_responder_base.dmm | 210 +++++++++--------- 5 files changed, 137 insertions(+), 122 deletions(-) diff --git a/code/__DEFINES/job.dm b/code/__DEFINES/job.dm index 7372c6717b71..a2dfbb559769 100644 --- a/code/__DEFINES/job.dm +++ b/code/__DEFINES/job.dm @@ -370,14 +370,15 @@ GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST) #define DUTCH_JOB_LIST list(JOB_DUTCH_ARNOLD, JOB_DUTCH_RIFLEMAN, JOB_DUTCH_MINIGUNNER, JOB_DUTCH_FLAMETHROWER, JOB_DUTCH_MEDIC) //---------- RESPONDERS ----------// +/// This root job should never appear ingame, it's used to select the character slot. #define JOB_FAX_RESPONDER "Fax Responder" -#define JOB_FAX_RESPONDER_USCM_HC "USCM HC Fax Responder" -#define JOB_FAX_RESPONDER_USCM_PVST "USCM Provost Fax Responder" -#define JOB_FAX_RESPONDER_WY "Weyland-Yutani Fax Responder" -#define JOB_FAX_RESPONDER_UPP "UPP Fax Responder" -#define JOB_FAX_RESPONDER_TWE "TWE Fax Responder" -#define JOB_FAX_RESPONDER_CLF "CLF Fax Responder" -#define JOB_FAX_RESPONDER_CMB "CMB Fax Responder" +#define JOB_FAX_RESPONDER_USCM_HC "USCM-HC Communications Officer" +#define JOB_FAX_RESPONDER_USCM_PVST "Provost Communications Officer" +#define JOB_FAX_RESPONDER_WY "WY Communications Executive" +#define JOB_FAX_RESPONDER_UPP "UPP Communications Officer" +#define JOB_FAX_RESPONDER_TWE "TWE Communications Officer" +#define JOB_FAX_RESPONDER_CLF "CLF Information Correspondant" +#define JOB_FAX_RESPONDER_CMB "CMB Deputy Operations Officer" #define FAX_RESPONDER_JOB_LIST list(JOB_FAX_RESPONDER_USCM_HC, JOB_FAX_RESPONDER_USCM_PVST, JOB_FAX_RESPONDER_WY, JOB_FAX_RESPONDER_UPP, JOB_FAX_RESPONDER_TWE, JOB_FAX_RESPONDER_CLF, JOB_FAX_RESPONDER_CMB) diff --git a/code/__DEFINES/urls.dm b/code/__DEFINES/urls.dm index 5d3fca1a2032..2745b41336d4 100644 --- a/code/__DEFINES/urls.dm +++ b/code/__DEFINES/urls.dm @@ -9,3 +9,4 @@ #define URL_WIKI_MACROS "Macros" #define URL_WIKI_SOP "Standard_Operating_Procedure" #define URL_WIKI_CO_RULES "CO_Council_Rulings" +#define URL_WIKI_FAX_RESPONDER "Fax_Responder" diff --git a/code/game/jobs/job/special/responders.dm b/code/game/jobs/job/special/responders.dm index 911a6b1350c5..9bc5d88b9d19 100644 --- a/code/game/jobs/job/special/responders.dm +++ b/code/game/jobs/job/special/responders.dm @@ -11,8 +11,9 @@ flags_startup_parameters = ROLE_ADMIN_NOTIFY|ROLE_WHITELISTED|ROLE_NO_ACCOUNT|ROLE_CUSTOM_SPAWN|ROLE_HIDDEN flags_whitelist = WHITELIST_FAX_RESPONDER - gear_preset = /datum/equipment_preset/fax_responder - entry_message_body = "Your job is to answer faxes sent to your fax machine. You are answering on behalf of the CMSS13 staff team and are therefore expected to behave appropriately. You are not able to authorise ERTs." +/datum/job/fax_responder/on_config_load() + entry_message_body = "Your job is to answer faxes sent to your fax machine. You are answering on behalf of the CMSS13 staff team and are therefore expected to behave appropriately. Failure to adhere to expectations may result in loss of the role or a server ban. Non-staff players of this role are not able to authorise ERTs through their faxes." + return ..() /datum/job/fax_responder/uscm_hc title = JOB_FAX_RESPONDER_USCM_HC @@ -44,19 +45,31 @@ AddTimelock(/datum/job/fax_responder/wy, list( title = JOB_FAX_RESPONDER_UPP gear_preset = /datum/equipment_preset/fax_responder/upp +AddTimelock(/datum/job/fax_responder/upp, list( + JOB_COMMAND_ROLES = 75 HOURS, +)) + /datum/job/fax_responder/twe title = JOB_FAX_RESPONDER_TWE gear_preset = /datum/equipment_preset/fax_responder/twe +AddTimelock(/datum/job/fax_responder/twe, list( + JOB_COMMAND_ROLES = 75 HOURS, +)) + /datum/job/fax_responder/clf title = JOB_FAX_RESPONDER_CLF gear_preset = /datum/equipment_preset/fax_responder/clf +AddTimelock(/datum/job/fax_responder/clf, list( + JOB_COMMAND_ROLES = 75 HOURS, +)) + /datum/job/fax_responder/cmb title = JOB_FAX_RESPONDER_CMB gear_preset = /datum/equipment_preset/fax_responder/cmb -AddTimelock(/datum/job/fax_responder/uscm_pvst, list( +AddTimelock(/datum/job/fax_responder/cmb, list( JOB_POLICE_ROLES = 75 HOURS, JOB_COMMAND_ROLES = 25 HOURS, )) diff --git a/code/modules/gear_presets/fax_responders.dm b/code/modules/gear_presets/fax_responders.dm index 0a0f941183f6..7c1b00118f32 100644 --- a/code/modules/gear_presets/fax_responders.dm +++ b/code/modules/gear_presets/fax_responders.dm @@ -32,7 +32,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/fax_responder/uscm - name = JOB_FAX_RESPONDER_USCM_HC + name = "Fax Responder - USCM HC" assignment = JOB_FAX_RESPONDER_USCM_HC rank = JOB_FAX_RESPONDER_USCM_HC @@ -54,7 +54,7 @@ . = ..() /datum/equipment_preset/fax_responder/uscm/provost - name = JOB_FAX_RESPONDER_USCM_PVST + name = "Fax Responder - USCM Provost" assignment = JOB_FAX_RESPONDER_USCM_PVST rank = JOB_FAX_RESPONDER_USCM_PVST idtype = /obj/item/card/id/provost @@ -74,7 +74,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/fax_responder/wey_yu - name = JOB_FAX_RESPONDER_WY + name = "Fax Responder - WY" assignment = JOB_FAX_RESPONDER_WY rank = JOB_FAX_RESPONDER_WY paygrades = list(PAY_SHORT_WYC5 = JOB_PLAYTIME_TIER_0, PAY_SHORT_WYC6 = JOB_PLAYTIME_TIER_1, PAY_SHORT_WYC7 = JOB_PLAYTIME_TIER_3) @@ -92,7 +92,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/fax_responder/upp - name = JOB_FAX_RESPONDER_UPP + name = "Fax Responder - UPP" assignment = JOB_FAX_RESPONDER_UPP rank = JOB_FAX_RESPONDER_UPP paygrades = list(PAY_SHORT_UO2 = JOB_PLAYTIME_TIER_0, PAY_SHORT_UO3 = JOB_PLAYTIME_TIER_1, PAY_SHORT_UO4 = JOB_PLAYTIME_TIER_3) @@ -116,7 +116,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/fax_responder/twe - name = JOB_FAX_RESPONDER_TWE + name = "Fax Responder - TWE" assignment = JOB_FAX_RESPONDER_TWE rank = JOB_FAX_RESPONDER_TWE headset_type = /obj/item/device/radio/headset/distress/royal_marine @@ -134,7 +134,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/fax_responder/clf - name = JOB_FAX_RESPONDER_CLF + name = "Fax Responder - CLF" assignment = JOB_FAX_RESPONDER_CLF rank = JOB_FAX_RESPONDER_CLF headset_type = /obj/item/device/radio/headset/distress/CLF/command @@ -148,7 +148,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/fax_responder/cmb - name = JOB_FAX_RESPONDER_CMB + name = "Fax Responder - CMB" assignment = JOB_FAX_RESPONDER_CMB rank = JOB_FAX_RESPONDER_CMB headset_type = /obj/item/device/radio/headset/distress/CMB diff --git a/maps/templates/lazy_templates/fax_responder_base.dmm b/maps/templates/lazy_templates/fax_responder_base.dmm index 0b5ef1e58bab..7276001d98a4 100644 --- a/maps/templates/lazy_templates/fax_responder_base.dmm +++ b/maps/templates/lazy_templates/fax_responder_base.dmm @@ -11,7 +11,7 @@ pixel_x = -6; pixel_y = 6; networks_transmit = list("USCM","Colonist","UPP","Fax Responders"); - phone_id = "UPP High Command"; + phone_id = "UPP Communications Officer"; phone_category = "Comms Relay"; networks_receive = list("Fax Responders"); phone_color = "green" @@ -32,7 +32,7 @@ /obj/structure/machinery/computer/cameras/almayer{ dir = 8; admin_console = 1; - network = list("Almayer","Research","Containment","Containment Hidden"); + network = list("ARES","Almayer","Research","Containment","Containment Hidden"); pixel_x = 16; layer = 2.99; name = "USS Almayer Cameras"; @@ -92,7 +92,7 @@ /obj/structure/machinery/computer/cameras/almayer{ dir = 8; admin_console = 1; - network = list("WY","Colony"); + network = list("WY","Containment Hidden","Colony"); pixel_x = 16; name = "WY Cameras"; colony_camera_mapload = 0 @@ -100,7 +100,7 @@ /obj/structure/machinery/computer/cameras/almayer{ dir = 8; admin_console = 1; - network = list("Almayer","Research","Containment","Containment Hidden"); + network = list("ARES","Almayer","Research","Containment"); pixel_x = 16; layer = 2.99; name = "USS Almayer Cameras"; @@ -124,7 +124,7 @@ pixel_x = -6; pixel_y = 6; networks_transmit = list("USCM","Colonist","TWE","Fax Responders"); - phone_id = "TWE High Command"; + phone_id = "TWE Communications Officer"; phone_category = "Comms Relay"; networks_receive = list("Fax Responders"); phone_color = "yellow" @@ -208,7 +208,7 @@ pixel_x = -6; pixel_y = 6; networks_transmit = list("USCM","Colonist","Fax Responders"); - phone_id = "USCM High Command"; + phone_id = "USCM-HC Communications Officer"; phone_category = "Comms Relay"; networks_receive = list("Fax Responders"); phone_color = "blue" @@ -375,25 +375,6 @@ "BC" = ( /turf/closed/wall/r_wall/biodome/biodome_unmeltable, /area/adminlevel/ert_station/fax_response_station) -"BL" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/item/folder/red{ - pixel_x = 6 - }, -/obj/item/folder/black{ - pixel_x = 12 - }, -/obj/structure/transmitter/rotary{ - pixel_x = -6; - pixel_y = 6; - networks_transmit = list("USCM","Colonist","Colonial Marshal","Fax Responders"); - phone_id = "Colonial Marshal Bureau"; - phone_category = "Comms Relay"; - networks_receive = list("Fax Responders"); - phone_color = "green" - }, -/turf/open/floor/wood/ship, -/area/adminlevel/ert_station/fax_response_station) "CT" = ( /obj/structure/machinery/light{ dir = 8; @@ -459,7 +440,7 @@ pixel_x = -6; pixel_y = 6; networks_transmit = list("USCM","Colonist","Wey-Yu","PMC","Fax Responders"); - phone_id = "Weyland-Yutani Operations Manager"; + phone_id = "WY Communications Executive"; phone_category = "Comms Relay"; networks_receive = list("Fax Responders") }, @@ -477,6 +458,25 @@ }, /turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) +"Nb" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/folder/red{ + pixel_x = 6 + }, +/obj/item/folder/black{ + pixel_x = 12 + }, +/obj/structure/transmitter/rotary{ + pixel_x = -6; + pixel_y = 6; + networks_transmit = list("USCM","Colonist","Colonial Marshal","Fax Responders"); + phone_id = "CMB Deputy Operations Officer"; + phone_category = "Comms Relay"; + networks_receive = list("Fax Responders"); + phone_color = "green" + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) "NP" = ( /obj/structure/machinery/light, /obj/structure/surface/table/woodentable/fancy, @@ -490,7 +490,7 @@ pixel_x = -6; pixel_y = 6; networks_transmit = list("USCM","Colonist","Fax Responders"); - phone_id = "USCM Provost Office"; + phone_id = "Provost Communications Officer"; phone_category = "Comms Relay"; networks_receive = list("Fax Responders"); phone_color = "red" @@ -549,7 +549,7 @@ /obj/structure/machinery/computer/cameras/almayer{ dir = 8; admin_console = 1; - network = list("Almayer","Research","Containment","Containment Hidden"); + network = list("ARES","Almayer","Research","Containment","Containment Hidden"); pixel_x = 16; layer = 2.99; name = "USS Almayer Cameras"; @@ -594,7 +594,7 @@ pixel_x = -6; pixel_y = 6; networks_transmit = list("USCM","Colonist","CLF","Fax Responders"); - phone_id = "CLF Command"; + phone_id = "CLF Information Correspondant"; phone_category = "Comms Relay"; networks_receive = list("Fax Responders"); phone_color = "orange" @@ -820,17 +820,17 @@ Yy Yy Yy Yy -Ei -Ei -Ei -Ei -Ei -Ei -Ei -Ei -Ei -Ei -Ei +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy Yy Yy Yy @@ -868,15 +868,15 @@ Yy Yy Yy Ei -YR -CT -rV -fr Ei -nB -CT -YO -fr +Ei +Ei +Ei +Ei +Ei +Ei +Ei +Ei Ei Yy Yy @@ -912,21 +912,21 @@ Yy Yy Yy Yy -xX -xX +Yy +Yy Ei -EI -gu -gu -gu -Pn -EI -gu -gu -gu +YR +CT +rV +fr Ei -xX -xX +nB +CT +YO +fr +Ei +Yy +Yy Yy Yy Yy @@ -960,19 +960,19 @@ Yy Yy Yy xX -vc -pH -gu +xX +Ei +EI gu gu gu Pn +EI gu gu gu -gu -pH -vc +Ei +xX xX Yy Yy @@ -1008,7 +1008,7 @@ Yy Yy xX vc -Ei +pH gu gu gu @@ -1018,7 +1018,7 @@ gu gu gu gu -Ei +pH vc xX Yy @@ -2047,7 +2047,7 @@ xX xX xX xX -vc +wK xX xX xX @@ -2091,10 +2091,11 @@ Yy Yy Yy Yy -Yy -Yy xX -vc +nB +CT +wv +fr xX Yy Yy @@ -2121,7 +2122,6 @@ Yy Yy Yy Yy -Yy "} (33,1,1) = {" Yy @@ -2139,10 +2139,10 @@ Yy Yy Yy xX -xX -xX -wK -xX +EI +gu +gu +gu xX Yy Yy @@ -2186,10 +2186,10 @@ Yy Yy Yy xX -nB -CT -wv -fr +gu +gu +gu +gu xX Yy Yy @@ -2233,10 +2233,10 @@ Yy Yy Yy xX -EI -gu -gu +ny +ST gu +Nb xX Yy Yy @@ -2280,10 +2280,10 @@ Yy Yy Yy xX -gu -gu -gu -gu +wx +Vs +Bp +sx xX Yy Yy @@ -2327,10 +2327,10 @@ Yy Yy Yy xX -ny -ST -gu -BL +xX +xX +xX +xX xX Yy Yy @@ -2373,12 +2373,12 @@ Yy Yy Yy Yy -xX -wx -Vs -Bp -sx -xX +Yy +Yy +Yy +Yy +Yy +Yy Yy Yy Yy @@ -2420,12 +2420,12 @@ Yy Yy Yy Yy -xX -xX -xX -xX -xX -xX +Yy +Yy +Yy +Yy +Yy +Yy Yy Yy Yy From da93b269ae5868430b9afe806f0630bc5b275223 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Sun, 15 Sep 2024 19:50:15 +0100 Subject: [PATCH 21/50] shut up lint --- .../lazy_templates/fax_responder_base.dmm | 240 +++++++++--------- 1 file changed, 120 insertions(+), 120 deletions(-) diff --git a/maps/templates/lazy_templates/fax_responder_base.dmm b/maps/templates/lazy_templates/fax_responder_base.dmm index 7276001d98a4..1995e4fe9c99 100644 --- a/maps/templates/lazy_templates/fax_responder_base.dmm +++ b/maps/templates/lazy_templates/fax_responder_base.dmm @@ -18,29 +18,6 @@ }, /turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) -"bT" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/structure/machinery/computer/cameras/almayer{ - dir = 8; - admin_console = 1; - network = list("Overwatch"); - pixel_x = 16; - pixel_y = 8; - name = "Overwatch Cameras"; - colony_camera_mapload = 0 - }, -/obj/structure/machinery/computer/cameras/almayer{ - dir = 8; - admin_console = 1; - network = list("ARES","Almayer","Research","Containment","Containment Hidden"); - pixel_x = 16; - layer = 2.99; - name = "USS Almayer Cameras"; - pixel_y = -6; - colony_camera_mapload = 0 - }, -/turf/open/floor/wood/ship, -/area/adminlevel/ert_station/fax_response_station) "fr" = ( /obj/structure/machinery/cryopod, /turf/open/floor/wood/ship, @@ -78,37 +55,6 @@ }, /turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) -"im" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/structure/machinery/computer/cameras/almayer{ - dir = 8; - admin_console = 1; - network = list("Overwatch"); - pixel_x = 16; - pixel_y = 16; - name = "Overwatch Cameras"; - colony_camera_mapload = 0 - }, -/obj/structure/machinery/computer/cameras/almayer{ - dir = 8; - admin_console = 1; - network = list("WY","Containment Hidden","Colony"); - pixel_x = 16; - name = "WY Cameras"; - colony_camera_mapload = 0 - }, -/obj/structure/machinery/computer/cameras/almayer{ - dir = 8; - admin_console = 1; - network = list("ARES","Almayer","Research","Containment"); - pixel_x = 16; - layer = 2.99; - name = "USS Almayer Cameras"; - pixel_y = -16; - colony_camera_mapload = 0 - }, -/turf/open/floor/wood/ship, -/area/adminlevel/ert_station/fax_response_station) "jh" = ( /turf/closed/wall/r_wall/prison_unmeltable, /area/adminlevel/ert_station/fax_response_station) @@ -131,6 +77,29 @@ }, /turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) +"kT" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/computer/cameras/almayer{ + dir = 8; + admin_console = 1; + network = list("ARES","Almayer","Research","Containment","Containment Hidden"); + pixel_x = 16; + layer = 2.99; + name = "USS Almayer Cameras"; + pixel_y = -6; + colony_camera_mapload = 0 + }, +/obj/structure/machinery/computer/cameras/almayer{ + dir = 8; + admin_console = 1; + network = list("Overwatch"); + pixel_x = 16; + pixel_y = 8; + name = "Overwatch Cameras"; + colony_camera_mapload = 0 + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) "ny" = ( /obj/structure/surface/table/woodentable/fancy, /obj/structure/machinery/faxmachine/cmb{ @@ -196,6 +165,29 @@ }, /turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) +"sZ" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/computer/cameras/almayer{ + dir = 8; + admin_console = 1; + network = list("Overwatch"); + pixel_x = 16; + pixel_y = 8; + name = "Overwatch Cameras"; + colony_camera_mapload = 0 + }, +/obj/structure/machinery/computer/cameras/almayer{ + dir = 8; + admin_console = 1; + network = list("ARES","Almayer","Research","Containment","Containment Hidden"); + pixel_x = 16; + layer = 2.99; + name = "USS Almayer Cameras"; + pixel_y = -6; + colony_camera_mapload = 0 + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) "tq" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/folder/red{ @@ -321,29 +313,6 @@ }, /turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) -"Ab" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/item/tool/pen/clicky, -/obj/item/tool/pen/blue/clicky{ - pixel_y = 8 - }, -/obj/item/tool/pen/green/clicky{ - pixel_y = 8; - pixel_x = -8 - }, -/obj/item/tool/pen/red/clicky{ - pixel_x = -8 - }, -/obj/structure/machinery/computer/crew/alt{ - pixel_y = 24; - name = "USCM monitoring computer" - }, -/obj/item/paper_bin/uscm{ - pixel_x = 8; - pixel_y = 6 - }, -/turf/open/floor/wood/ship, -/area/adminlevel/ert_station/fax_response_station) "Ba" = ( /obj/structure/filingcabinet{ density = 0; @@ -375,10 +344,26 @@ "BC" = ( /turf/closed/wall/r_wall/biodome/biodome_unmeltable, /area/adminlevel/ert_station/fax_response_station) -"CT" = ( -/obj/structure/machinery/light{ - dir = 8; - tag = "icon-tube1 (EAST)" +"Du" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/tool/pen/clicky, +/obj/item/tool/pen/blue/clicky{ + pixel_y = 8 + }, +/obj/item/tool/pen/green/clicky{ + pixel_y = 8; + pixel_x = -8 + }, +/obj/item/tool/pen/red/clicky{ + pixel_x = -8 + }, +/obj/structure/machinery/computer/crew/alt{ + pixel_y = 24; + name = "USCM monitoring computer" + }, +/obj/item/paper_bin/uscm{ + pixel_x = 8; + pixel_y = 6 }, /turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) @@ -458,6 +443,37 @@ }, /turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) +"IO" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/computer/cameras/almayer{ + dir = 8; + admin_console = 1; + network = list("Overwatch"); + pixel_x = 16; + pixel_y = 16; + name = "Overwatch Cameras"; + colony_camera_mapload = 0 + }, +/obj/structure/machinery/computer/cameras/almayer{ + dir = 8; + admin_console = 1; + network = list("WY","Containment Hidden","Colony"); + pixel_x = 16; + name = "WY Cameras"; + colony_camera_mapload = 0 + }, +/obj/structure/machinery/computer/cameras/almayer{ + dir = 8; + admin_console = 1; + network = list("ARES","Almayer","Research","Containment"); + pixel_x = 16; + layer = 2.99; + name = "USS Almayer Cameras"; + pixel_y = -16; + colony_camera_mapload = 0 + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) "Nb" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/folder/red{ @@ -497,6 +513,13 @@ }, /turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) +"OA" = ( +/obj/structure/machinery/light{ + dir = 8; + + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) "Pn" = ( /obj/structure/window/framed/almayer/hull, /turf/open/floor/wood/ship, @@ -544,29 +567,6 @@ }, /turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) -"Vs" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/structure/machinery/computer/cameras/almayer{ - dir = 8; - admin_console = 1; - network = list("ARES","Almayer","Research","Containment","Containment Hidden"); - pixel_x = 16; - layer = 2.99; - name = "USS Almayer Cameras"; - pixel_y = -6; - colony_camera_mapload = 0 - }, -/obj/structure/machinery/computer/cameras/almayer{ - dir = 8; - admin_console = 1; - network = list("Overwatch"); - pixel_x = 16; - pixel_y = 8; - name = "Overwatch Cameras"; - colony_camera_mapload = 0 - }, -/turf/open/floor/wood/ship, -/area/adminlevel/ert_station/fax_response_station) "VV" = ( /obj/effect/landmark/late_join/responder/upp, /turf/open/floor/wood/ship, @@ -916,12 +916,12 @@ Yy Yy Ei YR -CT +OA rV fr Ei nB -CT +OA YO fr Ei @@ -1103,13 +1103,13 @@ Yy xX vc Ei -Ab -bT +Du +sZ Bp sx Ei -Ab -bT +Du +sZ Bp sx Ei @@ -1338,14 +1338,14 @@ Yy xX BC YR -CT +OA xb fr BC vc wz YR -CT +OA VV fr wz @@ -1526,14 +1526,14 @@ Yy xX BC EK -im +IO Bp sx BC vc wz id -Vs +kT Bp sx wz @@ -1761,14 +1761,14 @@ Yy xX jh YR -CT +OA tM fr jh vc xc YR -CT +OA XZ fr xc @@ -1949,14 +1949,14 @@ Yy xX jh Rh -Vs +kT Bp sx jh vc xc yv -Vs +kT Bp sx xc @@ -2093,7 +2093,7 @@ Yy Yy xX nB -CT +OA wv fr xX @@ -2281,7 +2281,7 @@ Yy Yy xX wx -Vs +kT Bp sx xX From 062e9c5496f59f4f4190acde793f7eee49e2439f Mon Sep 17 00:00:00 2001 From: forest2001 Date: Sun, 15 Sep 2024 19:50:51 +0100 Subject: [PATCH 22/50] lobby fix --- code/game/gamemodes/cm_initialize.dm | 8 +++++++- code/modules/mob/new_player/new_player.dm | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/cm_initialize.dm b/code/game/gamemodes/cm_initialize.dm index b5a0b48c18dc..ee80dfb7d099 100644 --- a/code/game/gamemodes/cm_initialize.dm +++ b/code/game/gamemodes/cm_initialize.dm @@ -292,15 +292,21 @@ Additional game mode variables. options += job return options -/datum/game_mode/proc/attempt_to_join_as_fax_responder(mob/responder_candidate) +/datum/game_mode/proc/attempt_to_join_as_fax_responder(mob/responder_candidate, from_lobby = FALSE) var/list/options = get_fax_responder_slots(responder_candidate) var/choice = tgui_input_list(responder_candidate, "What Fax Responder do you want to join as?", "Which Responder?", options, 30 SECONDS) if(!(choice in FAX_RESPONDER_JOB_LIST)) to_chat(responder_candidate, SPAN_WARNING("Error: No valid responder selected.")) + if(from_lobby) + var/mob/new_player/lobbied = responder_candidate + lobbied.new_player_panel() return FALSE var/mob/living/carbon/human/new_responder = transform_fax_responder(responder_candidate, choice) //Initialized and ready. if(!new_responder) + if(from_lobby) + var/mob/new_player/lobbied = responder_candidate + lobbied.new_player_panel() return FALSE message_admins(SPAN_HIGHDANGER("([new_responder.key]) joined as a Fax Responder, [new_responder.real_name].")) diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index ab84d680f8a3..a778e524ab42 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -204,7 +204,7 @@ if(alert(src,"Are you sure you want to attempt joining as a Fax Responder?","Confirmation","Yes","No") == "Yes" ) if(SSticker.mode.check_fax_responder_late_join(src, FALSE, TRUE)) close_spawn_windows() - SSticker.mode.attempt_to_join_as_fax_responder(src) + SSticker.mode.attempt_to_join_as_fax_responder(src, TRUE) else to_chat(src, SPAN_WARNING("You are no longer able to join as a Fax Responder.")) new_player_panel() From 8c0cf7f870d865bf4ac1dc0547e8ac94559cbd87 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Mon, 16 Sep 2024 11:34:25 +0100 Subject: [PATCH 23/50] I hate code --- code/game/gamemodes/cm_initialize.dm | 41 ++++++++++++----------- code/modules/mob/new_player/new_player.dm | 2 +- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/code/game/gamemodes/cm_initialize.dm b/code/game/gamemodes/cm_initialize.dm index ee80dfb7d099..d7568b349618 100644 --- a/code/game/gamemodes/cm_initialize.dm +++ b/code/game/gamemodes/cm_initialize.dm @@ -260,20 +260,18 @@ Additional game mode variables. //===================================================\\ -/datum/game_mode/proc/check_fax_responder_late_join(mob/responder, show_warning = TRUE, lobby_attempt = FALSE) +/datum/game_mode/proc/check_fax_responder_late_join(mob/responder, show_warning = TRUE) if(!responder.client) return FALSE if(!(responder?.client.check_whitelist_status(WHITELIST_FAX_RESPONDER))) if(show_warning) to_chat(responder, SPAN_WARNING("You are not whitelisted!")) - if(lobby_attempt) - var/mob/new_player/lobbied = responder - lobbied.new_player_panel() return FALSE if(show_warning && tgui_alert(responder, "Confirm joining as a Fax Responder.", "Confirmation", list("Yes", "No"), 10 SECONDS) != "Yes") - if(lobby_attempt) - var/mob/new_player/lobbied = responder - lobbied.new_player_panel() + return FALSE + if(!get_fax_responder_slots(responder)) + if(show_warning) + to_chat(responder, SPAN_WARNING("No slots available!")) return FALSE return TRUE @@ -294,6 +292,13 @@ Additional game mode variables. /datum/game_mode/proc/attempt_to_join_as_fax_responder(mob/responder_candidate, from_lobby = FALSE) var/list/options = get_fax_responder_slots(responder_candidate) + if(!options || !options.len) + to_chat(responder_candidate, SPAN_WARNING("No Available Slot!")) + if(from_lobby) + var/mob/new_player/lobbied = responder_candidate + lobbied.new_player_panel() + return FALSE + var/choice = tgui_input_list(responder_candidate, "What Fax Responder do you want to join as?", "Which Responder?", options, 30 SECONDS) if(!(choice in FAX_RESPONDER_JOB_LIST)) to_chat(responder_candidate, SPAN_WARNING("Error: No valid responder selected.")) @@ -302,33 +307,30 @@ Additional game mode variables. lobbied.new_player_panel() return FALSE - var/mob/living/carbon/human/new_responder = transform_fax_responder(responder_candidate, choice) //Initialized and ready. - if(!new_responder) + if(!transform_fax_responder(responder_candidate, choice)) if(from_lobby) var/mob/new_player/lobbied = responder_candidate lobbied.new_player_panel() return FALSE - message_admins(SPAN_HIGHDANGER("([new_responder.key]) joined as a Fax Responder, [new_responder.real_name].")) - if(responder_candidate) responder_candidate.moveToNullspace() //Nullspace it for garbage collection later. return TRUE /datum/game_mode/proc/transform_fax_responder(mob/responder_candidate, sub_job) - set waitfor = FALSE + //set waitfor = FALSE if(!(sub_job in FAX_RESPONDER_JOB_LIST)) - return + return FALSE if(!responder_candidate.client) // Legacy - probably due to spawn code sync sleeps log_debug("Null client attempted to transform_fax_responder") - return + return FALSE if(!loaded_fax_base) loaded_fax_base = SSmapping.lazy_load_template(/datum/lazy_template/fax_response_base, force = TRUE) if(!loaded_fax_base) log_debug("Error loading fax response base!") - return + return FALSE responder_candidate.client.prefs.find_assigned_slot(JOB_FAX_RESPONDER) @@ -341,15 +343,16 @@ Additional game mode variables. if(!fax_responder_job) qdel(new_responder) - return - - arm_equipment(new_responder, fax_responder_job.gear_preset, !new_responder.mind, TRUE) + return FALSE // This is usually done in assign_role, a proc which is not executed in this case, since check_fax_responder_late_join is running its own checks. fax_responder_job.current_positions++ GLOB.RoleAuthority.equip_role(new_responder, fax_responder_job, new_responder.loc) SSticker.minds += new_responder.mind - return new_responder + + message_admins(FONT_SIZE_XL(SPAN_RED("([new_responder.key]) joined as a [sub_job], [new_responder.real_name]."))) + + return TRUE //===================================================\\ diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index a778e524ab42..a410f277eead 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -202,7 +202,7 @@ return if(alert(src,"Are you sure you want to attempt joining as a Fax Responder?","Confirmation","Yes","No") == "Yes" ) - if(SSticker.mode.check_fax_responder_late_join(src, FALSE, TRUE)) + if(SSticker.mode.check_fax_responder_late_join(src, FALSE)) close_spawn_windows() SSticker.mode.attempt_to_join_as_fax_responder(src, TRUE) else From 63fad0942222d9704f6be3f6fc861bcd357e94e0 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Mon, 16 Sep 2024 11:41:00 +0100 Subject: [PATCH 24/50] grrr g --- maps/templates/lazy_templates/fax_responder_base.dmm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/maps/templates/lazy_templates/fax_responder_base.dmm b/maps/templates/lazy_templates/fax_responder_base.dmm index 1995e4fe9c99..33e06532a6f9 100644 --- a/maps/templates/lazy_templates/fax_responder_base.dmm +++ b/maps/templates/lazy_templates/fax_responder_base.dmm @@ -515,8 +515,7 @@ /area/adminlevel/ert_station/fax_response_station) "OA" = ( /obj/structure/machinery/light{ - dir = 8; - + dir = 8 }, /turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) From 1add6fa18d26a62cc93f711c57b6e3cc5cb00c05 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Sun, 29 Sep 2024 00:01:27 +0100 Subject: [PATCH 25/50] u --- code/modules/gear_presets/fax_responders.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/gear_presets/fax_responders.dm b/code/modules/gear_presets/fax_responders.dm index 7c1b00118f32..272df4807c90 100644 --- a/code/modules/gear_presets/fax_responders.dm +++ b/code/modules/gear_presets/fax_responders.dm @@ -26,7 +26,6 @@ var/obj/item/clothing/under/uniform = new_human.w_uniform if(istype(uniform)) uniform.has_sensor = UNIFORM_HAS_SENSORS - uniform.sensor_faction = FACTION_NEUTRAL return ..() //*****************************************************************************************************/ From c614cba3c54331daeea500cba93d01bb9a8aedfd Mon Sep 17 00:00:00 2001 From: forest2001 Date: Sun, 29 Sep 2024 00:09:05 +0100 Subject: [PATCH 26/50] tlc --- code/game/jobs/job/special/responders.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/jobs/job/special/responders.dm b/code/game/jobs/job/special/responders.dm index 9bc5d88b9d19..42f2f7c1863e 100644 --- a/code/game/jobs/job/special/responders.dm +++ b/code/game/jobs/job/special/responders.dm @@ -38,7 +38,7 @@ AddTimelock(/datum/job/fax_responder/uscm_pvst, list( gear_preset = /datum/equipment_preset/fax_responder/wey_yu AddTimelock(/datum/job/fax_responder/wy, list( - JOB_CORPORATE_ROLES = 150 HOURS, + JOB_CORPORATE_ROLES = 75 HOURS, )) /datum/job/fax_responder/upp From 3d1a3b2ed0f0b1db8597f03bffb6cc6a7bea8b8b Mon Sep 17 00:00:00 2001 From: forest2001 Date: Mon, 30 Sep 2024 11:59:13 +0100 Subject: [PATCH 27/50] press --- code/__DEFINES/job.dm | 7 +- code/game/jobs/job/civilians/civilian.dm | 8 + code/game/jobs/job/special/responders.dm | 8 + code/game/machinery/cryopod.dm | 2 +- code/game/machinery/fax_machine.dm | 31 ++- .../objects/effects/landmarks/landmarks.dm | 4 + code/modules/admin/topic/topic.dm | 2 +- code/modules/gear_presets/fax_responders.dm | 16 ++ code/modules/paperwork/paper.dm | 22 +- icons/obj/items/paper.dmi | Bin 12014 -> 12157 bytes .../lazy_templates/fax_responder_base.dmm | 263 ++++++++++-------- 11 files changed, 235 insertions(+), 128 deletions(-) diff --git a/code/__DEFINES/job.dm b/code/__DEFINES/job.dm index a2dfbb559769..69dc8f6c3ff2 100644 --- a/code/__DEFINES/job.dm +++ b/code/__DEFINES/job.dm @@ -64,7 +64,11 @@ GLOBAL_LIST_INIT(job_squad_roles, JOB_SQUAD_ROLES_LIST) #define JOB_MEDIC_ROLES_LIST list(JOB_SQUAD_MEDIC, JOB_CMO, JOB_DOCTOR, JOB_NURSE, JOB_RESEARCHER, JOB_SURGEON) #define JOB_CORPORATE_LIAISON "Corporate Liaison" + #define JOB_COMBAT_REPORTER "Combat Correspondent" +#define JOB_CIVIL_ROLES /datum/timelock/civil +#define JOB_CIVIL_ROLES_LIST list(JOB_COMBAT_REPORTER) + #define JOB_MESS_SERGEANT "Mess Technician" #define JOB_SYNTH "Synthetic" #define JOB_WORKING_JOE "Working Joe" @@ -379,8 +383,9 @@ GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST) #define JOB_FAX_RESPONDER_TWE "TWE Communications Officer" #define JOB_FAX_RESPONDER_CLF "CLF Information Correspondant" #define JOB_FAX_RESPONDER_CMB "CMB Deputy Operations Officer" +#define JOB_FAX_RESPONDER_PRESS "Free Press Relay Operator" -#define FAX_RESPONDER_JOB_LIST list(JOB_FAX_RESPONDER_USCM_HC, JOB_FAX_RESPONDER_USCM_PVST, JOB_FAX_RESPONDER_WY, JOB_FAX_RESPONDER_UPP, JOB_FAX_RESPONDER_TWE, JOB_FAX_RESPONDER_CLF, JOB_FAX_RESPONDER_CMB) +#define FAX_RESPONDER_JOB_LIST list(JOB_FAX_RESPONDER_USCM_HC, JOB_FAX_RESPONDER_USCM_PVST, JOB_FAX_RESPONDER_WY, JOB_FAX_RESPONDER_UPP, JOB_FAX_RESPONDER_TWE, JOB_FAX_RESPONDER_CLF, JOB_FAX_RESPONDER_CMB, JOB_FAX_RESPONDER_PRESS) //---------- ANTAG ----------// diff --git a/code/game/jobs/job/civilians/civilian.dm b/code/game/jobs/job/civilians/civilian.dm index 86b237816217..94865eb3b1b1 100644 --- a/code/game/jobs/job/civilians/civilian.dm +++ b/code/game/jobs/job/civilians/civilian.dm @@ -14,3 +14,11 @@ /datum/timelock/corporate/New(name, time_required, list/roles) . = ..() src.roles = JOB_CORPORATE_ROLES_LIST + + +/datum/timelock/civil + name = "Civil Roles" + +/datum/timelock/civil/New(name, time_required, list/roles) + . = ..() + src.roles = JOB_CIVIL_ROLES_LIST diff --git a/code/game/jobs/job/special/responders.dm b/code/game/jobs/job/special/responders.dm index 42f2f7c1863e..54059751ae83 100644 --- a/code/game/jobs/job/special/responders.dm +++ b/code/game/jobs/job/special/responders.dm @@ -73,3 +73,11 @@ AddTimelock(/datum/job/fax_responder/cmb, list( JOB_POLICE_ROLES = 75 HOURS, JOB_COMMAND_ROLES = 25 HOURS, )) + +/datum/job/fax_responder/press + title = JOB_FAX_RESPONDER_PRESS + gear_preset = /datum/equipment_preset/fax_responder/press + +AddTimelock(/datum/job/fax_responder/press, list( + JOB_CIVIL_ROLES = 25 HOURS, +)) diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 4baaafd9eb01..d504a47aad8d 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -232,7 +232,7 @@ GLOBAL_LIST_INIT(frozen_items, list(SQUAD_MARINE_1 = list(), SQUAD_MARINE_2 = li dept_console = GLOB.frozen_items["Eng"] if(JOB_PREDATOR) dept_console = GLOB.frozen_items["Yautja"] - if(JOB_FAX_RESPONDER_USCM_HC, JOB_FAX_RESPONDER_USCM_PVST, JOB_FAX_RESPONDER_WY, JOB_FAX_RESPONDER_TWE, JOB_FAX_RESPONDER_UPP, JOB_FAX_RESPONDER_CLF, JOB_FAX_RESPONDER_CMB) + if(JOB_FAX_RESPONDER_USCM_HC, JOB_FAX_RESPONDER_USCM_PVST, JOB_FAX_RESPONDER_WY, JOB_FAX_RESPONDER_TWE, JOB_FAX_RESPONDER_UPP, JOB_FAX_RESPONDER_CLF, JOB_FAX_RESPONDER_CMB, JOB_FAX_RESPONDER_PRESS) dept_console = GLOB.frozen_items["Responders"] H.species.handle_cryo(H) diff --git a/code/game/machinery/fax_machine.dm b/code/game/machinery/fax_machine.dm index 2c5addb5e6d6..00c098f4d61b 100644 --- a/code/game/machinery/fax_machine.dm +++ b/code/game/machinery/fax_machine.dm @@ -25,7 +25,8 @@ GLOBAL_LIST_EMPTY(all_faxcodes) #define FAX_NET_UPP_HC "UPP High Command Quantum Relay" #define FAX_NET_CLF "Peridia Encrypted Network" #define FAX_NET_CLF_HC "Peridia Quantum Relay" -#define FAX_HC_NETWORKS list(FAX_NET_USCM_HC, FAX_NET_WY_HC, FAX_NET_CMB, FAX_NET_TWE_HC, FAX_NET_UPP_HC, FAX_NET_CLF_HC) +#define FAX_NET_PRESS_HC "Free Press Quantum Relay" +#define FAX_HC_NETWORKS list(FAX_NET_USCM_HC, FAX_NET_WY_HC, FAX_NET_CMB, FAX_NET_TWE_HC, FAX_NET_UPP_HC, FAX_NET_CLF_HC, FAX_NET_PRESS_HC) /obj/structure/machinery/faxmachine // why not fax_machine? name = "\improper General Purpose Fax Machine" @@ -103,6 +104,8 @@ GLOBAL_LIST_EMPTY(all_faxcodes) id_tag_prefix = "PRD"//PeRiDia if(FAX_NET_CLF_HC) id_tag_final = FAX_NET_CLF_HC + if(FAX_NET_PRESS_HC) + id_tag_final = FAX_NET_PRESS_HC if(!id_tag_final) id_tag_final = "[id_tag_prefix]-[id_tag_suffix]" @@ -408,7 +411,7 @@ GLOBAL_LIST_EMPTY(all_faxcodes) /obj/structure/machinery/faxmachine/proc/outgoing_fax_message(mob/user) - var/datum/fax/faxcontents = new(fax_paper_copy.info, photo_list) + var/datum/fax/faxcontents = new(fax_paper_copy.info, photo_list, fax_paper_copy.name) GLOB.fax_contents += faxcontents @@ -504,7 +507,10 @@ GLOBAL_LIST_EMPTY(all_faxcodes) // give the sprite some time to flick spawn(30) var/obj/item/paper/P = new(target.loc,faxcontents.photo_list) - P.name = "faxed message" + if(!faxcontents.paper_name) + P.name = "faxed message" + else + P.name = "faxed message ([faxcontents.paper_name])" P.info = "[faxcontents.data]" P.update_icon() var/image/stampoverlay = image('icons/obj/items/paper.dmi') @@ -530,6 +536,11 @@ GLOBAL_LIST_EMPTY(all_faxcodes) if(FAX_NET_CLF_HC) stampoverlay.icon_state = "paper_stamp-clf" encrypted = TRUE + if(FAX_NET_PRESS_HC) + stampoverlay.icon_state = "paper_stamp-rd" + encrypted = TRUE + else + stampoverlay.icon_state = "paper_stamp-fax" if(encrypted) @@ -624,6 +635,11 @@ GLOBAL_LIST_EMPTY(all_faxcodes) network = FAX_NET_TWE_HC target_department = "TWE Local Operations" +/obj/structure/machinery/faxmachine/press/highcom + department = DEPARTMENT_PRESS + network = FAX_NET_PRESS_HC + target_department = "General Public" + ///The deployed fax machine backpack /obj/structure/machinery/faxmachine/backpack name = "\improper Portable Press Fax Machine" @@ -705,8 +721,11 @@ GLOBAL_LIST_EMPTY(all_faxcodes) /datum/fax var/data var/list/photo_list + var/paper_name -/datum/fax/New(data, photo_list) +/datum/fax/New(new_data, new_photo_list, new_name) . = ..() - src.data = data - src.photo_list = photo_list + data = new_data + photo_list = new_photo_list + if(new_name != "paper") + paper_name = new_name diff --git a/code/game/objects/effects/landmarks/landmarks.dm b/code/game/objects/effects/landmarks/landmarks.dm index c195f78d2c59..9c1de88c7186 100644 --- a/code/game/objects/effects/landmarks/landmarks.dm +++ b/code/game/objects/effects/landmarks/landmarks.dm @@ -493,6 +493,10 @@ name = "CMB Fax Responder late join" job = JOB_FAX_RESPONDER_CMB +/obj/effect/landmark/late_join/responder/press + name = "Press Fax Responder late join" + job = JOB_FAX_RESPONDER_PRESS + //****************************************** STATIC COMMS ************************************************// /obj/effect/landmark/static_comms name = "static comms" diff --git a/code/modules/admin/topic/topic.dm b/code/modules/admin/topic/topic.dm index 029eda204f3a..6f660323f8e3 100644 --- a/code/modules/admin/topic/topic.dm +++ b/code/modules/admin/topic/topic.dm @@ -1344,7 +1344,7 @@ // Stamps var/image/stampoverlay = image('icons/obj/items/paper.dmi') - stampoverlay.icon_state = "paper_stamp-uscm" + stampoverlay.icon_state = "paper_stamp-rd" if(!P.stamped) P.stamped = new P.stamped += /obj/item/tool/stamp diff --git a/code/modules/gear_presets/fax_responders.dm b/code/modules/gear_presets/fax_responders.dm index 272df4807c90..36c37c15bf39 100644 --- a/code/modules/gear_presets/fax_responders.dm +++ b/code/modules/gear_presets/fax_responders.dm @@ -162,3 +162,19 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/head/CMB, WEAR_HEAD) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc, WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud, WEAR_EYES) + +//*****************************************************************************************************/ + +/datum/equipment_preset/fax_responder/press + name = "Fax Responder - CMB" + assignment = JOB_FAX_RESPONDER_PRESS + rank = JOB_FAX_RESPONDER_PRESS + headset_type = /obj/item/device/radio/headset/almayer/reporter + idtype = /obj/item/card/id/silver/cl + paygrades = list(PAY_SHORT_CIV = JOB_PLAYTIME_TIER_0) + +/datum/equipment_preset/fax_responder/press/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/reporter(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/reporter(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_L_STORE) diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index e1610fb3401a..f97c20610e41 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -56,22 +56,28 @@ updateinfolinks() /obj/item/paper/update_icon() - if(icon_state == "paper_talisman" || icon_state == "paper_wy_words" || icon_state == "paper_uscm" || icon_state == "fortune" || icon_state == "paper_flag") + switch(icon_state) + if("paper_talisman", "paper_wy_words", "paper_uscm_words", "paper_flag_words", "fortune") + return + + if(!info) + icon_state = "paper" return - if(info) - if(icon_state == "paper_wy") + + switch(icon_state) + if("paper_wy") icon_state = "paper_wy_words" return - if(icon_state == "paper_uscm") + if("paper_uscm") icon_state = "paper_uscm_words" return - if(icon_state == "paper_flag") + if("paper_flag") icon_state = "paper_flag_words" item_state = "paper_flag" return - icon_state = "paper_words" - return - icon_state = "paper" + else + icon_state = "paper_words" + return /obj/item/paper/get_examine_text(mob/user) . = ..() diff --git a/icons/obj/items/paper.dmi b/icons/obj/items/paper.dmi index b15d4be6076d44d17404eae888e8b7b09f1a4b61..c248fa2341d1c3cd81939eee354c8266bd38c308 100644 GIT binary patch delta 11325 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 DoIr^_ delta 11182 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 diff --git a/maps/templates/lazy_templates/fax_responder_base.dmm b/maps/templates/lazy_templates/fax_responder_base.dmm index 33e06532a6f9..bbfb6b359dfc 100644 --- a/maps/templates/lazy_templates/fax_responder_base.dmm +++ b/maps/templates/lazy_templates/fax_responder_base.dmm @@ -150,6 +150,13 @@ }, /turf/open/floor/almayer/test_floor4, /area/adminlevel/ert_station/fax_response_station) +"qw" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/faxmachine/press/highcom{ + pixel_y = 8 + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) "rV" = ( /obj/effect/landmark/late_join/responder/uscm/provost, /turf/open/floor/wood/ship, @@ -260,17 +267,6 @@ hull = 1 }, /area/adminlevel/ert_station/fax_response_station) -"wK" = ( -/obj/structure/machinery/door/airlock/almayer/maint/reinforced/colony, -/obj/structure/machinery/door/poddoor/almayer{ - unacidable = 1; - use_power = 0; - needs_power = 0; - dir = 4; - id = "Faxes" - }, -/turf/open/floor/almayer/test_floor4, -/area/adminlevel/ert_station/fax_response_station) "xb" = ( /obj/effect/landmark/late_join/responder/wey_yu, /turf/open/floor/wood/ship, @@ -341,6 +337,10 @@ }, /turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) +"Bz" = ( +/obj/effect/landmark/late_join/responder/press, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) "BC" = ( /turf/closed/wall/r_wall/biodome/biodome_unmeltable, /area/adminlevel/ert_station/fax_response_station) @@ -577,6 +577,47 @@ }, /turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) +"Wv" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/folder/red{ + pixel_x = 6 + }, +/obj/item/folder/black{ + pixel_x = 12 + }, +/obj/structure/transmitter/rotary{ + pixel_x = -6; + pixel_y = 6; + networks_transmit = list("USCM","Colonist","Press","Fax Responders"); + phone_id = "Free Press Relay"; + phone_category = "Comms Relay"; + networks_receive = list("Fax Responders") + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) +"XW" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/tool/pen/clicky, +/obj/item/tool/pen/blue/clicky{ + pixel_y = 8 + }, +/obj/item/tool/pen/green/clicky{ + pixel_y = 8; + pixel_x = -8 + }, +/obj/item/tool/pen/red/clicky{ + pixel_x = -8 + }, +/obj/item/paper_bin/wy{ + pixel_y = 6; + pixel_x = 8 + }, +/obj/structure/machinery/computer/crew/alt{ + pixel_y = 24; + name = "USCM monitoring computer" + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) "XZ" = ( /obj/effect/landmark/late_join/responder/twe, /turf/open/floor/wood/ship, @@ -2046,7 +2087,7 @@ xX xX xX xX -wK +vc xX xX xX @@ -2086,21 +2127,21 @@ Yy Yy Yy Yy -Yy -Yy -Yy -Yy xX -nB -OA -wv -fr xX -Yy -Yy -Yy -Yy -Yy +xX +xX +xX +xX +xX +pu +xX +xX +xX +xX +xX +xX +xX Yy Yy Yy @@ -2133,21 +2174,21 @@ Yy Yy Yy Yy -Yy -Yy -Yy -Yy xX -EI -gu -gu -gu xX -Yy -Yy -Yy -Yy -Yy +nB +OA +wv +fr +xX +vc +xX +YR +OA +Bz +fr +xX +xX Yy Yy Yy @@ -2180,21 +2221,21 @@ Yy Yy Yy Yy -Yy -Yy -Yy -Yy xX +xX +EI +gu gu gu +xX +vc +xX +Ba +gu gu gu xX -Yy -Yy -Yy -Yy -Yy +xX Yy Yy Yy @@ -2227,21 +2268,21 @@ Yy Yy Yy Yy -Yy -Yy -Yy -Yy xX -ny -ST +xX +gu +gu +gu +gu +pH +vc +pH +gu +gu +gu gu -Nb xX -Yy -Yy -Yy -Yy -Yy +xX Yy Yy Yy @@ -2274,21 +2315,21 @@ Yy Yy Yy Yy -Yy -Yy -Yy -Yy xX -wx -kT -Bp -sx xX -Yy -Yy -Yy -Yy -Yy +ny +ST +gu +Nb +xX +vc +xX +qw +ST +gu +Wv +xX +xX Yy Yy Yy @@ -2321,14 +2362,19 @@ Yy Yy Yy Yy -Yy -Yy -Yy -Yy xX xX +wx +kT +Bp +sx xX +vc xX +XW +kT +Bp +sx xX xX Yy @@ -2351,11 +2397,6 @@ Yy Yy Yy Yy -Yy -Yy -Yy -Yy -Yy "} (38,1,1) = {" Yy @@ -2368,21 +2409,21 @@ Yy Yy Yy Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy +xX +xX +xX +xX +xX +xX +xX +vc +xX +xX +xX +xX +xX +xX +xX Yy Yy Yy @@ -2415,21 +2456,21 @@ Yy Yy Yy Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX Yy Yy Yy From e36529d379058adb414273da36800de7f7a03a34 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Mon, 30 Sep 2024 14:49:15 +0100 Subject: [PATCH 28/50] overlay fix --- code/game/machinery/fax_machine.dm | 2 +- code/modules/gear_presets/fax_responders.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/fax_machine.dm b/code/game/machinery/fax_machine.dm index 00c098f4d61b..21d6b76762a8 100644 --- a/code/game/machinery/fax_machine.dm +++ b/code/game/machinery/fax_machine.dm @@ -547,10 +547,10 @@ GLOBAL_LIST_EMPTY(all_faxcodes) if(!P.stamped) P.stamped = new P.stamped += /obj/item/tool/stamp - P.overlays += stampoverlay P.stamps += "
This paper has been stamped and encrypted by the [network]." else P.stamps += "
This paper has been sent by [machine_id_tag]." + P.overlays += stampoverlay playsound(target.loc, "sound/items/polaroid1.ogg", 15, 1) qdel(faxcontents) diff --git a/code/modules/gear_presets/fax_responders.dm b/code/modules/gear_presets/fax_responders.dm index 36c37c15bf39..ceeac0919c52 100644 --- a/code/modules/gear_presets/fax_responders.dm +++ b/code/modules/gear_presets/fax_responders.dm @@ -166,7 +166,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/fax_responder/press - name = "Fax Responder - CMB" + name = "Fax Responder - Press" assignment = JOB_FAX_RESPONDER_PRESS rank = JOB_FAX_RESPONDER_PRESS headset_type = /obj/item/device/radio/headset/almayer/reporter From 4e6bda943a998b9f2db70ef7950985d219f5dc8f Mon Sep 17 00:00:00 2001 From: forest2001 Date: Mon, 30 Sep 2024 16:20:58 +0100 Subject: [PATCH 29/50] portable fax machine fix --- code/game/machinery/fax_machine.dm | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/code/game/machinery/fax_machine.dm b/code/game/machinery/fax_machine.dm index 21d6b76762a8..e53421c4fe50 100644 --- a/code/game/machinery/fax_machine.dm +++ b/code/game/machinery/fax_machine.dm @@ -64,7 +64,10 @@ GLOBAL_LIST_EMPTY(all_faxcodes) var/fax_cooldown = 300 COOLDOWN_DECLARE(send_cooldown) + /// Unique identifier for the fax machine. var/machine_id_tag + /// Whether or not the ID tag can be changed by proc. + var/fixed_id_tag = FALSE /obj/structure/machinery/faxmachine/Initialize(mapload, ...) . = ..() @@ -72,7 +75,9 @@ GLOBAL_LIST_EMPTY(all_faxcodes) update_departments() generate_id_tag() -/obj/structure/machinery/faxmachine/proc/generate_id_tag() +/obj/structure/machinery/faxmachine/proc/generate_id_tag(force = FALSE) + if(fixed_id_tag && !force) + return FALSE if(machine_id_tag) GLOB.all_faxcodes -= machine_id_tag @@ -121,6 +126,7 @@ GLOBAL_LIST_EMPTY(all_faxcodes) /obj/structure/machinery/faxmachine/Destroy() GLOB.all_faxmachines -= src + GLOB.all_faxcodes -= machine_id_tag . = ..() /obj/structure/machinery/faxmachine/initialize_pass_flags(datum/pass_flags_container/PF) @@ -648,6 +654,14 @@ GLOBAL_LIST_EMPTY(all_faxcodes) needs_power = FALSE use_power = USE_POWER_NONE health = 150 + var/obj/item/device/fax_backpack/faxbag + +/obj/structure/machinery/faxmachine/backpack/New(loc, portable_id_tag) + . = ..() + if(portable_id_tag) + machine_id_tag = portable_id_tag + fixed_id_tag = TRUE + GLOB.all_faxcodes += machine_id_tag ///The wearable and deployable part of the fax machine backpack /obj/item/device/fax_backpack @@ -659,6 +673,7 @@ GLOBAL_LIST_EMPTY(all_faxcodes) w_class = SIZE_HUGE flags_equip_slot = SLOT_BACK flags_item = ITEM_OVERRIDE_NORTHFACE + var/machine_id_tag /obj/item/device/fax_backpack/attack_self(mob/user) //activate item version fax inhand to deploy if(!ishuman(user)) @@ -692,10 +707,12 @@ GLOBAL_LIST_EMPTY(all_faxcodes) to_chat(user, SPAN_NOTICE("You begin to deploy [src]...")) if(do_after(user, 4.5 SECONDS, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) to_chat(user, SPAN_NOTICE("You deploy [src].")) - var/obj/structure/machinery/faxmachine/backpack/deployedfax = new(deployturf) + var/obj/structure/machinery/faxmachine/backpack/deployedfax = new(deployturf, machine_id_tag) + deployedfax.faxbag = src transfer_label_component(deployedfax) playsound(src.loc, 'sound/machines/print.ogg', 40, 1) - qdel(src) + user.drop_held_item(src) + forceMove(deployedfax) return return ..() @@ -711,9 +728,10 @@ GLOBAL_LIST_EMPTY(all_faxcodes) if(do_after(user, 4.5 SECONDS, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) playsound(src.loc, 'sound/items/Ratchet.ogg', 25, 1) to_chat(user, SPAN_NOTICE("You pick up [src].")) - var/obj/item/device/fax_backpack/faxbag = new(loc) transfer_label_component(faxbag) user.put_in_hands(faxbag) + if(faxbag.machine_id_tag != machine_id_tag) + faxbag.machine_id_tag = machine_id_tag qdel(src) return return ..() From 331de0776955b2b3f578f9944dd856e6bb2c8c9d Mon Sep 17 00:00:00 2001 From: forest2001 Date: Sat, 5 Oct 2024 02:08:14 +0100 Subject: [PATCH 30/50] headset fix --- code/modules/gear_presets/fax_responders.dm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/code/modules/gear_presets/fax_responders.dm b/code/modules/gear_presets/fax_responders.dm index ceeac0919c52..8f8462b8a040 100644 --- a/code/modules/gear_presets/fax_responders.dm +++ b/code/modules/gear_presets/fax_responders.dm @@ -111,6 +111,8 @@ new_human.equip_to_slot_or_del(new /obj/item/notepad/green(new_human), WEAR_R_STORE) + ..() + //*****************************************************************************************************/ @@ -130,6 +132,8 @@ new_human.equip_to_slot_or_del(new /obj/item/notepad/blue(new_human), WEAR_R_STORE) + ..() + //*****************************************************************************************************/ /datum/equipment_preset/fax_responder/clf @@ -144,6 +148,8 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(new_human), WEAR_HANDS) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp(new_human), WEAR_FEET) + ..() + //*****************************************************************************************************/ /datum/equipment_preset/fax_responder/cmb @@ -163,6 +169,8 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc, WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud, WEAR_EYES) + ..() + //*****************************************************************************************************/ /datum/equipment_preset/fax_responder/press @@ -178,3 +186,5 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/reporter(new_human), WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_L_STORE) + + ..() From 7fb3ece325ea51a7bd3eb6e5edb73863cb9b26ad Mon Sep 17 00:00:00 2001 From: forest2001 Date: Tue, 8 Oct 2024 18:42:44 +0100 Subject: [PATCH 31/50] no_store --- .../lazy_templates/fax_responder_base.dmm | 92 ++++++++++--------- 1 file changed, 49 insertions(+), 43 deletions(-) diff --git a/maps/templates/lazy_templates/fax_responder_base.dmm b/maps/templates/lazy_templates/fax_responder_base.dmm index bbfb6b359dfc..a78d2b630857 100644 --- a/maps/templates/lazy_templates/fax_responder_base.dmm +++ b/maps/templates/lazy_templates/fax_responder_base.dmm @@ -19,7 +19,7 @@ /turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) "fr" = ( -/obj/structure/machinery/cryopod, +/obj/structure/machinery/cryopod/no_store, /turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) "gu" = ( @@ -367,6 +367,9 @@ }, /turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) +"Dy" = ( +/turf/closed/wall/solaris/reinforced/hull, +/area/adminlevel/ert_station/fax_response_station) "Ei" = ( /turf/closed/wall/almayer/outer, /area/adminlevel/ert_station/fax_response_station) @@ -474,6 +477,9 @@ }, /turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) +"Ml" = ( +/turf/closed/wall/shiva/prefabricated/reinforced/hull, +/area/adminlevel/ert_station/fax_response_station) "Nb" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/folder/red{ @@ -2128,19 +2134,19 @@ Yy Yy Yy xX -xX -xX -xX -xX -xX -xX +Dy +Dy +Dy +Dy +Dy +Dy pu -xX -xX -xX -xX -xX -xX +Ml +Ml +Ml +Ml +Ml +Ml xX Yy Yy @@ -2175,19 +2181,19 @@ Yy Yy Yy xX -xX +Dy nB OA wv fr -xX +Dy vc -xX +Ml YR OA Bz fr -xX +Ml xX Yy Yy @@ -2222,19 +2228,19 @@ Yy Yy Yy xX -xX +Dy EI gu gu gu -xX +Dy vc -xX +Ml Ba gu gu gu -xX +Ml xX Yy Yy @@ -2269,7 +2275,7 @@ Yy Yy Yy xX -xX +Dy gu gu gu @@ -2281,7 +2287,7 @@ gu gu gu gu -xX +Ml xX Yy Yy @@ -2316,19 +2322,19 @@ Yy Yy Yy xX -xX +Dy ny ST gu Nb -xX +Dy vc -xX +Ml qw ST gu Wv -xX +Ml xX Yy Yy @@ -2363,19 +2369,19 @@ Yy Yy Yy xX -xX +Dy wx kT Bp sx -xX +Dy vc -xX +Ml XW kT Bp sx -xX +Ml xX Yy Yy @@ -2410,19 +2416,19 @@ Yy Yy Yy xX -xX -xX -xX -xX -xX -xX +Dy +Dy +Dy +Dy +Dy +Dy vc -xX -xX -xX -xX -xX -xX +Ml +Ml +Ml +Ml +Ml +Ml xX Yy Yy From 6cbd514063682af596b97cb91f87e748f74006a7 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Wed, 9 Oct 2024 13:49:39 +0100 Subject: [PATCH 32/50] fax responder phone preset --- code/modules/cm_phone/phone.dm | 6 +++ .../lazy_templates/fax_responder_base.dmm | 50 ++++--------------- 2 files changed, 16 insertions(+), 40 deletions(-) diff --git a/code/modules/cm_phone/phone.dm b/code/modules/cm_phone/phone.dm index b600f9fb67cb..8d54e429ce52 100644 --- a/code/modules/cm_phone/phone.dm +++ b/code/modules/cm_phone/phone.dm @@ -605,6 +605,12 @@ GLOBAL_LIST_EMPTY_TYPED(transmitters, /obj/structure/transmitter) /obj/structure/transmitter/rotary/no_dnd do_not_disturb = PHONE_DND_FORBIDDEN +/obj/structure/transmitter/rotary/fax_responder + phone_category = "Comms Relay" + networks_receive = list("Fax Responders") + pixel_x = -6 + pixel_y = 6 + /obj/structure/transmitter/touchtone name = "touch-tone telephone" icon_state = "rotary_phone"//placeholder diff --git a/maps/templates/lazy_templates/fax_responder_base.dmm b/maps/templates/lazy_templates/fax_responder_base.dmm index a78d2b630857..62fcb3b908a8 100644 --- a/maps/templates/lazy_templates/fax_responder_base.dmm +++ b/maps/templates/lazy_templates/fax_responder_base.dmm @@ -7,13 +7,9 @@ /obj/item/folder/black{ pixel_x = 12 }, -/obj/structure/transmitter/rotary{ - pixel_x = -6; - pixel_y = 6; +/obj/structure/transmitter/rotary/fax_responder{ networks_transmit = list("USCM","Colonist","UPP","Fax Responders"); phone_id = "UPP Communications Officer"; - phone_category = "Comms Relay"; - networks_receive = list("Fax Responders"); phone_color = "green" }, /turf/open/floor/wood/ship, @@ -66,13 +62,9 @@ /obj/item/folder/black{ pixel_x = 12 }, -/obj/structure/transmitter/rotary{ - pixel_x = -6; - pixel_y = 6; +/obj/structure/transmitter/rotary/fax_responder{ networks_transmit = list("USCM","Colonist","TWE","Fax Responders"); phone_id = "TWE Communications Officer"; - phone_category = "Comms Relay"; - networks_receive = list("Fax Responders"); phone_color = "yellow" }, /turf/open/floor/wood/ship, @@ -203,13 +195,9 @@ /obj/item/folder/black{ pixel_x = 12 }, -/obj/structure/transmitter/rotary{ - pixel_x = -6; - pixel_y = 6; +/obj/structure/transmitter/rotary/fax_responder{ networks_transmit = list("USCM","Colonist","Fax Responders"); phone_id = "USCM-HC Communications Officer"; - phone_category = "Comms Relay"; - networks_receive = list("Fax Responders"); phone_color = "blue" }, /turf/open/floor/wood/ship, @@ -424,13 +412,10 @@ /obj/item/folder/black{ pixel_x = 12 }, -/obj/structure/transmitter/rotary{ - pixel_x = -6; - pixel_y = 6; +/obj/structure/transmitter/rotary/fax_responder{ networks_transmit = list("USCM","Colonist","Wey-Yu","PMC","Fax Responders"); phone_id = "WY Communications Executive"; - phone_category = "Comms Relay"; - networks_receive = list("Fax Responders") + }, /turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) @@ -488,13 +473,9 @@ /obj/item/folder/black{ pixel_x = 12 }, -/obj/structure/transmitter/rotary{ - pixel_x = -6; - pixel_y = 6; +/obj/structure/transmitter/rotary/fax_responder{ networks_transmit = list("USCM","Colonist","Colonial Marshal","Fax Responders"); phone_id = "CMB Deputy Operations Officer"; - phone_category = "Comms Relay"; - networks_receive = list("Fax Responders"); phone_color = "green" }, /turf/open/floor/wood/ship, @@ -508,13 +489,9 @@ /obj/item/folder/black{ pixel_x = 12 }, -/obj/structure/transmitter/rotary{ - pixel_x = -6; - pixel_y = 6; +/obj/structure/transmitter/rotary/fax_responder{ networks_transmit = list("USCM","Colonist","Fax Responders"); phone_id = "Provost Communications Officer"; - phone_category = "Comms Relay"; - networks_receive = list("Fax Responders"); phone_color = "red" }, /turf/open/floor/wood/ship, @@ -591,13 +568,10 @@ /obj/item/folder/black{ pixel_x = 12 }, -/obj/structure/transmitter/rotary{ - pixel_x = -6; - pixel_y = 6; +/obj/structure/transmitter/rotary/fax_responder{ networks_transmit = list("USCM","Colonist","Press","Fax Responders"); phone_id = "Free Press Relay"; - phone_category = "Comms Relay"; - networks_receive = list("Fax Responders") + }, /turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) @@ -636,13 +610,9 @@ /obj/item/folder/black{ pixel_x = 12 }, -/obj/structure/transmitter/rotary{ - pixel_x = -6; - pixel_y = 6; +/obj/structure/transmitter/rotary/fax_responder{ networks_transmit = list("USCM","Colonist","CLF","Fax Responders"); phone_id = "CLF Information Correspondant"; - phone_category = "Comms Relay"; - networks_receive = list("Fax Responders"); phone_color = "orange" }, /turf/open/floor/wood/ship, From a3678142cdacbd51f5cf0521ca9461d263dd5f1a Mon Sep 17 00:00:00 2001 From: forest2001 Date: Wed, 9 Oct 2024 13:51:04 +0100 Subject: [PATCH 33/50] responder faction --- code/__DEFINES/mode.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/__DEFINES/mode.dm b/code/__DEFINES/mode.dm index 6d6b9e41039a..9255d0518699 100644 --- a/code/__DEFINES/mode.dm +++ b/code/__DEFINES/mode.dm @@ -274,9 +274,10 @@ DEFINE_BITFIELD(whitelist_status, list( #define FACTION_YAUTJA "Yautja" #define FACTION_ZOMBIE "Zombie" #define FACTION_MONKEY "Monkey" // Nanu +#define FACTION_FAX "Fax Responder" #define FACTION_LIST_MARINE list(FACTION_MARINE) -#define FACTION_LIST_HUMANOID list(FACTION_MARINE, FACTION_PMC, FACTION_WY, FACTION_WY_DEATHSQUAD, FACTION_CLF, FACTION_CONTRACTOR, FACTION_MARSHAL, FACTION_UPP, FACTION_FREELANCER, FACTION_SURVIVOR, FACTION_NEUTRAL, FACTION_COLONIST, FACTION_MERCENARY, FACTION_DUTCH, FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO, FACTION_YAUTJA, FACTION_ZOMBIE, FACTION_TWE) +#define FACTION_LIST_HUMANOID list(FACTION_MARINE, FACTION_PMC, FACTION_WY, FACTION_WY_DEATHSQUAD, FACTION_CLF, FACTION_CONTRACTOR, FACTION_MARSHAL, FACTION_UPP, FACTION_FREELANCER, FACTION_SURVIVOR, FACTION_NEUTRAL, FACTION_COLONIST, FACTION_MERCENARY, FACTION_DUTCH, FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO, FACTION_YAUTJA, FACTION_ZOMBIE, FACTION_TWE, FACTION_FAX) #define FACTION_LIST_ERT_OTHER list(FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO) #define FACTION_LIST_ERT_ALL list(FACTION_PMC, FACTION_WY_DEATHSQUAD, FACTION_WY, FACTION_CLF, FACTION_CONTRACTOR, FACTION_UPP, FACTION_FREELANCER, FACTION_MERCENARY, FACTION_DUTCH, FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO, FACTION_MARSHAL, FACTION_TWE) #define FACTION_LIST_WY list(FACTION_PMC, FACTION_WY_DEATHSQUAD, FACTION_WY) From 4da1d0e26d6f36b712c8abcc5249c0a8e0f3f6d9 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Sat, 12 Oct 2024 14:23:44 +0100 Subject: [PATCH 34/50] council fix --- code/modules/client/client_procs.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index 08e4b2f8567e..ab41d3982438 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -888,6 +888,9 @@ GLOBAL_LIST_INIT(whitelisted_client_procs, list( if((flag_to_check & WHITELIST_FAX_RESPONDER) && CLIENT_IS_STAFF(src)) return TRUE + if((flag_to_check & WHITELIST_FAX_RESPONDER) && isCouncil(src)) + return TRUE + if(!player_data) load_player_data() if(!player_data) From bba906041ce304cbf4d9044592f7d81b37d9daca Mon Sep 17 00:00:00 2001 From: forest2001 Date: Fri, 25 Oct 2024 03:18:28 +0100 Subject: [PATCH 35/50] map fix, I hope --- .../lazy_templates/fax_responder_base.dmm | 144 +++++++++--------- 1 file changed, 71 insertions(+), 73 deletions(-) diff --git a/maps/templates/lazy_templates/fax_responder_base.dmm b/maps/templates/lazy_templates/fax_responder_base.dmm index 62fcb3b908a8..0717e522c769 100644 --- a/maps/templates/lazy_templates/fax_responder_base.dmm +++ b/maps/templates/lazy_templates/fax_responder_base.dmm @@ -149,6 +149,20 @@ }, /turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) +"rS" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/folder/red{ + pixel_x = 6 + }, +/obj/item/folder/black{ + pixel_x = 12 + }, +/obj/structure/transmitter/rotary/fax_responder{ + networks_transmit = list("USCM","Colonist","Press","Fax Responders"); + phone_id = "Free Press Relay" + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) "rV" = ( /obj/effect/landmark/late_join/responder/uscm/provost, /turf/open/floor/wood/ship, @@ -414,8 +428,7 @@ }, /obj/structure/transmitter/rotary/fax_responder{ networks_transmit = list("USCM","Colonist","Wey-Yu","PMC","Fax Responders"); - phone_id = "WY Communications Executive"; - + phone_id = "WY Communications Executive" }, /turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) @@ -560,21 +573,6 @@ }, /turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) -"Wv" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/item/folder/red{ - pixel_x = 6 - }, -/obj/item/folder/black{ - pixel_x = 12 - }, -/obj/structure/transmitter/rotary/fax_responder{ - networks_transmit = list("USCM","Colonist","Press","Fax Responders"); - phone_id = "Free Press Relay"; - - }, -/turf/open/floor/wood/ship, -/area/adminlevel/ert_station/fax_response_station) "XW" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/tool/pen/clicky, @@ -2104,13 +2102,60 @@ Yy Yy Yy xX +xX +xX +xX +xX +xX +xX +pu +xX +xX +xX +xX +xX +xX +xX +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(33,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +xX Dy Dy Dy Dy Dy Dy -pu +vc Ml Ml Ml @@ -2139,7 +2184,7 @@ Yy Yy Yy "} -(33,1,1) = {" +(34,1,1) = {" Yy Yy Yy @@ -2186,7 +2231,7 @@ Yy Yy Yy "} -(34,1,1) = {" +(35,1,1) = {" Yy Yy Yy @@ -2233,7 +2278,7 @@ Yy Yy Yy "} -(35,1,1) = {" +(36,1,1) = {" Yy Yy Yy @@ -2280,7 +2325,7 @@ Yy Yy Yy "} -(36,1,1) = {" +(37,1,1) = {" Yy Yy Yy @@ -2303,7 +2348,7 @@ Ml qw ST gu -Wv +rS Ml xX Yy @@ -2327,7 +2372,7 @@ Yy Yy Yy "} -(37,1,1) = {" +(38,1,1) = {" Yy Yy Yy @@ -2374,7 +2419,7 @@ Yy Yy Yy "} -(38,1,1) = {" +(39,1,1) = {" Yy Yy Yy @@ -2421,7 +2466,7 @@ Yy Yy Yy "} -(39,1,1) = {" +(40,1,1) = {" Yy Yy Yy @@ -2468,53 +2513,6 @@ Yy Yy Yy "} -(40,1,1) = {" -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -"} (41,1,1) = {" Yy Yy From 93f528a3247636da245f1d0a423d539e897bfd0a Mon Sep 17 00:00:00 2001 From: forest2001 Date: Fri, 25 Oct 2024 03:18:57 +0100 Subject: [PATCH 36/50] facs --- code/modules/gear_presets/fax_responders.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/gear_presets/fax_responders.dm b/code/modules/gear_presets/fax_responders.dm index 8f8462b8a040..34a648a16d41 100644 --- a/code/modules/gear_presets/fax_responders.dm +++ b/code/modules/gear_presets/fax_responders.dm @@ -6,7 +6,7 @@ role_comm_title = "Resp." flags = EQUIPMENT_PRESET_EXTRA - faction = FACTION_NEUTRAL + faction = FACTION_FAX access = list(ACCESS_CIVILIAN_PUBLIC) skills = /datum/skills/civilian/fax_responder From e07af40146d5fd6f68b81a64ef2a88f286fc24cb Mon Sep 17 00:00:00 2001 From: forest2001 Date: Fri, 25 Oct 2024 03:30:59 +0100 Subject: [PATCH 37/50] stops latejoin of same char --- code/game/gamemodes/cm_initialize.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/cm_initialize.dm b/code/game/gamemodes/cm_initialize.dm index 6968edd4e79f..f8ddfb272356 100644 --- a/code/game/gamemodes/cm_initialize.dm +++ b/code/game/gamemodes/cm_initialize.dm @@ -338,7 +338,7 @@ Additional game mode variables. var/turf/spawn_point = get_turf(pick(GLOB.latejoin_by_job[sub_job])) var/mob/living/carbon/human/new_responder = new(spawn_point) responder_candidate.mind.transfer_to(new_responder, TRUE) - new_responder.client?.prefs.copy_all_to(new_responder, JOB_FAX_RESPONDER, TRUE, FALSE) + new_responder.client?.prefs.copy_all_to(new_responder, JOB_FAX_RESPONDER, TRUE, TRUE) var/datum/job/fax_responder_job = GLOB.RoleAuthority.roles_by_name[sub_job] From 40e23f655d58eea8d3c0447be521779f16361149 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Fri, 25 Oct 2024 13:37:41 +0100 Subject: [PATCH 38/50] autoload --- code/datums/emergency_calls/emergency_call.dm | 1 - code/game/gamemodes/game_mode.dm | 8 ++++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/code/datums/emergency_calls/emergency_call.dm b/code/datums/emergency_calls/emergency_call.dm index 76d4411d56ff..241a5b3ba6d6 100644 --- a/code/datums/emergency_calls/emergency_call.dm +++ b/code/datums/emergency_calls/emergency_call.dm @@ -9,7 +9,6 @@ var/list/datum/emergency_call/all_calls = list() //initialized at round start and stores the datums. var/datum/emergency_call/picked_calls[] = list() //Which distress calls are currently active var/ert_dispatched = FALSE - var/loaded_fax_base = FALSE /datum/game_mode/proc/ares_online() var/name = "ARES Online" diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 603f0313f840..e3599540cb48 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -40,11 +40,19 @@ GLOBAL_VAR_INIT(cas_tracking_id_increment, 0) //this var used to assign unique t var/hardcore = FALSE + ///Whether or not the fax response station has loaded. + var/loaded_fax_base = FALSE + /datum/game_mode/New() ..() if(taskbar_icon) GLOB.available_taskbar_icons |= taskbar_icon + loaded_fax_base = SSmapping.lazy_load_template(/datum/lazy_template/fax_response_base, force = TRUE) + if(!loaded_fax_base) + log_debug("Error loading fax response base!") + return FALSE + /datum/game_mode/proc/announce() //to be calles when round starts to_world("Notice: [src] did not define announce()") From fae37dd9fac789f9756b369d8496344364cddb43 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Sat, 26 Oct 2024 21:06:44 +0100 Subject: [PATCH 39/50] Revert autoload --- code/game/gamemodes/game_mode.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index e3599540cb48..d746248034a1 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -48,11 +48,6 @@ GLOBAL_VAR_INIT(cas_tracking_id_increment, 0) //this var used to assign unique t if(taskbar_icon) GLOB.available_taskbar_icons |= taskbar_icon - loaded_fax_base = SSmapping.lazy_load_template(/datum/lazy_template/fax_response_base, force = TRUE) - if(!loaded_fax_base) - log_debug("Error loading fax response base!") - return FALSE - /datum/game_mode/proc/announce() //to be calles when round starts to_world("Notice: [src] did not define announce()") From 115346f55b7d2ef0a52fbf8efabd0e276e970658 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Sat, 26 Oct 2024 21:15:43 +0100 Subject: [PATCH 40/50] doors --- maps/templates/lazy_templates/fax_responder_base.dmm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/maps/templates/lazy_templates/fax_responder_base.dmm b/maps/templates/lazy_templates/fax_responder_base.dmm index 0717e522c769..44b88044d63d 100644 --- a/maps/templates/lazy_templates/fax_responder_base.dmm +++ b/maps/templates/lazy_templates/fax_responder_base.dmm @@ -132,7 +132,8 @@ /area/adminlevel/ert_station/fax_response_station) "pH" = ( /obj/structure/machinery/door/airlock/almayer/maint/reinforced/colony{ - dir = 1 + dir = 1; + req_one_access = null }, /obj/structure/machinery/door/poddoor/almayer{ unacidable = 1; From 8d354237065d637a93c6db89d9fcab47474cd1ee Mon Sep 17 00:00:00 2001 From: forest2001 Date: Tue, 29 Oct 2024 15:53:14 +0000 Subject: [PATCH 41/50] mentors --- code/modules/client/client_procs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index ab41d3982438..97401a21c85c 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -885,7 +885,7 @@ GLOBAL_LIST_INIT(whitelisted_client_procs, list( if((flag_to_check & WHITELIST_JOE) && CLIENT_IS_STAFF(src)) return TRUE - if((flag_to_check & WHITELIST_FAX_RESPONDER) && CLIENT_IS_STAFF(src)) + if((flag_to_check & WHITELIST_FAX_RESPONDER) && CLIENT_IS_MENTOR(src)) return TRUE if((flag_to_check & WHITELIST_FAX_RESPONDER) && isCouncil(src)) From 319ba7e8afd44c72897751ef93034afa423de598 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Wed, 30 Oct 2024 20:21:53 +0000 Subject: [PATCH 42/50] mp h --- code/game/jobs/job/special/responders.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/jobs/job/special/responders.dm b/code/game/jobs/job/special/responders.dm index 54059751ae83..4fc6d162b2d7 100644 --- a/code/game/jobs/job/special/responders.dm +++ b/code/game/jobs/job/special/responders.dm @@ -29,7 +29,7 @@ AddTimelock(/datum/job/fax_responder/uscm_hc, list( gear_preset = /datum/equipment_preset/fax_responder/uscm/provost AddTimelock(/datum/job/fax_responder/uscm_pvst, list( - JOB_POLICE_ROLES = 150 HOURS, + JOB_POLICE_ROLES = 75 HOURS, JOB_COMMAND_ROLES = 75 HOURS, )) From 732509017ef330d153e56a40f5fe01aca8968953 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Sat, 9 Nov 2024 08:36:01 +0000 Subject: [PATCH 43/50] fix wl panel --- code/game/jobs/whitelist.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/game/jobs/whitelist.dm b/code/game/jobs/whitelist.dm index 0c87fcbb52d0..9de3240a4150 100644 --- a/code/game/jobs/whitelist.dm +++ b/code/game/jobs/whitelist.dm @@ -46,6 +46,7 @@ #define WL_PANEL_RIGHT_OVERSEER (1<<4) #define WL_PANEL_RIGHT_MANAGER (1<<5) #define WL_PANEL_ALL_COUNCILS (WL_PANEL_RIGHT_CO|WL_PANEL_RIGHT_SYNTH|WL_PANEL_RIGHT_YAUTJA) +#define WL_PANEL_RIGHTS_OVERSEER (WL_PANEL_RIGHT_CO|WL_PANEL_RIGHT_SYNTH|WL_PANEL_RIGHT_YAUTJA|WL_PANEL_RIGHT_OVERSEER) #define WL_PANEL_ALL_RIGHTS (WL_PANEL_RIGHT_CO|WL_PANEL_RIGHT_SYNTH|WL_PANEL_RIGHT_YAUTJA|WL_PANEL_RIGHT_MENTOR|WL_PANEL_RIGHT_OVERSEER|WL_PANEL_RIGHT_MANAGER) /datum/whitelist_panel @@ -69,7 +70,7 @@ if(person.check_whitelist_status(WHITELIST_YAUTJA_LEADER)) rights |= WL_PANEL_RIGHT_YAUTJA if(rights == WL_PANEL_ALL_COUNCILS) - rights |= WL_PANEL_RIGHT_OVERSEER + rights |= WL_PANEL_RIGHTS_OVERSEER return rights /datum/whitelist_panel/tgui_interact(mob/user, datum/tgui/ui) @@ -115,7 +116,7 @@ GLOBAL_LIST_INIT(syn_flags, list( )) GLOBAL_LIST_INIT(yaut_flags, list( list(name = "Yautja", bitflag = WHITELIST_YAUTJA, permission = WL_PANEL_RIGHT_YAUTJA), - list(name = "Legacy Holder", bitflag = WHITELIST_YAUTJA_LEGACY, permission = WL_PANEL_RIGHT_OVERSEER), + list(name = "Legacy Holder", bitflag = WHITELIST_YAUTJA_LEGACY, permission = WL_PANEL_RIGHT_MANAGER), list(name = "Council", bitflag = WHITELIST_YAUTJA_COUNCIL, permission = WL_PANEL_RIGHT_YAUTJA), list(name = "Legacy Council", bitflag = WHITELIST_YAUTJA_COUNCIL_LEGACY, permission = WL_PANEL_RIGHT_YAUTJA), list(name = "Senator", bitflag = WHITELIST_YAUTJA_LEADER, permission = WL_PANEL_RIGHT_OVERSEER) From 4b926675dec5d067cd06aac1b9c4dff5b181b14e Mon Sep 17 00:00:00 2001 From: forest2001 Date: Sat, 9 Nov 2024 08:47:12 +0000 Subject: [PATCH 44/50] removes icon change --- icons/obj/items/paper.dmi | Bin 12157 -> 12014 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/obj/items/paper.dmi b/icons/obj/items/paper.dmi index c248fa2341d1c3cd81939eee354c8266bd38c308..b15d4be6076d44d17404eae888e8b7b09f1a4b61 100644 GIT binary patch delta 11182 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 delta 11325 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 DoIr^_ From ff2e80b0632e748652494473023f8b83eecb3c8b Mon Sep 17 00:00:00 2001 From: forest2001 Date: Fri, 15 Nov 2024 23:13:40 +0000 Subject: [PATCH 45/50] access fix --- code/modules/gear_presets/fax_responders.dm | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/code/modules/gear_presets/fax_responders.dm b/code/modules/gear_presets/fax_responders.dm index 34a648a16d41..80212547d67b 100644 --- a/code/modules/gear_presets/fax_responders.dm +++ b/code/modules/gear_presets/fax_responders.dm @@ -38,7 +38,7 @@ paygrades = list(PAY_SHORT_MO2 = JOB_PLAYTIME_TIER_0, PAY_SHORT_MO3 = JOB_PLAYTIME_TIER_1, PAY_SHORT_MO4 = JOB_PLAYTIME_TIER_3) idtype = /obj/item/card/id/gold skills = /datum/skills/XO - access = list(ACCESS_MARINE_COMMAND, ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_DATABASE, ACCESS_MARINE_MEDBAY) + access = list(ACCESS_MARINE_COMMAND, ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_DATABASE, ACCESS_MARINE_MEDBAY, ACCESS_MARINE_BRIG, ACCESS_MARINE_AI) headset_type = /obj/item/device/radio/headset/almayer/highcom idtype = /obj/item/card/id/gold @@ -77,6 +77,7 @@ assignment = JOB_FAX_RESPONDER_WY rank = JOB_FAX_RESPONDER_WY paygrades = list(PAY_SHORT_WYC5 = JOB_PLAYTIME_TIER_0, PAY_SHORT_WYC6 = JOB_PLAYTIME_TIER_1, PAY_SHORT_WYC7 = JOB_PLAYTIME_TIER_3) + access = list(ACCESS_MARINE_COMMAND, ACCESS_WY_COLONIAL, ACCESS_WY_EXEC, ACCESS_WY_GENERAL, ACCESS_WY_LEADERSHIP) headset_type = /obj/item/device/radio/headset/distress/pmc/command idtype = /obj/item/card/id/pmc @@ -99,6 +100,10 @@ headset_type = /obj/item/device/radio/headset/distress/UPP/kdo/command idtype = /obj/item/card/id/gold +/datum/equipment_preset/fax_responder/upp/New() + . = ..() + access = get_access(ACCESS_LIST_UPP_ALL) + /datum/equipment_preset/fax_responder/upp/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/beret, WEAR_HEAD) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP/officer(new_human), WEAR_BODY) @@ -143,6 +148,10 @@ headset_type = /obj/item/device/radio/headset/distress/CLF/command paygrades = list(PAY_SHORT_REBC = JOB_PLAYTIME_TIER_0) +/datum/equipment_preset/fax_responder/clf/New() + . = ..() + access = get_access(ACCESS_LIST_CLF_ALL) + /datum/equipment_preset/fax_responder/clf/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/clf(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(new_human), WEAR_HANDS) @@ -160,6 +169,10 @@ idtype = /obj/item/card/id/marshal paygrades = list(PAY_SHORT_CMBM = JOB_PLAYTIME_TIER_0) +/datum/equipment_preset/fax_responder/cmb/New() + . = ..() + access = get_access(ACCESS_LIST_EMERGENCY_RESPONSE) + /datum/equipment_preset/fax_responder/cmb/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/CM_uniform, WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/holobadge/cord, WEAR_ACCESSORY) @@ -181,6 +194,10 @@ idtype = /obj/item/card/id/silver/cl paygrades = list(PAY_SHORT_CIV = JOB_PLAYTIME_TIER_0) +/datum/equipment_preset/fax_responder/press/New() + . = ..() + access = get_access(ACCESS_LIST_EMERGENCY_RESPONSE) + /datum/equipment_preset/fax_responder/press/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/reporter(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/reporter(new_human), WEAR_JACKET) From 17529843ad52402df88c6831e1620a8f0db13287 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Sat, 16 Nov 2024 02:12:58 +0000 Subject: [PATCH 46/50] awake or not --- code/game/gamemodes/cm_initialize.dm | 2 ++ code/game/machinery/cryopod.dm | 9 +++-- code/game/machinery/fax_machine.dm | 36 +++++++++++++++++++ code/modules/mob/living/carbon/human/human.dm | 1 + code/modules/mob/living/carbon/human/login.dm | 13 +++++++ tgui/packages/tgui/interfaces/FaxMachine.jsx | 18 ++++++++-- 6 files changed, 73 insertions(+), 6 deletions(-) diff --git a/code/game/gamemodes/cm_initialize.dm b/code/game/gamemodes/cm_initialize.dm index 06e0e6a5123a..5d0151212c81 100644 --- a/code/game/gamemodes/cm_initialize.dm +++ b/code/game/gamemodes/cm_initialize.dm @@ -48,6 +48,7 @@ Additional game mode variables. var/list/dead_queens // A list of messages listing the dead queens var/list/predators = list() var/list/joes = list() + var/list/fax_responders = list() var/xeno_required_num = 0 //We need at least one. You can turn this off in case we don't care if we spawn or don't spawn xenos. var/xeno_starting_num = 0 //To clamp starting xenos. @@ -352,6 +353,7 @@ Additional game mode variables. SSticker.minds += new_responder.mind message_admins(FONT_SIZE_XL(SPAN_RED("([new_responder.key]) joined as a [sub_job], [new_responder.real_name]."))) + new_responder.add_fax_responder() return TRUE diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 2879f06dd456..35bfb3e1c3b8 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -229,8 +229,8 @@ GLOBAL_LIST_INIT(frozen_items, list(SQUAD_MARINE_1 = list(), SQUAD_MARINE_2 = li var/list/dept_console = GLOB.frozen_items["REQ"] if(ishuman(occupant)) - var/mob/living/carbon/human/H = occupant - switch(H.job) + var/mob/living/carbon/human/cryo_human = occupant + switch(cryo_human.job) if(JOB_POLICE, JOB_WARDEN, JOB_CHIEF_POLICE) dept_console = GLOB.frozen_items["MP"] if(JOB_NURSE, JOB_DOCTOR, JOB_RESEARCHER, JOB_CMO) @@ -240,7 +240,10 @@ GLOBAL_LIST_INIT(frozen_items, list(SQUAD_MARINE_1 = list(), SQUAD_MARINE_2 = li if(JOB_PREDATOR) dept_console = GLOB.frozen_items["Yautja"] - H.species.handle_cryo(H) + if(cryo_human.job in FAX_RESPONDER_JOB_LIST) + cryo_human.despawn_fax_responder() + + cryo_human.species.handle_cryo(cryo_human) var/list/deleteempty = list(/obj/item/storage/backpack/marine/satchel) diff --git a/code/game/machinery/fax_machine.dm b/code/game/machinery/fax_machine.dm index e53421c4fe50..4b5df130c96d 100644 --- a/code/game/machinery/fax_machine.dm +++ b/code/game/machinery/fax_machine.dm @@ -263,6 +263,13 @@ GLOBAL_LIST_EMPTY(all_faxcodes) if(target_department == DEPARTMENT_TARGET) data["target_department"] = target_machine_id + if(target_department in HIGHCOM_DEPARTMENTS) + data["highcom_dept"] = TRUE + else + data["highcom_dept"] = FALSE + + data["awake_responder"] = is_department_responder_awake(target_department) + data["worldtime"] = world.time data["nextfaxtime"] = send_cooldown data["faxcooldown"] = fax_cooldown @@ -747,3 +754,32 @@ GLOBAL_LIST_EMPTY(all_faxcodes) photo_list = new_photo_list if(new_name != "paper") paper_name = new_name + + + +/obj/structure/machinery/faxmachine/proc/is_department_responder_awake(target_department) + if(!(target_department in HIGHCOM_DEPARTMENTS)) + return FALSE + var/target_job = JOB_FAX_RESPONDER + switch(target_department) + if(DEPARTMENT_CLF) + target_job = JOB_FAX_RESPONDER_CLF + if(DEPARTMENT_CMB) + target_job = JOB_FAX_RESPONDER_CMB + if(DEPARTMENT_HC) + target_job = JOB_FAX_RESPONDER_USCM_HC + if(DEPARTMENT_PRESS) + target_job = JOB_FAX_RESPONDER_PRESS + if(DEPARTMENT_PROVOST) + target_job = JOB_FAX_RESPONDER_USCM_PVST + if(DEPARTMENT_TWE) + target_job = JOB_FAX_RESPONDER_TWE + if(DEPARTMENT_UPP) + target_job = JOB_FAX_RESPONDER_UPP + if(DEPARTMENT_WY) + target_job = JOB_FAX_RESPONDER_WY + + for(var/mob/living/carbon/human/responder in SSticker.mode.fax_responders) + if(!(responder.stat) && (responder.job == target_job)) + return TRUE + return FALSE diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 88d7305bc0a3..2e14cacbb3e3 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -54,6 +54,7 @@ /mob/living/carbon/human/Destroy() SSround_recording.recorder.stop_tracking(src) remove_from_all_mob_huds() + despawn_fax_responder() assigned_equipment_preset = null GLOB.human_mob_list -= src GLOB.alive_human_list -= src diff --git a/code/modules/mob/living/carbon/human/login.dm b/code/modules/mob/living/carbon/human/login.dm index af46cdfc4e1d..f698b541579a 100644 --- a/code/modules/mob/living/carbon/human/login.dm +++ b/code/modules/mob/living/carbon/human/login.dm @@ -4,3 +4,16 @@ species.handle_login_special(src) if(selected_ability) set_selected_ability(null) + + +/mob/living/carbon/human/proc/add_fax_responder() + if(SSticker.mode) + SSticker.mode.fax_responders += src + return TRUE + return FALSE + +/mob/living/carbon/human/proc/despawn_fax_responder() + if(SSticker.mode) + SSticker.mode.fax_responders -= src + return TRUE + return FALSE diff --git a/tgui/packages/tgui/interfaces/FaxMachine.jsx b/tgui/packages/tgui/interfaces/FaxMachine.jsx index 11da63613736..8cb881a5da00 100644 --- a/tgui/packages/tgui/interfaces/FaxMachine.jsx +++ b/tgui/packages/tgui/interfaces/FaxMachine.jsx @@ -17,7 +17,7 @@ export const FaxMachine = () => { const { idcard } = data; const body = idcard ? : ; const windowWidth = idcard ? 600 : 400; - const windowHeight = idcard ? 295 : 215; + const windowHeight = idcard ? 340 : 215; return ( @@ -28,14 +28,26 @@ export const FaxMachine = () => { const FaxMain = (props) => { const { data } = useBackend(); - const { machine_id_tag } = data; + const { machine_id_tag, awake_responder, highcom_dept } = data; return ( <> - The machine identification is {machine_id_tag} + The machine identification is {machine_id_tag}. + {!!highcom_dept && ( + + A designated communications operator is + {awake_responder ? ' currently' : ' not currently'} awake. +
+ Message responses + {awake_responder ? ' are likely to be swift.' : ' may be delayed.'} + + )} ); }; From bac82d44b3444f77a4ddb7b17e7c0dcbd9cff209 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Sat, 16 Nov 2024 02:18:57 +0000 Subject: [PATCH 47/50] t --- code/__DEFINES/mode.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/__DEFINES/mode.dm b/code/__DEFINES/mode.dm index 861570ac7a2a..5f47ce2d46ff 100644 --- a/code/__DEFINES/mode.dm +++ b/code/__DEFINES/mode.dm @@ -293,7 +293,7 @@ DEFINE_BITFIELD(whitelist_status, list( #define FACTION_FAX "Fax Responder" #define FACTION_LIST_MARINE list(FACTION_MARINE) -#define FACTION_LIST_HUMANOID list(FACTION_MARINE, FACTION_PMC, FACTION_WY, FACTION_WY_DEATHSQUAD, FACTION_CLF, FACTION_CONTRACTOR, FACTION_MARSHAL, FACTION_UPP, FACTION_FREELANCER, FACTION_SURVIVOR, FACTION_NEUTRAL, FACTION_COLONIST, FACTION_MERCENARY, FACTION_DUTCH, FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO, FACTION_YAUTJA, FACTION_ZOMBIE, FACTION_TWE, FACTION_FAX) +#define FACTION_LIST_HUMANOID list(FACTION_FAX, FACTION_MARINE, FACTION_PMC, FACTION_WY, FACTION_WY_DEATHSQUAD, FACTION_CLF, FACTION_CONTRACTOR, FACTION_MARSHAL, FACTION_UPP, FACTION_FREELANCER, FACTION_SURVIVOR, FACTION_NEUTRAL, FACTION_COLONIST, FACTION_MERCENARY, FACTION_DUTCH, FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO, FACTION_YAUTJA, FACTION_ZOMBIE, FACTION_TWE) #define FACTION_LIST_ERT_OTHER list(FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO) #define FACTION_LIST_ERT_ALL list(FACTION_PMC, FACTION_WY_DEATHSQUAD, FACTION_WY, FACTION_CLF, FACTION_CONTRACTOR, FACTION_UPP, FACTION_FREELANCER, FACTION_MERCENARY, FACTION_DUTCH, FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO, FACTION_MARSHAL, FACTION_TWE) #define FACTION_LIST_WY list(FACTION_PMC, FACTION_WY_DEATHSQUAD, FACTION_WY) From db6b0720a024a9c2df268f229d3668dceff7c06c Mon Sep 17 00:00:00 2001 From: forest2001 Date: Sat, 16 Nov 2024 02:20:04 +0000 Subject: [PATCH 48/50] t2 --- code/__DEFINES/mode.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/__DEFINES/mode.dm b/code/__DEFINES/mode.dm index 5f47ce2d46ff..35eec6663f53 100644 --- a/code/__DEFINES/mode.dm +++ b/code/__DEFINES/mode.dm @@ -293,7 +293,7 @@ DEFINE_BITFIELD(whitelist_status, list( #define FACTION_FAX "Fax Responder" #define FACTION_LIST_MARINE list(FACTION_MARINE) -#define FACTION_LIST_HUMANOID list(FACTION_FAX, FACTION_MARINE, FACTION_PMC, FACTION_WY, FACTION_WY_DEATHSQUAD, FACTION_CLF, FACTION_CONTRACTOR, FACTION_MARSHAL, FACTION_UPP, FACTION_FREELANCER, FACTION_SURVIVOR, FACTION_NEUTRAL, FACTION_COLONIST, FACTION_MERCENARY, FACTION_DUTCH, FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO, FACTION_YAUTJA, FACTION_ZOMBIE, FACTION_TWE) +#define FACTION_LIST_HUMANOID list(FACTION_MARINE, FACTION_PMC, FACTION_WY, FACTION_WY_DEATHSQUAD, FACTION_CLF, FACTION_CONTRACTOR, FACTION_MARSHAL, FACTION_UPP, FACTION_FREELANCER, FACTION_SURVIVOR, FACTION_NEUTRAL, FACTION_COLONIST, FACTION_MERCENARY, FACTION_DUTCH, FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO, FACTION_YAUTJA, FACTION_ZOMBIE, FACTION_TWE) #define FACTION_LIST_ERT_OTHER list(FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO) #define FACTION_LIST_ERT_ALL list(FACTION_PMC, FACTION_WY_DEATHSQUAD, FACTION_WY, FACTION_CLF, FACTION_CONTRACTOR, FACTION_UPP, FACTION_FREELANCER, FACTION_MERCENARY, FACTION_DUTCH, FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO, FACTION_MARSHAL, FACTION_TWE) #define FACTION_LIST_WY list(FACTION_PMC, FACTION_WY_DEATHSQUAD, FACTION_WY) From ae7ed23122817f740ca7e4413a9e8448a73f0079 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Sat, 16 Nov 2024 16:43:34 +0000 Subject: [PATCH 49/50] listening devices --- code/__DEFINES/radio.dm | 5 ++ code/controllers/subsystem/communications.dm | 15 +++++ .../objects/items/devices/radio/headset.dm | 9 +++ .../objects/items/devices/radio/intercom.dm | 13 +++++ .../items/devices/radio/listening_bugs.dm | 20 +++++++ maps/map_files/USS_Almayer/USS_Almayer.dmm | 27 ++++++++- .../lazy_templates/fax_responder_base.dmm | 56 ++++++++++++++++++- 7 files changed, 141 insertions(+), 4 deletions(-) diff --git a/code/__DEFINES/radio.dm b/code/__DEFINES/radio.dm index 367c35be5605..4f9022b5ba77 100644 --- a/code/__DEFINES/radio.dm +++ b/code/__DEFINES/radio.dm @@ -66,6 +66,11 @@ #define RADIO_CHANNEL_BUG_A "Listening Device A" #define RADIO_CHANNEL_BUG_B "Listening Device B" +//Fax Responder Bugs +#define RADIO_CHANNEL_FAX_WY "WY Monitor" +#define RADIO_CHANNEL_FAX_USCM_HC "USCM-HC Monitor" +#define RADIO_CHANNEL_FAX_USCM_PVST "Provost Monitor" + //1-Channel ERTs #define RADIO_CHANNEL_DUTCH_DOZEN "DD" #define RADIO_CHANNEL_VAI "VAI" diff --git a/code/controllers/subsystem/communications.dm b/code/controllers/subsystem/communications.dm index 1e4480ef8afa..3d3f6a7d7c3d 100644 --- a/code/controllers/subsystem/communications.dm +++ b/code/controllers/subsystem/communications.dm @@ -107,6 +107,11 @@ Radiochat range: 1441 to 1489 (most devices refuse to be tune to other frequency #define BUG_A_FREQ 1290 #define BUG_B_FREQ 1291 +//Listening Bugs (1296-1300) +#define FAX_WY_FREQ 1296 +#define FAX_USCM_HC_FREQ 1297 +#define FAX_USCM_PVST_FREQ 1298 + //General Radio #define MIN_FREQ 1460 // ------------------------------------------------------ #define PUB_FREQ 1461 @@ -210,6 +215,10 @@ GLOBAL_LIST_INIT(radiochannels, list( RADIO_CHANNEL_BUG_A = BUG_A_FREQ, RADIO_CHANNEL_BUG_B = BUG_B_FREQ, + + RADIO_CHANNEL_FAX_WY = FAX_WY_FREQ, + RADIO_CHANNEL_FAX_USCM_HC = FAX_USCM_HC_FREQ, + RADIO_CHANNEL_FAX_USCM_PVST = FAX_USCM_PVST_FREQ, )) // Response Teams @@ -227,6 +236,9 @@ GLOBAL_LIST_INIT(radiochannels, list( //Listening Device Frequencies #define BUG_FREQS list(BUG_A_FREQ, BUG_B_FREQ) +//Fax Responder internal monitor frequencies +#define FAX_RESP_FREQS list(FAX_WY_FREQ, FAX_USCM_HC_FREQ, FAX_USCM_PVST_FREQ) + //Depts - used for colors in headset.dm, as well as deciding what the marine comms tower can listen into #define DEPT_FREQS list(COMM_FREQ, MED_FREQ, ENG_FREQ, SEC_FREQ, SENTRY_FREQ, ALPHA_FREQ, BRAVO_FREQ, CHARLIE_FREQ, DELTA_FREQ, ECHO_FREQ, CRYO_FREQ, REQ_FREQ, JTAC_FREQ, INTEL_FREQ, WY_FREQ) @@ -304,6 +316,9 @@ SUBSYSTEM_DEF(radio) "[CLF_ENGI_FREQ]" = "opforeng", "[CLF_MED_FREQ]" = "opformed", "[CLF_CCT_FREQ]" = "opforcct", + "[FAX_WY_FREQ]" = "airadio", + "[FAX_USCM_HC_FREQ]" = "aiprivradio", + "[FAX_USCM_PVST_FREQ]" = "aiprivradio", ) /datum/controller/subsystem/radio/proc/add_object(obj/device as obj, new_frequency as num, filter = null as text|null) diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 205fa7710312..b7aab820c81d 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -65,6 +65,9 @@ /obj/item/device/radio/headset/Destroy() wearer = null + if(spy_bug) + qdel(spy_bug) + spy_bug = null QDEL_NULL_LIST(keys) return ..() @@ -561,6 +564,12 @@ maximum_keys = 5 initial_keys = list(/obj/item/device/encryptionkey/mcom/cl) + spy_bug_type = /obj/item/device/radio/listening_bug/radio_linked/fax/wy + +/obj/item/device/radio/headset/almayer/mcl/Initialize() + . = ..() + spy_bug.nametag = "CL Radio" + /obj/item/device/radio/headset/almayer/reporter name = "reporter radio headset" desc = "Used by the combat correspondent to get the scoop. Channels are as follows: :v - marine command, :a - alpha squad, :b - bravo squad, :c - charlie squad, :d - delta squad, :n - engineering, :m - medbay, :u - requisitions, :j - JTAC, :t - intel." diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index baef29b84e81..2bfc9054b1a0 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -93,3 +93,16 @@ /obj/item/device/radio/intercom/devana name = "dropship devana intercom" frequency = UPP_DS2_FREQ + +/obj/item/device/radio/intercom/fax + name = "Monitoring Frequency Speaker" + canhear_range = 4 + +/obj/item/device/radio/intercom/fax/wy + frequency = FAX_WY_FREQ + +/obj/item/device/radio/intercom/fax/uscm_hc + frequency = FAX_USCM_HC_FREQ + +/obj/item/device/radio/intercom/fax/uscm_pvst + frequency = FAX_USCM_PVST_FREQ diff --git a/code/game/objects/items/devices/radio/listening_bugs.dm b/code/game/objects/items/devices/radio/listening_bugs.dm index 9492188a14f0..c7fb89381603 100644 --- a/code/game/objects/items/devices/radio/listening_bugs.dm +++ b/code/game/objects/items/devices/radio/listening_bugs.dm @@ -274,3 +274,23 @@ /obj/item/device/encryptionkey/listening_bug/freq_b name = "Listening Bug Encryption Key (B)" channels = list(RADIO_CHANNEL_BUG_B = TRUE) + + + +///An automatically active bug used to listen to things by a Fax Responder. +/obj/item/device/radio/listening_bug/radio_linked/fax + name = "Comms Relay Device" + subspace_switchable = FALSE + broadcasting = TRUE + +/obj/item/device/radio/listening_bug/radio_linked/fax/wy + frequency = FAX_WY_FREQ + req_one_access = list(ACCESS_WY_SENIOR_LEAD) + +/obj/item/device/radio/listening_bug/radio_linked/fax/uscm_pvst + frequency = FAX_USCM_PVST_FREQ + req_one_access = list(ACCESS_MARINE_CO) + +/obj/item/device/radio/listening_bug/radio_linked/fax/uscm_hc + frequency = FAX_USCM_HC_FREQ + req_one_access = list(ACCESS_MARINE_CO) diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index e85786719749..be0033a50a39 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -20335,6 +20335,11 @@ /turf/open/floor/almayer/aicore/glowing/no_build, /area/almayer/command/airoom) "euV" = ( +/obj/item/device/radio/listening_bug/radio_linked/fax/uscm_hc{ + nametag = "CIC"; + alpha = 0; + mouse_opacity = 0 + }, /turf/open/floor/almayer/uscm/directional/logo_c/west, /area/almayer/command/cic) "euW" = ( @@ -35688,6 +35693,12 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, +/obj/item/device/radio/listening_bug/radio_linked/fax/uscm_pvst{ + alpha = 0; + anchored = 1; + mouse_opacity = 0; + nametag = "Brig" + }, /turf/open/floor/almayer/no_build, /area/almayer/shipboard/brig/processing) "kRd" = ( @@ -35960,6 +35971,11 @@ pixel_x = 16; pixel_y = 8 }, +/obj/item/device/radio/listening_bug/radio_linked/fax/uscm_hc{ + nametag = "CO Office"; + alpha = 0; + mouse_opacity = 0 + }, /turf/open/floor/carpet, /area/almayer/living/commandbunks) "kWT" = ( @@ -41086,6 +41102,15 @@ }, /turf/open/floor/almayer/orangefull, /area/almayer/living/briefing) +"nfh" = ( +/obj/item/device/radio/listening_bug/radio_linked/fax/uscm_pvst{ + alpha = 0; + anchored = 1; + mouse_opacity = 0; + nametag = "Perma" + }, +/turf/closed/wall/almayer/reinforced, +/area/almayer/shipboard/brig/perma) "nfw" = ( /obj/effect/projector{ name = "Almayer_AresDown"; @@ -77460,7 +77485,7 @@ naB naB naB naB -naB +nfh dcy qPD qPD diff --git a/maps/templates/lazy_templates/fax_responder_base.dmm b/maps/templates/lazy_templates/fax_responder_base.dmm index 44b88044d63d..8e8cb2107e93 100644 --- a/maps/templates/lazy_templates/fax_responder_base.dmm +++ b/maps/templates/lazy_templates/fax_responder_base.dmm @@ -97,6 +97,9 @@ /obj/structure/machinery/faxmachine/cmb{ pixel_y = 8 }, +/obj/item/device/radio/intercom/fax/uscm_pvst{ + pixel_y = 28 + }, /turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) "nB" = ( @@ -143,6 +146,12 @@ }, /turf/open/floor/almayer/test_floor4, /area/adminlevel/ert_station/fax_response_station) +"pK" = ( +/obj/item/device/radio/intercom/fax/wy{ + pixel_y = 28 + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) "qw" = ( /obj/structure/surface/table/woodentable/fancy, /obj/structure/machinery/faxmachine/press/highcom{ @@ -419,6 +428,33 @@ }, /turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) +"Fn" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/tool/pen/clicky, +/obj/item/tool/pen/blue/clicky{ + pixel_y = 8 + }, +/obj/item/tool/pen/green/clicky{ + pixel_y = 8; + pixel_x = -8 + }, +/obj/item/tool/pen/red/clicky{ + pixel_x = -8 + }, +/obj/structure/machinery/computer/crew/alt{ + pixel_y = 24; + name = "USCM monitoring computer" + }, +/obj/item/paper_bin/uscm{ + pixel_x = 8; + pixel_y = 6 + }, +/obj/item/device/radio/intercom/fax/uscm_pvst{ + pixel_y = 28; + pixel_x = 16 + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) "FB" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/folder/red{ @@ -510,6 +546,20 @@ }, /turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) +"Oe" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/folder/white{ + pixel_x = -6 + }, +/obj/item/folder/white, +/obj/item/folder/white{ + pixel_x = 6 + }, +/obj/item/device/radio/intercom/fax/uscm_hc{ + pixel_x = 24 + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) "OA" = ( /obj/structure/machinery/light{ dir = 8 @@ -1118,7 +1168,7 @@ Yy xX vc Ei -Du +Fn sZ Bp sx @@ -1126,7 +1176,7 @@ Ei Du sZ Bp -sx +Oe Ei vc xX @@ -1446,7 +1496,7 @@ Yy Yy xX BC -gu +pK gu gu gu From 7728f59e287b916b57e525ccba06376ad0925f15 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Sat, 16 Nov 2024 16:51:13 +0000 Subject: [PATCH 50/50] Grrrrr ruddy merge conflicts --- code/game/objects/items/devices/radio/headset.dm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index b7aab820c81d..4a665c88133f 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -41,6 +41,9 @@ ///The type of minimap this headset is added to var/minimap_type = MINIMAP_FLAG_USCM + var/obj/item/device/radio/listening_bug/spy_bug + var/spy_bug_type + var/mob/living/carbon/human/wearer /obj/item/device/radio/headset/Initialize() @@ -63,6 +66,10 @@ if(GLOB.radiochannels[cycled_channel] == frequency) default_freq = cycled_channel + if(spy_bug_type) + spy_bug = new spy_bug_type + spy_bug.forceMove(src) + /obj/item/device/radio/headset/Destroy() wearer = null if(spy_bug)